ci: set structure for sync tool

faiq · faiq · commit d68d5fe1078e · 2024-08-15T13:38:15.000-07:00
diff --git a/hack/addons/kustomize/ccm/aws/manifests/values-template.yaml b/hack/addons/kustomize/ccm/aws/manifests/values-template.yaml
@@ -1,3 +1,10 @@
+<<<<<<< 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
@@ -12,8 +19,11 @@ 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)
diff --git a/hack/addons/kustomize/cluster-autoscaler/manifests/values-template.yaml b/hack/addons/kustomize/cluster-autoscaler/manifests/values-template.yaml
@@ -1,5 +1,17 @@
+<<<<<<< HEAD
 ---
 fullnameOverride: "cluster-autoscaler-{{ index .Cluster.Annotations "caren.nutanix.com/cluster-uuid" }}
+=======
+# Copyright 2023 Nutanix. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+# This is used to generate CRS
+---
+# This is a hack, but because a single cluster-autoscaler deployment can only monitor a single Kubernetes cluster
+# we expect 'tmp-clustername-tmpl', 'tmpl-clusternamespace-tmpl' and 'tmpl-clusteruuid-tmpl'
+# to be replaced with the Cluster's name and namespace.
+fullnameOverride: cluster-autoscaler-tmpl-clusteruuid-tmpl
+>>>>>>> cefd0dc (ci: set structure for sync tool)
 
 cloudProvider: clusterapi
 
@@ -14,18 +26,31 @@ tolerations:
 
 # Limit a single cluster-autoscaler Deployment to a single Cluster.
 autoDiscovery:
+<<<<<<< HEAD
   clusterName: {{ .Cluster.Name }}
   # The controller failed with an RBAC error trying to watch CAPI objects at the cluster scope without this.
   labels:
     - namespace: {{ .Cluster.Namespace }}
 
+=======
+  clusterName: tmpl-clustername-tmpl
+  # The controller failed with an RBAC error trying to watch CAPI objects at the cluster scope without this.
+  labels:
+    - namespace: tmpl-clusternamespace-tmpl
+
+clusterAPIConfigMapsNamespace: tmpl-clusternamespace-tmpl
+>>>>>>> cefd0dc (ci: set structure for sync tool)
 # For workload clusters it is not possible to use the in-cluster client.
 # To simplify the configuration, use the admin kubeconfig generated by CAPI for all clusters.
 clusterAPIMode: kubeconfig-incluster
 clusterAPIWorkloadKubeconfigPath: /cluster/kubeconfig
 extraVolumeSecrets:
   kubeconfig:
+<<<<<<< HEAD
     name: "{{ .Cluster.Name }}-kubeconfig"
+=======
+    name: tmpl-clusteruuid-tmpl-kubeconfig
+>>>>>>> cefd0dc (ci: set structure for sync tool)
     mountPath: /cluster
     readOnly: true
     items:
diff --git a/hack/addons/kustomize/cni/calico/manifests/aws/helm-addon-installation.yaml b/hack/addons/kustomize/cni/calico/manifests/aws/helm-addon-installation.yaml
@@ -1,6 +1,7 @@
 # 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
@@ -9,4 +10,14 @@ 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 -}}
diff --git a/hack/addons/kustomize/cni/calico/manifests/aws/values-template.yaml b/hack/addons/kustomize/cni/calico/manifests/aws/values-template.yaml
@@ -1,14 +1,27 @@
+<<<<<<< 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/
diff --git a/hack/addons/kustomize/cni/calico/manifests/docker/values-template.yaml b/hack/addons/kustomize/cni/calico/manifests/docker/values-template.yaml
@@ -1,13 +1,26 @@
+<<<<<<< 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/
diff --git a/hack/addons/kustomize/cni/calico/manifests/nutanix/values-template.yaml b/hack/addons/kustomize/cni/calico/manifests/nutanix/values-template.yaml
@@ -1,14 +1,27 @@
+<<<<<<< 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/
diff --git a/hack/addons/kustomize/cni/cilium/manifests/values-template.yaml b/hack/addons/kustomize/cni/cilium/manifests/values-template.yaml
@@ -1,8 +1,16 @@
+<<<<<<< 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:
@@ -20,5 +28,8 @@ operator:
 certgen:
   image:
     useDigest: false
+<<<<<<< HEAD
 socketLB:
   hostNamespaceOnly: true
+=======
+>>>>>>> cefd0dc (ci: set structure for sync tool)
diff --git a/hack/addons/kustomize/csi/nutanix/manifests/values-template.yaml b/hack/addons/kustomize/csi/nutanix/manifests/values-template.yaml
@@ -1,8 +1,14 @@
+<<<<<<< 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
diff --git a/hack/addons/kustomize/csi/snapshot-controller/manifests/helm-addon-installation.yaml b/hack/addons/kustomize/csi/snapshot-controller/manifests/helm-addon-installation.yaml
@@ -1,6 +1,7 @@
 # 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
@@ -9,4 +10,14 @@ 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 -}}
diff --git a/hack/addons/kustomize/csi/snapshot-controller/manifests/values-template.yaml b/hack/addons/kustomize/csi/snapshot-controller/manifests/values-template.yaml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 controller:
   priorityClassName: system-cluster-critical
@@ -15,3 +16,22 @@ 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)
diff --git a/hack/addons/kustomize/serviceloadbalancer/metallb/values-template.yaml b/hack/addons/kustomize/serviceloadbalancer/metallb/values-template.yaml
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 
+=======
+>>>>>>> cefd0dc (ci: set structure for sync tool)
 controller:
   tolerations:
     - key: node-role.kubernetes.io/control-plane
