From 2e490e78b22e3b67b777aafca7569da7e4c8981b Mon Sep 17 00:00:00 2001 From: Dimitri Koshkin Date: Thu, 16 Jan 2025 08:59:16 -0800 Subject: [PATCH 1/6] fix: update AWS CCM to latest versions --- .../cluster-api-runtime-extensions-nutanix/README.md | 10 +++++----- .../cluster-api-runtime-extensions-nutanix/values.yaml | 10 +++++----- make/addons.mk | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/cluster-api-runtime-extensions-nutanix/README.md b/charts/cluster-api-runtime-extensions-nutanix/README.md index 987df6923..7a2bad3a5 100644 --- a/charts/cluster-api-runtime-extensions-nutanix/README.md +++ b/charts/cluster-api-runtime-extensions-nutanix/README.md @@ -44,11 +44,11 @@ A Helm chart for cluster-api-runtime-extensions-nutanix | helmRepository.securityContext.runAsUser | int | `65532` | | | hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` | | | hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-aws-ccm-helm-values-template"` | | -| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.27" | string | `"v1.27.9"` | | -| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.28" | string | `"v1.28.9"` | | -| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.29" | string | `"v1.29.6"` | | -| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.30" | string | `"v1.30.3"` | | -| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.31" | string | `"v1.31.1"` | | +| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.27" | string | `"v1.27.10"` | | +| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.28" | string | `"v1.28.10"` | | +| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.29" | string | `"v1.29.7"` | | +| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.30" | string | `"v1.30.6"` | | +| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.31" | string | `"v1.31.4"` | | | hooks.ccm.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` | | | hooks.ccm.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nutanix-ccm-helm-values-template"` | | | hooks.clusterAutoscaler.crsStrategy.defaultInstallationConfigMap.name | string | `"cluster-autoscaler"` | | diff --git a/charts/cluster-api-runtime-extensions-nutanix/values.yaml b/charts/cluster-api-runtime-extensions-nutanix/values.yaml index b616d98cc..0a4f7edcd 100644 --- a/charts/cluster-api-runtime-extensions-nutanix/values.yaml +++ b/charts/cluster-api-runtime-extensions-nutanix/values.yaml @@ -72,11 +72,11 @@ hooks: name: default-nutanix-ccm-helm-values-template aws: k8sMinorVersionToCCMVersion: - "1.27": "v1.27.9" - "1.28": "v1.28.9" - "1.29": "v1.29.6" - "1.30": "v1.30.3" - "1.31": "v1.31.1" + "1.27": "v1.27.10" + "1.28": "v1.28.10" + "1.29": "v1.29.7" + "1.30": "v1.30.6" + "1.31": "v1.31.4" helmAddonStrategy: defaultValueTemplateConfigMap: create: true diff --git a/make/addons.mk b/make/addons.mk index a5b3898ad..a414e164b 100644 --- a/make/addons.mk +++ b/make/addons.mk @@ -13,11 +13,11 @@ export SNAPSHOT_CONTROLLER_CHART_VERSION := 3.0.6 # be updated by the addon kustomization for CRS deployments and via Helm values for HelmAddon deployments. export AWS_CCM_CHART_VERSION := 0.0.8 # A map of AWS CCM versions. -export AWS_CCM_VERSION_127 := v1.27.9 -export AWS_CCM_VERSION_128 := v1.28.9 -export AWS_CCM_VERSION_129 := v1.29.6 -export AWS_CCM_VERSION_130 := v1.30.3 -export AWS_CCM_VERSION_131 := v1.31.1 +export AWS_CCM_VERSION_127 := v1.27.10 +export AWS_CCM_VERSION_128 := v1.28.10 +export AWS_CCM_VERSION_129 := v1.29.7 +export AWS_CCM_VERSION_130 := v1.30.6 +export AWS_CCM_VERSION_131 := v1.31.4 export NUTANIX_CCM_CHART_VERSION := 0.4.1 From bdd3c7be5f09ff516c88884cc2abb3c17e980270 Mon Sep 17 00:00:00 2001 From: Dimitri Koshkin Date: Thu, 16 Jan 2025 11:07:09 -0800 Subject: [PATCH 2/6] fix: 1.27 --- ....27.9-configmap.yaml => aws-ccm-v1.27.10-configmap.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/{aws-ccm-v1.27.9-configmap.yaml => aws-ccm-v1.27.10-configmap.yaml} (98%) diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.27.9-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.27.10-configmap.yaml similarity index 98% rename from charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.27.9-configmap.yaml rename to charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.27.10-configmap.yaml index 033322b4c..8677c2e42 100644 --- a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.27.9-configmap.yaml +++ b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.27.10-configmap.yaml @@ -7,7 +7,7 @@ #================================================================= apiVersion: v1 data: - aws-ccm-v1.27.9.yaml: | + aws-ccm-v1.27.10.yaml: | apiVersion: v1 kind: ServiceAccount metadata: @@ -160,7 +160,7 @@ data: - --cloud-provider=aws - --configure-cloud-routes=false env: [] - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.9 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.10 name: aws-cloud-controller-manager resources: requests: @@ -184,4 +184,4 @@ data: kind: ConfigMap metadata: creationTimestamp: null - name: aws-ccm-v1.27.9 + name: aws-ccm-v1.27.10 From 8354d09431d711a273fc590756fd74abae6bb478 Mon Sep 17 00:00:00 2001 From: Dimitri Koshkin Date: Thu, 16 Jan 2025 11:07:19 -0800 Subject: [PATCH 3/6] fix: 1.28 --- ....28.9-configmap.yaml => aws-ccm-v1.28.10-configmap.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/{aws-ccm-v1.28.9-configmap.yaml => aws-ccm-v1.28.10-configmap.yaml} (98%) diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.28.9-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.28.10-configmap.yaml similarity index 98% rename from charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.28.9-configmap.yaml rename to charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.28.10-configmap.yaml index 510f3b672..db2c09be5 100644 --- a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.28.9-configmap.yaml +++ b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.28.10-configmap.yaml @@ -7,7 +7,7 @@ #================================================================= apiVersion: v1 data: - aws-ccm-v1.28.9.yaml: | + aws-ccm-v1.28.10.yaml: | apiVersion: v1 kind: ServiceAccount metadata: @@ -160,7 +160,7 @@ data: - --cloud-provider=aws - --configure-cloud-routes=false env: [] - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.9 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.10 name: aws-cloud-controller-manager resources: requests: @@ -184,4 +184,4 @@ data: kind: ConfigMap metadata: creationTimestamp: null - name: aws-ccm-v1.28.9 + name: aws-ccm-v1.28.10 From 887aece0b86a640db10795abdbee4e25d2766bed Mon Sep 17 00:00:00 2001 From: Dimitri Koshkin Date: Thu, 16 Jan 2025 11:07:25 -0800 Subject: [PATCH 4/6] fix: 1.29 --- ...1.29.6-configmap.yaml => aws-ccm-v1.29.7-configmap.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/{aws-ccm-v1.29.6-configmap.yaml => aws-ccm-v1.29.7-configmap.yaml} (98%) diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.29.6-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.29.7-configmap.yaml similarity index 98% rename from charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.29.6-configmap.yaml rename to charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.29.7-configmap.yaml index 53d1a9be1..482c9824f 100644 --- a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.29.6-configmap.yaml +++ b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.29.7-configmap.yaml @@ -7,7 +7,7 @@ #================================================================= apiVersion: v1 data: - aws-ccm-v1.29.6.yaml: | + aws-ccm-v1.29.7.yaml: | apiVersion: v1 kind: ServiceAccount metadata: @@ -160,7 +160,7 @@ data: - --cloud-provider=aws - --configure-cloud-routes=false env: [] - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.29.6 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.29.7 name: aws-cloud-controller-manager resources: requests: @@ -184,4 +184,4 @@ data: kind: ConfigMap metadata: creationTimestamp: null - name: aws-ccm-v1.29.6 + name: aws-ccm-v1.29.7 From a131985efbbd6acbde7ad1c932d500768991aaef Mon Sep 17 00:00:00 2001 From: Dimitri Koshkin Date: Thu, 16 Jan 2025 11:08:05 -0800 Subject: [PATCH 5/6] fix: 1.30 --- ...1.30.3-configmap.yaml => aws-ccm-v1.30.6-configmap.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/{aws-ccm-v1.30.3-configmap.yaml => aws-ccm-v1.30.6-configmap.yaml} (98%) diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.30.3-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.30.6-configmap.yaml similarity index 98% rename from charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.30.3-configmap.yaml rename to charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.30.6-configmap.yaml index f8467c489..5c468b9a3 100644 --- a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.30.3-configmap.yaml +++ b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.30.6-configmap.yaml @@ -7,7 +7,7 @@ #================================================================= apiVersion: v1 data: - aws-ccm-v1.30.3.yaml: | + aws-ccm-v1.30.6.yaml: | apiVersion: v1 kind: ServiceAccount metadata: @@ -160,7 +160,7 @@ data: - --cloud-provider=aws - --configure-cloud-routes=false env: [] - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.30.3 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.30.6 name: aws-cloud-controller-manager resources: requests: @@ -184,4 +184,4 @@ data: kind: ConfigMap metadata: creationTimestamp: null - name: aws-ccm-v1.30.3 + name: aws-ccm-v1.30.6 From 6fa6d757ae2006312f172f82d6c5eaf596f98fef Mon Sep 17 00:00:00 2001 From: Dimitri Koshkin Date: Thu, 16 Jan 2025 11:08:26 -0800 Subject: [PATCH 6/6] fix: 1.31 --- ...1.31.1-configmap.yaml => aws-ccm-v1.31.4-configmap.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/{aws-ccm-v1.31.1-configmap.yaml => aws-ccm-v1.31.4-configmap.yaml} (98%) diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.31.1-configmap.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.31.4-configmap.yaml similarity index 98% rename from charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.31.1-configmap.yaml rename to charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.31.4-configmap.yaml index b697e54b2..bfbffa055 100644 --- a/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.31.1-configmap.yaml +++ b/charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.31.4-configmap.yaml @@ -7,7 +7,7 @@ #================================================================= apiVersion: v1 data: - aws-ccm-v1.31.1.yaml: | + aws-ccm-v1.31.4.yaml: | apiVersion: v1 kind: ServiceAccount metadata: @@ -160,7 +160,7 @@ data: - --cloud-provider=aws - --configure-cloud-routes=false env: [] - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.1 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.4 name: aws-cloud-controller-manager resources: requests: @@ -184,4 +184,4 @@ data: kind: ConfigMap metadata: creationTimestamp: null - name: aws-ccm-v1.31.1 + name: aws-ccm-v1.31.4