Skip to content

Commit 206bb64

Browse files
committed
fix: minor pre-commit issues
1 parent 9a9aad9 commit 206bb64

File tree

15 files changed

+0
-235
lines changed

15 files changed

+0
-235
lines changed
Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
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)
81
---
92
# Starting in Kubernetes v1.29 the Kubelet no longer adds temporary addresses to the Node.
103
# See https://github.com/kubernetes/kubernetes/pull/121028
@@ -19,11 +12,8 @@ args:
1912
- --v=2
2013
- --cloud-provider=aws
2114
- --configure-cloud-routes=false
22-
<<<<<<< HEAD
2315

2416
{{ $clusterSemver := semver .Cluster.spec.topology.version }}
2517
{{ $ccmVersion := get $k8sMinorVersionToCCMVersion ( print $clusterSemver.Major "." $clusterSemver.Minor ) }}
2618
image:
2719
tag: {{ $ccmVersion }}
28-
=======
29-
>>>>>>> cefd0dc (ci: set structure for sync tool)
Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Copyright 2023 Nutanix. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
<<<<<<< HEAD
54
{{- if .Values.hooks.cni.calico.helmAddonStrategy.defaultValueTemplatesConfigMaps.AWSCluster.create }}
65
apiVersion: v1
76
kind: ConfigMap
@@ -10,14 +9,4 @@ metadata:
109
data:
1110
values.yaml: |-
1211
{{- .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)
2312
{{- end -}}
Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
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)
61

72
installation:
83
cni:
94
type: Calico
105
calicoNetwork:
116
bgp: Enabled
12-
<<<<<<< HEAD
137
ipPools: {{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
148
- cidr: "{{ $cidr }}"
159
encapsulation: None
1610
natOutgoing: Enabled
1711
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)
2512
nodeMetricsPort: 9091
2613
typhaMetricsPort: 9093
2714
registry: quay.io/
Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,13 @@
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)
61

72
installation:
83
cni:
94
type: Calico
105
calicoNetwork:
11-
<<<<<<< HEAD
126
ipPools:{{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
137
- cidr: "{{ $cidr }}"
148
encapsulation: None
159
natOutgoing: Enabled
1610
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)
2411
nodeMetricsPort: 9091
2512
typhaMetricsPort: 9093
2613
registry: quay.io/
Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
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)
61

72
installation:
83
cni:
94
type: Calico
105
calicoNetwork:
116
bgp: Enabled
12-
<<<<<<< HEAD
137
ipPools:{{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
148
- cidr: "{{ $cidr }}"
159
encapsulation: None
1610
natOutgoing: Enabled
1711
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)
2512
nodeMetricsPort: 9091
2613
typhaMetricsPort: 9093
2714
registry: quay.io/

hack/addons/kustomize/cni/cilium/manifests/helm-values.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
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)
61

72
---
83
cni:
94
chainingMode: portmap
10-
<<<<<<< HEAD
115
exclusive: false
12-
=======
13-
>>>>>>> cefd0dc (ci: set structure for sync tool)
146
hubble:
157
tls:
168
auto:
@@ -28,8 +20,5 @@ operator:
2820
certgen:
2921
image:
3022
useDigest: false
31-
<<<<<<< HEAD
3223
socketLB:
3324
hostNamespaceOnly: true
34-
=======
35-
>>>>>>> cefd0dc (ci: set structure for sync tool)

hack/addons/kustomize/csi/aws-ebs/manifests/helm-values.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

hack/addons/kustomize/csi/local-path/manifests/helm-values.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

hack/addons/kustomize/csi/nutanix/manifests/values-template.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
<<<<<<< HEAD
21

32
# The Secret containing the credentials will be created by the handler.
43
createPrismCentralSecret: false
54
pcSecretName: nutanix-csi-credentials
65
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)
126

137
tolerations:
148
- key: CriticalAddonsOnly
Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Copyright 2024 Nutanix. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
<<<<<<< HEAD
54
{{- if (index .Values.hooks.csi "snapshot-controller").helmAddonStrategy.defaultValueTemplateConfigMap.create }}
65
apiVersion: v1
76
kind: ConfigMap
@@ -10,14 +9,4 @@ metadata:
109
data:
1110
values.yaml: |-
1211
{{- .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)
2312
{{- end -}}

hack/addons/kustomize/csi/snapshot-controller/manifests/helm-values.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21

32
controller:
43
priorityClassName: system-cluster-critical
@@ -16,22 +15,3 @@ controller:
1615
operator: Exists
1716
webhook:
1817
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)

hack/addons/kustomize/nfd/manifests/helm-values.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

hack/addons/kustomize/serviceloadbalancer/metallb/values-template.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
<<<<<<< HEAD
21

3-
=======
4-
>>>>>>> cefd0dc (ci: set structure for sync tool)
52
controller:
63
tolerations:
74
- key: node-role.kubernetes.io/control-plane

0 commit comments

Comments
 (0)