fix: minor pre-commit issues

Author: faiq

hack/addons/kustomize/ccm/aws/manifests/values-template.yaml

@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-=======
-# Copyright 2024 Nutanix. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-# Used to generate CRS
->>>>>>> cefd0dc (ci: set structure for sync tool)
 ---
 # Starting in Kubernetes v1.29 the Kubelet no longer adds temporary addresses to the Node.
 # See https://github.com/kubernetes/kubernetes/pull/121028
@@ -19,11 +12,8 @@ args:
   - --v=2
   - --cloud-provider=aws
   - --configure-cloud-routes=false
-<<<<<<< HEAD
 
 {{ $clusterSemver := semver .Cluster.spec.topology.version }}
 {{ $ccmVersion := get $k8sMinorVersionToCCMVersion ( print $clusterSemver.Major "." $clusterSemver.Minor ) }}
 image:
   tag: {{ $ccmVersion }}
-=======
->>>>>>> cefd0dc (ci: set structure for sync tool)

hack/addons/kustomize/cni/calico/manifests/aws/helm-addon-installation.yaml

@@ -1,7 +1,6 @@
 # Copyright 2023 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-<<<<<<< HEAD
 {{- if .Values.hooks.cni.calico.helmAddonStrategy.defaultValueTemplatesConfigMaps.AWSCluster.create }}
 apiVersion: v1
 kind: ConfigMap
@@ -10,14 +9,4 @@ metadata:
 data:
   values.yaml: |-
     {{- .Files.Get "addons/cni/calico/aws/values-template.yaml" | nindent 4 }}
-=======
-{{- if .Values.hooks.cni.calico.helmAddonStrategy.defaultValueTemplatesConfigMaps.NutanixCluster.create }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: '{{ .Values.hooks.cni.calico.helmAddonStrategy.defaultValueTemplatesConfigMaps.NutanixCluster.name }}'
-data:
-  values.yaml: |-
-    {{- .Files.Get "addons/cni/calico/nutanix/values-template.yaml" | nindent 4 }}
->>>>>>> cefd0dc (ci: set structure for sync tool)
 {{- end -}}

hack/addons/kustomize/cni/calico/manifests/aws/values-template.yaml

@@ -1,27 +1,14 @@
-<<<<<<< HEAD
-=======
-# Copyright 2023 Nutanix. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
->>>>>>> cefd0dc (ci: set structure for sync tool)
 
 installation:
   cni:
     type: Calico
   calicoNetwork:
     bgp: Enabled
-<<<<<<< HEAD
     ipPools: {{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
     - cidr: "{{ $cidr }}"
       encapsulation: None
       natOutgoing: Enabled
       nodeSelector: all(){{ end }}
-=======
-    ipPools:{{ printf "{{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}" }}
-    - cidr: {{ printf "{{ $cidr }}" }}
-      encapsulation: None
-      natOutgoing: Enabled
-      nodeSelector: all(){{ printf "{{ end }}" }}
->>>>>>> cefd0dc (ci: set structure for sync tool)
   nodeMetricsPort: 9091
   typhaMetricsPort: 9093
   registry: quay.io/

hack/addons/kustomize/cni/calico/manifests/docker/values-template.yaml

@@ -1,26 +1,13 @@
-<<<<<<< HEAD
-=======
-# Copyright 2023 Nutanix. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
->>>>>>> cefd0dc (ci: set structure for sync tool)
 
 installation:
   cni:
     type: Calico
   calicoNetwork:
-<<<<<<< HEAD
     ipPools:{{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
     - cidr: "{{ $cidr }}"
       encapsulation: None
       natOutgoing: Enabled
       nodeSelector: all(){{ end }}
-=======
-    ipPools:{{ printf "{{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}" }}
-    - cidr: {{ printf "{{ $cidr }}" }}
-      encapsulation: None
-      natOutgoing: Enabled
-      nodeSelector: all(){{ printf "{{ end }}" }}
->>>>>>> cefd0dc (ci: set structure for sync tool)
   nodeMetricsPort: 9091
   typhaMetricsPort: 9093
   registry: quay.io/

hack/addons/kustomize/cni/calico/manifests/nutanix/values-template.yaml

@@ -1,27 +1,14 @@
-<<<<<<< HEAD
-=======
-# Copyright 2023 Nutanix. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
->>>>>>> cefd0dc (ci: set structure for sync tool)
 
 installation:
   cni:
     type: Calico
   calicoNetwork:
     bgp: Enabled
-<<<<<<< HEAD
     ipPools:{{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
     - cidr: "{{ $cidr }}"
       encapsulation: None
       natOutgoing: Enabled
       nodeSelector: all(){{ end }}
-=======
-    ipPools:{{ printf "{{ range $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}" }}
-    - cidr: {{ printf "{{ $cidr }}" }}
-      encapsulation: None
-      natOutgoing: Enabled
-      nodeSelector: all(){{ printf "{{ end }}" }}
->>>>>>> cefd0dc (ci: set structure for sync tool)
   nodeMetricsPort: 9091
   typhaMetricsPort: 9093
   registry: quay.io/

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

@@ -1,16 +1,8 @@
-<<<<<<< HEAD
-=======
-# Copyright 2024 Nutanix. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
->>>>>>> cefd0dc (ci: set structure for sync tool)
 
 ---
 cni:
   chainingMode: portmap
-<<<<<<< HEAD
   exclusive: false
-=======
->>>>>>> cefd0dc (ci: set structure for sync tool)
 hubble:
   tls:
     auto:
@@ -28,8 +20,5 @@ operator:
 certgen:
   image:
     useDigest: false
-<<<<<<< HEAD
 socketLB:
   hostNamespaceOnly: true
-=======
->>>>>>> cefd0dc (ci: set structure for sync tool)

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

@@ -1,14 +1,8 @@
-<<<<<<< HEAD
 
 # The Secret containing the credentials will be created by the handler.
 createPrismCentralSecret: false
 pcSecretName: nutanix-csi-credentials
 createSecret: false
-=======
-# The Secret containing the credentials will be created by the handler.
-createPrismCentralSecret: false
-pcSecretName: nutanix-csi-credentials
->>>>>>> cefd0dc (ci: set structure for sync tool)
 
 tolerations:
   - key: CriticalAddonsOnly

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

@@ -1,7 +1,6 @@
 # Copyright 2024 Nutanix. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-<<<<<<< HEAD
 {{- if (index .Values.hooks.csi "snapshot-controller").helmAddonStrategy.defaultValueTemplateConfigMap.create }}
 apiVersion: v1
 kind: ConfigMap
@@ -10,14 +9,4 @@ metadata:
 data:
   values.yaml: |-
     {{- .Files.Get "addons/csi/snapshot-controller/values-template.yaml" | nindent 4 }}
-=======
-{{- if (index .Values.hooks.csi "local-path").helmAddonStrategy.defaultValueTemplateConfigMap.create }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: '{{ (index .Values.hooks.csi "local-path").helmAddonStrategy.defaultValueTemplateConfigMap.name }}'
-data:
-  values.yaml: |-
-    {{- .Files.Get "addons/csi/local-path/values-template.yaml" | nindent 4 }}
->>>>>>> cefd0dc (ci: set structure for sync tool)
 {{- end -}}

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

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 
 controller:
   priorityClassName: system-cluster-critical
@@ -16,22 +15,3 @@ controller:
       operator: Exists
 webhook:
   enabled: false
-=======
-storageClass:
-  create: false
-  provisionerName: rancher.io/local-path
-helperImage:
-  tag: 1.36.1
-tolerations:
-  - key: CriticalAddonsOnly
-    operator: Exists
-  - effect: NoExecute
-    operator: Exists
-    tolerationSeconds: 300
-  - effect: NoSchedule
-    key: node-role.kubernetes.io/master
-    operator: Exists
-  - effect: NoSchedule
-    key: node-role.kubernetes.io/control-plane
-    operator: Exists
->>>>>>> cefd0dc (ci: set structure for sync tool)

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

@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 
-=======
->>>>>>> cefd0dc (ci: set structure for sync tool)
 controller:
   tolerations:
     - key: node-role.kubernetes.io/control-plane