diff --git a/templates/ccm/nutanix-ccm.yaml b/templates/ccm/nutanix-ccm.yaml index ff7392422d..ccd038ed96 100644 --- a/templates/ccm/nutanix-ccm.yaml +++ b/templates/ccm/nutanix-ccm.yaml @@ -41,7 +41,10 @@ data: "enableCustomLabeling": ${CCM_CUSTOM_LABEL=false}, "topologyDiscovery": { "type": "Prism" - } + }, + "ignoredNodeIPs": [ + "${CONTROL_PLANE_ENDPOINT_IP}" + ] } --- # Source: nutanix-cloud-provider/templates/rbac.yaml diff --git a/templates/cluster-template-csi.yaml b/templates/cluster-template-csi.yaml index 8eef22a3a0..cf882e9a2a 100644 --- a/templates/cluster-template-csi.yaml +++ b/templates/cluster-template-csi.yaml @@ -52,7 +52,10 @@ data: "enableCustomLabeling": ${CCM_CUSTOM_LABEL=false}, "topologyDiscovery": { "type": "Prism" - } + }, + "ignoredNodeIPs": [ + "${CONTROL_PLANE_ENDPOINT_IP}" + ] } --- # Source: nutanix-cloud-provider/templates/rbac.yaml diff --git a/templates/cluster-template-csi3.yaml b/templates/cluster-template-csi3.yaml index 9c9e4ee037..610d73615b 100644 --- a/templates/cluster-template-csi3.yaml +++ b/templates/cluster-template-csi3.yaml @@ -52,7 +52,10 @@ data: "enableCustomLabeling": ${CCM_CUSTOM_LABEL=false}, "topologyDiscovery": { "type": "Prism" - } + }, + "ignoredNodeIPs": [ + "${CONTROL_PLANE_ENDPOINT_IP}" + ] } --- # Source: nutanix-cloud-provider/templates/rbac.yaml diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml index d7e3d925ab..ad343582d5 100644 --- a/templates/cluster-template-topology.yaml +++ b/templates/cluster-template-topology.yaml @@ -51,7 +51,10 @@ data: "enableCustomLabeling": ${CCM_CUSTOM_LABEL=false}, "topologyDiscovery": { "type": "Prism" - } + }, + "ignoredNodeIPs": [ + "${CONTROL_PLANE_ENDPOINT_IP}" + ] } --- # Source: nutanix-cloud-provider/templates/rbac.yaml diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index d7eaa62e9f..0e3241d5bd 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -52,7 +52,10 @@ data: "enableCustomLabeling": ${CCM_CUSTOM_LABEL=false}, "topologyDiscovery": { "type": "Prism" - } + }, + "ignoredNodeIPs": [ + "${CONTROL_PLANE_ENDPOINT_IP}" + ] } --- # Source: nutanix-cloud-provider/templates/rbac.yaml diff --git a/test/e2e/data/infrastructure-nutanix/ccm-update.yaml b/test/e2e/data/infrastructure-nutanix/ccm-update.yaml index c4237c73a7..c6f1a54681 100644 --- a/test/e2e/data/infrastructure-nutanix/ccm-update.yaml +++ b/test/e2e/data/infrastructure-nutanix/ccm-update.yaml @@ -44,7 +44,10 @@ data: "enableCustomLabeling": ${CCM_CUSTOM_LABEL=false}, "topologyDiscovery": { "type": "Prism" - } + }, + "ignoredNodeIPs": [ + "${CONTROL_PLANE_ENDPOINT_IP}" + ] } --- # Source: nutanix-cloud-provider/templates/rbac.yaml @@ -223,7 +226,8 @@ metadata: name: nutanix-ccm-secret namespace: ${PATCH_NAMESPACE=clusterctl-upgrade} stringData: - nutanix-ccm-secret.yaml: "apiVersion: v1\nkind: Secret\nmetadata:\n name: nutanix-creds\n + nutanix-ccm-secret.yaml: + "apiVersion: v1\nkind: Secret\nmetadata:\n name: nutanix-creds\n \ namespace: kube-system\nstringData:\n credentials: |\n [\n {\n \"type\": \"basic_auth\", \n \"data\": { \n \"prismCentral\":{\n \"username\": \"${NUTANIX_USER}\",\n \"password\": \"${NUTANIX_PASSWORD}\"\n },\n @@ -240,10 +244,10 @@ spec: matchLabels: ccm: nutanix resources: - - kind: ConfigMap - name: nutanix-ccm - - kind: Secret - name: nutanix-ccm-secret - - kind: ConfigMap - name: user-ca-bundle + - kind: ConfigMap + name: nutanix-ccm + - kind: Secret + name: nutanix-ccm-secret + - kind: ConfigMap + name: user-ca-bundle strategy: ApplyOnce