fixed the naming of all the objects which was getting overriden thru sync.sh

disabled for nutanix till we find a better solution for e2e

Author: deepakm-ntnx

examples/capi-quick-start/nutanix-cluster-calico-crs.yaml

@@ -3,7 +3,7 @@ binaryData:
   ca.crt: ${NUTANIX_ADDITIONAL_TRUST_BUNDLE=""}
 kind: ConfigMap
 metadata:
-  name: ${CLUSTER_NAME}
+  name: ${CLUSTER_NAME}-pc-trusted-ca-bundle
 ---
 apiVersion: v1
 data:
@@ -221,12 +221,12 @@ data:
                 name: nutanix-config
 kind: ConfigMap
 metadata:
-  name: ${CLUSTER_NAME}
+  name: nutanix-ccm
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ${CLUSTER_NAME}
+  name: ${CLUSTER_NAME}-pc-creds
 stringData:
   credentials: |
     [
@@ -244,7 +244,7 @@ stringData:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ${CLUSTER_NAME}
+  name: nutanix-ccm-secret
 stringData:
   nutanix-ccm-secret.yaml: |
     apiVersion: v1
@@ -271,7 +271,7 @@ type: addons.cluster.x-k8s.io/resource-set
 apiVersion: addons.cluster.x-k8s.io/v1beta1
 kind: ClusterResourceSet
 metadata:
-  name: ${CLUSTER_NAME}
+  name: nutanix-ccm-crs
 spec:
   clusterSelector:
     matchLabels:
@@ -336,6 +336,7 @@ spec:
             port: ${CONTROL_PLANE_ENDPOINT_PORT}
           prismCentralEndpoint:
             additionalTrustBundle: trust-bundle-root-ca
+            credentialSecret: ${CLUSTER_NAME}-pc-creds
             host: ${NUTANIX_ENDPOINT}
             insecure: ${NUTANIX_INSECURE}
             port: 9440

examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml

@@ -3,7 +3,7 @@ binaryData:
   ca.crt: ${NUTANIX_ADDITIONAL_TRUST_BUNDLE=""}
 kind: ConfigMap
 metadata:
-  name: ${CLUSTER_NAME}
+  name: ${CLUSTER_NAME}-pc-trusted-ca-bundle
 ---
 apiVersion: v1
 data:
@@ -221,12 +221,12 @@ data:
                 name: nutanix-config
 kind: ConfigMap
 metadata:
-  name: ${CLUSTER_NAME}
+  name: nutanix-ccm
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ${CLUSTER_NAME}
+  name: ${CLUSTER_NAME}-pc-creds
 stringData:
   credentials: |
     [
@@ -244,7 +244,7 @@ stringData:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ${CLUSTER_NAME}
+  name: nutanix-ccm-secret
 stringData:
   nutanix-ccm-secret.yaml: |
     apiVersion: v1
@@ -271,7 +271,7 @@ type: addons.cluster.x-k8s.io/resource-set
 apiVersion: addons.cluster.x-k8s.io/v1beta1
 kind: ClusterResourceSet
 metadata:
-  name: ${CLUSTER_NAME}
+  name: nutanix-ccm-crs
 spec:
   clusterSelector:
     matchLabels:
@@ -336,6 +336,7 @@ spec:
             port: ${CONTROL_PLANE_ENDPOINT_PORT}
           prismCentralEndpoint:
             additionalTrustBundle: trust-bundle-root-ca
+            credentialSecret: ${CLUSTER_NAME}-pc-creds
             host: ${NUTANIX_ENDPOINT}
             insecure: ${NUTANIX_INSECURE}
             port: 9440

examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml

@@ -3,7 +3,7 @@ binaryData:
   ca.crt: ${NUTANIX_ADDITIONAL_TRUST_BUNDLE=""}
 kind: ConfigMap
 metadata:
-  name: ${CLUSTER_NAME}
+  name: ${CLUSTER_NAME}-pc-trusted-ca-bundle
 ---
 apiVersion: v1
 data:
@@ -221,12 +221,12 @@ data:
                 name: nutanix-config
 kind: ConfigMap
 metadata:
-  name: ${CLUSTER_NAME}
+  name: nutanix-ccm
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ${CLUSTER_NAME}
+  name: ${CLUSTER_NAME}-pc-creds
 stringData:
   credentials: |
     [
@@ -244,7 +244,7 @@ stringData:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ${CLUSTER_NAME}
+  name: nutanix-ccm-secret
 stringData:
   nutanix-ccm-secret.yaml: |
     apiVersion: v1
@@ -271,7 +271,7 @@ type: addons.cluster.x-k8s.io/resource-set
 apiVersion: addons.cluster.x-k8s.io/v1beta1
 kind: ClusterResourceSet
 metadata:
-  name: ${CLUSTER_NAME}
+  name: nutanix-ccm-crs
 spec:
   clusterSelector:
     matchLabels:
@@ -336,6 +336,7 @@ spec:
             port: ${CONTROL_PLANE_ENDPOINT_PORT}
           prismCentralEndpoint:
             additionalTrustBundle: trust-bundle-root-ca
+            credentialSecret: ${CLUSTER_NAME}-pc-creds
             host: ${NUTANIX_ENDPOINT}
             insecure: ${NUTANIX_INSECURE}
             port: 9440

examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml

@@ -3,7 +3,7 @@ binaryData:
   ca.crt: ${NUTANIX_ADDITIONAL_TRUST_BUNDLE=""}
 kind: ConfigMap
 metadata:
-  name: ${CLUSTER_NAME}
+  name: ${CLUSTER_NAME}-pc-trusted-ca-bundle
 ---
 apiVersion: v1
 data:
@@ -221,12 +221,12 @@ data:
                 name: nutanix-config
 kind: ConfigMap
 metadata:
-  name: ${CLUSTER_NAME}
+  name: nutanix-ccm
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ${CLUSTER_NAME}
+  name: ${CLUSTER_NAME}-pc-creds
 stringData:
   credentials: |
     [
@@ -244,7 +244,7 @@ stringData:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ${CLUSTER_NAME}
+  name: nutanix-ccm-secret
 stringData:
   nutanix-ccm-secret.yaml: |
     apiVersion: v1
@@ -271,7 +271,7 @@ type: addons.cluster.x-k8s.io/resource-set
 apiVersion: addons.cluster.x-k8s.io/v1beta1
 kind: ClusterResourceSet
 metadata:
-  name: ${CLUSTER_NAME}
+  name: nutanix-ccm-crs
 spec:
   clusterSelector:
     matchLabels:
@@ -336,6 +336,7 @@ spec:
             port: ${CONTROL_PLANE_ENDPOINT_PORT}
           prismCentralEndpoint:
             additionalTrustBundle: trust-bundle-root-ca
+            credentialSecret: ${CLUSTER_NAME}-pc-creds
             host: ${NUTANIX_ENDPOINT}
             insecure: ${NUTANIX_INSECURE}
             port: 9440

hack/examples/base/nutanix/cluster-topology/kustomization.yaml.tmpl

@@ -63,6 +63,7 @@ patches:
                   host: $${NUTANIX_ENDPOINT}
                   insecure: $${NUTANIX_INSECURE}
                   port: 9440
+                  credentialSecret: $${CLUSTER_NAME}-pc-creds
               controlPlane:
                   nutanix:
                     machineDetails:

hack/examples/sync.sh

@@ -105,7 +105,9 @@ kustomize build ./hack/examples |
     >/dev/null
 
 #shellcheck disable=SC2016
-sed -i'' 's/^  name: .\+$/  name: ${CLUSTER_NAME}/' "${EXAMPLE_CLUSTERS_DIR}"/*.yaml
+# TODO: deepakm-ntnx this is affecting examples of nutanix where there are 2 secrets gets same name
+sed -i'' 's/^  name: .\+$/  name: ${CLUSTER_NAME}/' "${EXAMPLE_CLUSTERS_DIR}"/aws*.yaml
+sed -i'' 's/^  name: .\+$/  name: ${CLUSTER_NAME}/' "${EXAMPLE_CLUSTERS_DIR}"/docker*.yaml
 
 # TODO Remove once kustomize supports retaining quotes in what will be numeric values.
 #shellcheck disable=SC2016