File tree Expand file tree Collapse file tree 15 files changed +0
-235
lines changed
snapshot-controller/manifests
serviceloadbalancer/metallb Expand file tree Collapse file tree 15 files changed +0
-235
lines changed Original file line number Diff line number Diff line change 1
- <<<<<<< HEAD
2
- =======
3
- # Copyright 2024 Nutanix. All rights reserved.
4
- # SPDX-License-Identifier: Apache-2.0
5
-
6
- # Used to generate CRS
7
- >>>>>>> cefd0dc (ci: set structure for sync tool)
8
1
---
9
2
# Starting in Kubernetes v1.29 the Kubelet no longer adds temporary addresses to the Node.
10
3
# See https://github.com/kubernetes/kubernetes/pull/121028
19
12
- --v=2
20
13
- --cloud-provider=aws
21
14
- --configure-cloud-routes=false
22
- <<<<<<< HEAD
23
15
24
16
{{ $clusterSemver := semver .Cluster.spec.topology.version }}
25
17
{{ $ccmVersion := get $k8sMinorVersionToCCMVersion ( print $clusterSemver.Major "." $clusterSemver.Minor ) }}
26
18
image :
27
19
tag : {{ $ccmVersion }}
28
- =======
29
- >>>>>>> cefd0dc (ci: set structure for sync tool)
Original file line number Diff line number Diff line change 1
1
# Copyright 2023 Nutanix. All rights reserved.
2
2
# SPDX-License-Identifier: Apache-2.0
3
3
4
- <<<<<<< HEAD
5
4
{{- if .Values.hooks.cni.calico.helmAddonStrategy.defaultValueTemplatesConfigMaps.AWSCluster.create }}
6
5
apiVersion : v1
7
6
kind : ConfigMap
@@ -10,14 +9,4 @@ metadata:
10
9
data :
11
10
values.yaml : |-
12
11
{{- .Files.Get "addons/cni/calico/aws/values-template.yaml" | nindent 4 }}
13
- =======
14
- {{- if .Values.hooks.cni.calico.helmAddonStrategy.defaultValueTemplatesConfigMaps.NutanixCluster.create }}
15
- apiVersion : v1
16
- kind : ConfigMap
17
- metadata :
18
- name : ' {{ .Values.hooks.cni.calico.helmAddonStrategy.defaultValueTemplatesConfigMaps.NutanixCluster.name }}'
19
- data :
20
- values.yaml : |-
21
- {{- .Files.Get "addons/cni/calico/nutanix/values-template.yaml" | nindent 4 }}
22
- >>>>>>> cefd0dc (ci: set structure for sync tool)
23
12
{{- end -}}
Original file line number Diff line number Diff line change 1
- <<<<<<< HEAD
2
- =======
3
- # Copyright 2023 Nutanix. All rights reserved.
4
- # SPDX-License-Identifier: Apache-2.0
5
- >>>>>>> cefd0dc (ci: set structure for sync tool)
6
1
7
2
installation :
8
3
cni :
9
4
type : Calico
10
5
calicoNetwork :
11
6
bgp : Enabled
12
- <<<<<<< HEAD
13
7
ipPools : {{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
14
8
- cidr : " {{ $cidr }}"
15
9
encapsulation : None
16
10
natOutgoing : Enabled
17
11
nodeSelector : all(){{ end }}
18
- =======
19
- ipPools:{{ printf "{{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}" }}
20
- - cidr : {{ printf "{{ $cidr }}" }}
21
- encapsulation : None
22
- natOutgoing : Enabled
23
- nodeSelector : all(){{ printf "{{ end }}" }}
24
- >>>>>>> cefd0dc (ci: set structure for sync tool)
25
12
nodeMetricsPort : 9091
26
13
typhaMetricsPort : 9093
27
14
registry : quay.io/
Original file line number Diff line number Diff line change 1
- <<<<<<< HEAD
2
- =======
3
- # Copyright 2023 Nutanix. All rights reserved.
4
- # SPDX-License-Identifier: Apache-2.0
5
- >>>>>>> cefd0dc (ci: set structure for sync tool)
6
1
7
2
installation :
8
3
cni :
9
4
type : Calico
10
5
calicoNetwork :
11
- <<<<<<< HEAD
12
6
ipPools:{{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
13
7
- cidr : " {{ $cidr }}"
14
8
encapsulation : None
15
9
natOutgoing : Enabled
16
10
nodeSelector : all(){{ end }}
17
- =======
18
- ipPools:{{ printf "{{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}" }}
19
- - cidr : {{ printf "{{ $cidr }}" }}
20
- encapsulation : None
21
- natOutgoing : Enabled
22
- nodeSelector : all(){{ printf "{{ end }}" }}
23
- >>>>>>> cefd0dc (ci: set structure for sync tool)
24
11
nodeMetricsPort : 9091
25
12
typhaMetricsPort : 9093
26
13
registry : quay.io/
Original file line number Diff line number Diff line change 1
- <<<<<<< HEAD
2
- =======
3
- # Copyright 2023 Nutanix. All rights reserved.
4
- # SPDX-License-Identifier: Apache-2.0
5
- >>>>>>> cefd0dc (ci: set structure for sync tool)
6
1
7
2
installation :
8
3
cni :
9
4
type : Calico
10
5
calicoNetwork :
11
6
bgp : Enabled
12
- <<<<<<< HEAD
13
7
ipPools:{{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
14
8
- cidr : " {{ $cidr }}"
15
9
encapsulation : None
16
10
natOutgoing : Enabled
17
11
nodeSelector : all(){{ end }}
18
- =======
19
- ipPools:{{ printf "{{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}" }}
20
- - cidr : {{ printf "{{ $cidr }}" }}
21
- encapsulation : None
22
- natOutgoing : Enabled
23
- nodeSelector : all(){{ printf "{{ end }}" }}
24
- >>>>>>> cefd0dc (ci: set structure for sync tool)
25
12
nodeMetricsPort : 9091
26
13
typhaMetricsPort : 9093
27
14
registry : quay.io/
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1
- <<<<<<< HEAD
2
- =======
3
- # Copyright 2024 Nutanix. All rights reserved.
4
- # SPDX-License-Identifier: Apache-2.0
5
- >>>>>>> cefd0dc (ci: set structure for sync tool)
6
1
7
2
---
8
3
cni :
9
4
chainingMode : portmap
10
- <<<<<<< HEAD
11
5
exclusive : false
12
- =======
13
- >>>>>>> cefd0dc (ci: set structure for sync tool)
14
6
hubble :
15
7
tls :
16
8
auto :
@@ -28,8 +20,5 @@ operator:
28
20
certgen :
29
21
image :
30
22
useDigest : false
31
- <<<<<<< HEAD
32
23
socketLB :
33
24
hostNamespaceOnly : true
34
- =======
35
- >>>>>>> cefd0dc (ci: set structure for sync tool)
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1
- <<<<<<< HEAD
2
1
3
2
# The Secret containing the credentials will be created by the handler.
4
3
createPrismCentralSecret : false
5
4
pcSecretName : nutanix-csi-credentials
6
5
createSecret : false
7
- =======
8
- # The Secret containing the credentials will be created by the handler.
9
- createPrismCentralSecret : false
10
- pcSecretName : nutanix-csi-credentials
11
- >>>>>>> cefd0dc (ci: set structure for sync tool)
12
6
13
7
tolerations :
14
8
- key : CriticalAddonsOnly
Original file line number Diff line number Diff line change 1
1
# Copyright 2024 Nutanix. All rights reserved.
2
2
# SPDX-License-Identifier: Apache-2.0
3
3
4
- <<<<<<< HEAD
5
4
{{- if (index .Values.hooks.csi "snapshot-controller").helmAddonStrategy.defaultValueTemplateConfigMap.create }}
6
5
apiVersion : v1
7
6
kind : ConfigMap
@@ -10,14 +9,4 @@ metadata:
10
9
data :
11
10
values.yaml : |-
12
11
{{- .Files.Get "addons/csi/snapshot-controller/values-template.yaml" | nindent 4 }}
13
- =======
14
- {{- if (index .Values.hooks.csi "local-path").helmAddonStrategy.defaultValueTemplateConfigMap.create }}
15
- apiVersion : v1
16
- kind : ConfigMap
17
- metadata :
18
- name : ' {{ (index .Values.hooks.csi "local-path").helmAddonStrategy.defaultValueTemplateConfigMap.name }}'
19
- data :
20
- values.yaml : |-
21
- {{- .Files.Get "addons/csi/local-path/values-template.yaml" | nindent 4 }}
22
- >>>>>>> cefd0dc (ci: set structure for sync tool)
23
12
{{- end -}}
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1
- <<<<<<< HEAD
2
1
3
2
controller :
4
3
priorityClassName : system-cluster-critical
@@ -16,22 +15,3 @@ controller:
16
15
operator : Exists
17
16
webhook :
18
17
enabled : false
19
- =======
20
- storageClass :
21
- create : false
22
- provisionerName : rancher.io/local-path
23
- helperImage :
24
- tag : 1.36.1
25
- tolerations :
26
- - key : CriticalAddonsOnly
27
- operator : Exists
28
- - effect : NoExecute
29
- operator : Exists
30
- tolerationSeconds : 300
31
- - effect : NoSchedule
32
- key : node-role.kubernetes.io/master
33
- operator : Exists
34
- - effect : NoSchedule
35
- key : node-role.kubernetes.io/control-plane
36
- operator : Exists
37
- >>>>>>> cefd0dc (ci: set structure for sync tool)
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1
- <<<<<<< HEAD
2
1
3
- =======
4
- >>>>>>> cefd0dc (ci: set structure for sync tool)
5
2
controller :
6
3
tolerations :
7
4
- key : node-role.kubernetes.io/control-plane
You can’t perform that action at this time.
0 commit comments