From 6ccc358cd1fedd38a49f4d8f3717465763a40188 Mon Sep 17 00:00:00 2001
From: Christophe Jauffret <reg-github@geo6.net>
Date: Mon, 26 Aug 2024 16:14:38 +0200
Subject: [PATCH] update ccm to 0.4.1 + add ignore CP

---
 templates/ccm/nutanix-ccm.yaml           | 7 +++++--
 templates/cluster-template-csi.yaml      | 7 +++++--
 templates/cluster-template-csi3.yaml     | 7 +++++--
 templates/cluster-template-topology.yaml | 7 +++++--
 templates/cluster-template.yaml          | 7 +++++--
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/templates/ccm/nutanix-ccm.yaml b/templates/ccm/nutanix-ccm.yaml
index baa002a5e1..8399d4bd25 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
@@ -186,7 +189,7 @@ spec:
           key: node.kubernetes.io/not-ready
           operator: Exists
       containers:
-        - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.0}"
+        - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.1}"
           imagePullPolicy: IfNotPresent
           name: nutanix-cloud-controller-manager
           env:
diff --git a/templates/cluster-template-csi.yaml b/templates/cluster-template-csi.yaml
index ff429ee80b..bb9ac4650c 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
@@ -197,7 +200,7 @@ data:
               key: node.kubernetes.io/not-ready
               operator: Exists
           containers:
-            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.0}"
+            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.1}"
               imagePullPolicy: IfNotPresent
               name: nutanix-cloud-controller-manager
               env:
diff --git a/templates/cluster-template-csi3.yaml b/templates/cluster-template-csi3.yaml
index 9b73695af1..5b24f73e23 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
@@ -197,7 +200,7 @@ data:
               key: node.kubernetes.io/not-ready
               operator: Exists
           containers:
-            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.0}"
+            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.1}"
               imagePullPolicy: IfNotPresent
               name: nutanix-cloud-controller-manager
               env:
diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml
index 64f6b3ef4f..8531f55028 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
@@ -196,7 +199,7 @@ data:
               key: node.kubernetes.io/not-ready
               operator: Exists
           containers:
-            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.0}"
+            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.1}"
               imagePullPolicy: IfNotPresent
               name: nutanix-cloud-controller-manager
               env:
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
index 35a388572c..35d110e774 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
@@ -197,7 +200,7 @@ data:
               key: node.kubernetes.io/not-ready
               operator: Exists
           containers:
-            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.0}"
+            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.1}"
               imagePullPolicy: IfNotPresent
               name: nutanix-cloud-controller-manager
               env: