Update CCM to v0.4.0

Update cluster templates
nutanix-cloud-native · Jul 23, 2024 · 8e2aacf · 8e2aacf
1 parent a4d9c84
commit 8e2aacf
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 279 deletions.
diff --git a/templates/ccm/nutanix-ccm.yaml b/templates/ccm/nutanix-ccm.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ${CLUSTER_NAME}-pc-trusted-ca-bundle
+  name: nutanix-ccm-pc-trusted-ca-bundle
   namespace: kube-system
 binaryData:
   ca.crt: ${NUTANIX_ADDITIONAL_TRUST_BUNDLE=""}
@@ -34,7 +34,7 @@ data:
         },
         "additionalTrustBundle": {
           "kind": "ConfigMap",
-          "name": "${CLUSTER_NAME}-pc-trusted-ca-bundle",
+          "name": "nutanix-ccm-pc-trusted-ca-bundle",
           "namespace": "kube-system"
         }
       },
@@ -186,7 +186,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.3.2}"
+        - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.0}"
           imagePullPolicy: IfNotPresent
           name: nutanix-cloud-controller-manager
           env:

diff --git a/templates/cluster-template-csi.yaml b/templates/cluster-template-csi.yaml
@@ -13,7 +13,7 @@ data:
     apiVersion: v1
     kind: ConfigMap
     metadata:
-      name: ${CLUSTER_NAME}-pc-trusted-ca-bundle
+      name: nutanix-ccm-pc-trusted-ca-bundle
       namespace: kube-system
     binaryData:
       ca.crt: ${NUTANIX_ADDITIONAL_TRUST_BUNDLE=""}
@@ -45,7 +45,7 @@ data:
             },
             "additionalTrustBundle": {
               "kind": "ConfigMap",
-              "name": "${CLUSTER_NAME}-pc-trusted-ca-bundle",
+              "name": "nutanix-ccm-pc-trusted-ca-bundle",
               "namespace": "kube-system"
             }
           },
@@ -197,7 +197,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.3.2}"
+            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.0}"
               imagePullPolicy: IfNotPresent
               name: nutanix-cloud-controller-manager
               env:

diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml
@@ -196,7 +196,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.3.2}"
+            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.0}"
               imagePullPolicy: IfNotPresent
               name: nutanix-cloud-controller-manager
               env:
@@ -207,6 +207,7 @@ data:
               args:
                 - "--leader-elect=true"
                 - "--cloud-config=/etc/cloud/nutanix_config.json"
+                - "--tls-cipher-suites=${TLS_CIPHER_SUITES=TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256}"
               resources:
                 requests:
                   cpu: 100m

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -13,7 +13,7 @@ data:
     apiVersion: v1
     kind: ConfigMap
     metadata:
-      name: ${CLUSTER_NAME}-pc-trusted-ca-bundle
+      name: nutanix-ccm-pc-trusted-ca-bundle
       namespace: kube-system
     binaryData:
       ca.crt: ${NUTANIX_ADDITIONAL_TRUST_BUNDLE=""}
@@ -45,7 +45,7 @@ data:
             },
             "additionalTrustBundle": {
               "kind": "ConfigMap",
-              "name": "${CLUSTER_NAME}-pc-trusted-ca-bundle",
+              "name": "nutanix-ccm-pc-trusted-ca-bundle",
               "namespace": "kube-system"
             }
           },
@@ -197,7 +197,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.3.2}"
+            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.0}"
               imagePullPolicy: IfNotPresent
               name: nutanix-cloud-controller-manager
               env:

diff --git a/templates/topology/kustomization.yaml b/templates/topology/kustomization.yaml
@@ -1,18 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-configMapGenerator:
-- behavior: merge
-  files:
-  - nutanix-ccm.yaml
-  name: nutanix-ccm
-
-
 resources:
+- ../ccm
 - ./cm.yaml
 - ./cluster-with-topology.yaml
 - ./secret.yaml
-- ./nutanix-ccm-secret.yaml
-- ./nutanix-ccm-crs.yaml
+
 patches:
 - path: ./ccm-patch.yaml
diff --git a/templates/topology/nutanix-ccm-crs.yaml b/templates/topology/nutanix-ccm-crs.yaml
diff --git a/templates/topology/nutanix-ccm-secret.yaml b/templates/topology/nutanix-ccm-secret.yaml
diff --git a/templates/topology/nutanix-ccm.yaml b/templates/topology/nutanix-ccm.yaml
diff --git a/test/e2e/data/infrastructure-nutanix/ccm-update.yaml b/test/e2e/data/infrastructure-nutanix/ccm-update.yaml
@@ -189,7 +189,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.3.2}"
+            - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.4.0}"
               imagePullPolicy: IfNotPresent
               name: nutanix-cloud-controller-manager
               env: