feat: Update addon versions (#785)

Cilium -> 1.15.6 NFD -> 0.16.1 CA -> 9.37.0 AWS EBS CSI -> 2.32.0 KubeVIP -> 0.8.1
nutanix-cloud-native · Jul 5, 2024 · e3fdc16 · e3fdc16
1 parent b160a03
commit e3fdc16
Show file tree

Hide file tree

Showing 12 changed files with 575 additions and 219 deletions.
diff --git a/...uster-api-runtime-extensions-nutanix/templates/cni/cilium/manifests/cilium-configmap.yaml b/...uster-api-runtime-extensions-nutanix/templates/cni/cilium/manifests/cilium-configmap.yaml
diff --git a/...api-runtime-extensions-nutanix/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml b/...api-runtime-extensions-nutanix/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml
@@ -13,11 +13,11 @@ data:
     RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://kubernetes.github.io/cloud-provider-aws{{ end }}
   aws-ebs-csi: |
     ChartName: aws-ebs-csi-driver
-    ChartVersion: 2.28.1
+    ChartVersion: 2.32.0
     RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://kubernetes-sigs.github.io/aws-ebs-csi-driver{{ end }}
   cilium: |
     ChartName: cilium
-    ChartVersion: 1.15.5
+    ChartVersion: 1.15.6
     RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://helm.cilium.io/{{ end }}
   cluster-autoscaler: |
     ChartName: cluster-autoscaler
@@ -33,7 +33,7 @@ data:
     RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://metallb.github.io/metallb{{ end }}
   nfd: |
     ChartName: node-feature-discovery
-    ChartVersion: 0.15.2
+    ChartVersion: 0.16.1
     RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://kubernetes-sigs.github.io/node-feature-discovery/charts{{ end }}
   nutanix-ccm: |
     ChartName: nutanix-cloud-provider

diff --git a/...uster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml b/...uster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml
@@ -9,7 +9,7 @@ metadata:
 data:
   values.yaml: |-
     image:
-      tag: v0.15.2-minimal
+      tag: v0.16.1-minimal
     master:
       extraLabelNs:
         - nvidia.com

diff --git a/...-runtime-extensions-nutanix/templates/nfd/manifests/node-feature-discovery-configmap.yaml b/...-runtime-extensions-nutanix/templates/nfd/manifests/node-feature-discovery-configmap.yaml
diff --git a/...untime-extensions-nutanix/templates/virtual-ip/kube-vip/manifests/kube-vip-configmap.yaml b/...untime-extensions-nutanix/templates/virtual-ip/kube-vip/manifests/kube-vip-configmap.yaml
@@ -47,7 +47,8 @@ data:
               value: "2"
             - name: address
               value: '{{ `{{ .ControlPlaneEndpoint.Host }}` }}'
-          image: ghcr.io/kube-vip/kube-vip:v0.8.0
+            - name: prometheus_server
+          image: ghcr.io/kube-vip/kube-vip:v0.8.1
           imagePullPolicy: IfNotPresent
           name: kube-vip
           resources: {}

diff --git a/hack/addons/kustomize/cluster-autoscaler/kustomization.yaml.tmpl b/hack/addons/kustomize/cluster-autoscaler/kustomization.yaml.tmpl
@@ -15,7 +15,7 @@ helmCharts:
   includeCRDs: true
   valuesFile: helm-values.yaml
   releaseName: cluster-autoscaler-tmpl-clustername-tmpl
-  version: ${CLUSTER_AUTOSCALER_VERSION}
+  version: ${CLUSTER_AUTOSCALER_CHART_VERSION}
   repo: https://kubernetes.github.io/autoscaler
 
 namespace: tmpl-clusternamespace-tmpl
diff --git a/hack/addons/kustomize/nfd/kustomization.yaml.tmpl b/hack/addons/kustomize/nfd/kustomization.yaml.tmpl
@@ -21,6 +21,7 @@ helmCharts:
       tag: "v${NODE_FEATURE_DISCOVERY_VERSION}-minimal"
   includeCRDs: true
   skipTests: true
+  skipHooks: true
   namespace: node-feature-discovery
 
 namespace: node-feature-discovery
diff --git a/hack/addons/mindthegap-helm-registry/repos.yaml b/hack/addons/mindthegap-helm-registry/repos.yaml
@@ -15,12 +15,12 @@ repositories:
     repoURL: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
     charts:
       aws-ebs-csi-driver:
-      - 2.28.1
+      - 2.32.0
   cilium:
     repoURL: https://helm.cilium.io/
     charts:
       cilium:
-      - 1.15.5
+      - 1.15.6
   cluster-autoscaler:
     repoURL: https://kubernetes.github.io/autoscaler
     charts:
@@ -40,7 +40,7 @@ repositories:
     repoURL: https://kubernetes-sigs.github.io/node-feature-discovery/charts
     charts:
       node-feature-discovery:
-      - 0.15.2
+      - 0.16.1
   nutanix-cloud-provider:
     repoURL: https://nutanix.github.io/helm/
     charts:

diff --git a/hack/addons/update-cluster-autoscaler.sh b/hack/addons/update-cluster-autoscaler.sh
@@ -8,8 +8,8 @@ readonly SCRIPT_DIR
 # shellcheck source=hack/common.sh
 source "${SCRIPT_DIR}/../common.sh"
 
-if [ -z "${CLUSTER_AUTOSCALER_VERSION:-}" ]; then
-  echo "Missing argument: CLUSTER_AUTOSCALER_VERSION"
+if [ -z "${CLUSTER_AUTOSCALER_CHART_VERSION:-}" ]; then
+  echo "Missing argument: CLUSTER_AUTOSCALER_CHART_VERSION"
   exit 1
 fi
 

diff --git a/hack/addons/update-kube-vip-manifests.sh b/hack/addons/update-kube-vip-manifests.sh
@@ -19,19 +19,23 @@ trap_add "rm -rf ${ASSETS_DIR}" EXIT
 
 readonly FILE_NAME="kube-vip.yaml"
 
+# shellcheck disable=SC2016 # Single quotes are required for the gojq expression.
 docker container run --rm ghcr.io/kube-vip/kube-vip:"${KUBE_VIP_VERSION}" \
   manifest pod \
   --arp \
-  --address='{{ `{{ .ControlPlaneEndpoint.Host }}` }}' \
-  --port=-99999 \
+  --address='127.0.0.1' \
   --controlplane \
   --leaderElection \
   --leaseDuration=15 \
   --leaseRenewDuration=10 \
   --leaseRetry=2 \
   --prometheusHTTPServer='' |
-  gojq --yaml-input --yaml-output 'del(.metadata.creationTimestamp, .status) | .spec.containers[].imagePullPolicy |= "IfNotPresent"' |
-  sed "s/\"-99999\"/'{{ \`{{ .ControlPlaneEndpoint.Port }}\` }}'/" >"${ASSETS_DIR}/${FILE_NAME}"
+  gojq --yaml-input --yaml-output \
+    'del(.metadata.creationTimestamp, .status) |
+     .spec.containers[].imagePullPolicy |= "IfNotPresent" |
+     (.spec.containers[0].env[] | select(.name == "port").value) |= "{{ `{{ .ControlPlaneEndpoint.Port }}` }}" |
+     (.spec.containers[0].env[] | select(.name == "address").value) |= "{{ `{{ .ControlPlaneEndpoint.Host }}` }}"
+    ' >"${ASSETS_DIR}/${FILE_NAME}"
 
 kubectl create configmap "{{ .Values.hooks.virtualIP.kubeVip.defaultTemplateConfigMap.name }}" --dry-run=client --output yaml \
   --from-file "${ASSETS_DIR}/${FILE_NAME}" \

diff --git a/make/addons.mk b/make/addons.mk
@@ -2,12 +2,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 export CALICO_VERSION := v3.28.0
-export CILIUM_VERSION := 1.15.5
-export NODE_FEATURE_DISCOVERY_VERSION := 0.15.2
-export CLUSTER_AUTOSCALER_VERSION := 9.37.0
-export AWS_EBS_CSI_CHART_VERSION := 2.28.1
+export CILIUM_VERSION := 1.15.6
+export NODE_FEATURE_DISCOVERY_VERSION := 0.16.1
+export CLUSTER_AUTOSCALER_CHART_VERSION := 9.37.0
+export AWS_EBS_CSI_CHART_VERSION := 2.32.0
 export NUTANIX_STORAGE_CSI_CHART_VERSION := 3.0.0-beta.1912
-export NUTANIX_SNAPSHOT_CSI_CHART_VERSION := 6.3.2
 export LOCAL_PATH_CSI_CHART_VERSION := 0.0.29
 export SNAPSHOT_CONTROLLER_CHART_VERSION := 3.0.5
 # AWS CCM uses the same chart version for all kubernetes versions. The image used in the deployment will
@@ -21,7 +20,7 @@ export AWS_CCM_VERSION_130 := v1.30.1
 
 export NUTANIX_CCM_CHART_VERSION := 0.3.3
 
-export KUBE_VIP_VERSION := v0.8.0
+export KUBE_VIP_VERSION := v0.8.1
 
 export METALLB_CHART_VERSION := 0.14.5