Skip to content

Commit e3fdc16

Browse files
authored
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
1 parent b160a03 commit e3fdc16

File tree

12 files changed

+575
-219
lines changed

12 files changed

+575
-219
lines changed

charts/cluster-api-runtime-extensions-nutanix/templates/cni/cilium/manifests/cilium-configmap.yaml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

charts/cluster-api-runtime-extensions-nutanix/templates/csi/aws-ebs/manifests/aws-ebs-csi-configmap.yaml

Lines changed: 86 additions & 49 deletions
Large diffs are not rendered by default.

charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ data:
1313
RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://kubernetes.github.io/cloud-provider-aws{{ end }}
1414
aws-ebs-csi: |
1515
ChartName: aws-ebs-csi-driver
16-
ChartVersion: 2.28.1
16+
ChartVersion: 2.32.0
1717
RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://kubernetes-sigs.github.io/aws-ebs-csi-driver{{ end }}
1818
cilium: |
1919
ChartName: cilium
20-
ChartVersion: 1.15.5
20+
ChartVersion: 1.15.6
2121
RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://helm.cilium.io/{{ end }}
2222
cluster-autoscaler: |
2323
ChartName: cluster-autoscaler
@@ -33,7 +33,7 @@ data:
3333
RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://metallb.github.io/metallb{{ end }}
3434
nfd: |
3535
ChartName: node-feature-discovery
36-
ChartVersion: 0.15.2
36+
ChartVersion: 0.16.1
3737
RepositoryURL: {{ if .Values.selfHostedRegistry }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://kubernetes-sigs.github.io/node-feature-discovery/charts{{ end }}
3838
nutanix-ccm: |
3939
ChartName: nutanix-cloud-provider

charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/helm-addon-installation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
data:
1010
values.yaml: |-
1111
image:
12-
tag: v0.15.2-minimal
12+
tag: v0.16.1-minimal
1313
master:
1414
extraLabelNs:
1515
- nvidia.com

charts/cluster-api-runtime-extensions-nutanix/templates/nfd/manifests/node-feature-discovery-configmap.yaml

Lines changed: 462 additions & 148 deletions
Large diffs are not rendered by default.

charts/cluster-api-runtime-extensions-nutanix/templates/virtual-ip/kube-vip/manifests/kube-vip-configmap.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ data:
4747
value: "2"
4848
- name: address
4949
value: '{{ `{{ .ControlPlaneEndpoint.Host }}` }}'
50-
image: ghcr.io/kube-vip/kube-vip:v0.8.0
50+
- name: prometheus_server
51+
image: ghcr.io/kube-vip/kube-vip:v0.8.1
5152
imagePullPolicy: IfNotPresent
5253
name: kube-vip
5354
resources: {}

hack/addons/kustomize/cluster-autoscaler/kustomization.yaml.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ helmCharts:
1515
includeCRDs: true
1616
valuesFile: helm-values.yaml
1717
releaseName: cluster-autoscaler-tmpl-clustername-tmpl
18-
version: ${CLUSTER_AUTOSCALER_VERSION}
18+
version: ${CLUSTER_AUTOSCALER_CHART_VERSION}
1919
repo: https://kubernetes.github.io/autoscaler
2020

2121
namespace: tmpl-clusternamespace-tmpl

hack/addons/kustomize/nfd/kustomization.yaml.tmpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ helmCharts:
2121
tag: "v${NODE_FEATURE_DISCOVERY_VERSION}-minimal"
2222
includeCRDs: true
2323
skipTests: true
24+
skipHooks: true
2425
namespace: node-feature-discovery
2526

2627
namespace: node-feature-discovery

hack/addons/mindthegap-helm-registry/repos.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ repositories:
1515
repoURL: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
1616
charts:
1717
aws-ebs-csi-driver:
18-
- 2.28.1
18+
- 2.32.0
1919
cilium:
2020
repoURL: https://helm.cilium.io/
2121
charts:
2222
cilium:
23-
- 1.15.5
23+
- 1.15.6
2424
cluster-autoscaler:
2525
repoURL: https://kubernetes.github.io/autoscaler
2626
charts:
@@ -40,7 +40,7 @@ repositories:
4040
repoURL: https://kubernetes-sigs.github.io/node-feature-discovery/charts
4141
charts:
4242
node-feature-discovery:
43-
- 0.15.2
43+
- 0.16.1
4444
nutanix-cloud-provider:
4545
repoURL: https://nutanix.github.io/helm/
4646
charts:

hack/addons/update-cluster-autoscaler.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ readonly SCRIPT_DIR
88
# shellcheck source=hack/common.sh
99
source "${SCRIPT_DIR}/../common.sh"
1010

11-
if [ -z "${CLUSTER_AUTOSCALER_VERSION:-}" ]; then
12-
echo "Missing argument: CLUSTER_AUTOSCALER_VERSION"
11+
if [ -z "${CLUSTER_AUTOSCALER_CHART_VERSION:-}" ]; then
12+
echo "Missing argument: CLUSTER_AUTOSCALER_CHART_VERSION"
1313
exit 1
1414
fi
1515

hack/addons/update-kube-vip-manifests.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,23 @@ trap_add "rm -rf ${ASSETS_DIR}" EXIT
1919

2020
readonly FILE_NAME="kube-vip.yaml"
2121

22+
# shellcheck disable=SC2016 # Single quotes are required for the gojq expression.
2223
docker container run --rm ghcr.io/kube-vip/kube-vip:"${KUBE_VIP_VERSION}" \
2324
manifest pod \
2425
--arp \
25-
--address='{{ `{{ .ControlPlaneEndpoint.Host }}` }}' \
26-
--port=-99999 \
26+
--address='127.0.0.1' \
2727
--controlplane \
2828
--leaderElection \
2929
--leaseDuration=15 \
3030
--leaseRenewDuration=10 \
3131
--leaseRetry=2 \
3232
--prometheusHTTPServer='' |
33-
gojq --yaml-input --yaml-output 'del(.metadata.creationTimestamp, .status) | .spec.containers[].imagePullPolicy |= "IfNotPresent"' |
34-
sed "s/\"-99999\"/'{{ \`{{ .ControlPlaneEndpoint.Port }}\` }}'/" >"${ASSETS_DIR}/${FILE_NAME}"
33+
gojq --yaml-input --yaml-output \
34+
'del(.metadata.creationTimestamp, .status) |
35+
.spec.containers[].imagePullPolicy |= "IfNotPresent" |
36+
(.spec.containers[0].env[] | select(.name == "port").value) |= "{{ `{{ .ControlPlaneEndpoint.Port }}` }}" |
37+
(.spec.containers[0].env[] | select(.name == "address").value) |= "{{ `{{ .ControlPlaneEndpoint.Host }}` }}"
38+
' >"${ASSETS_DIR}/${FILE_NAME}"
3539

3640
kubectl create configmap "{{ .Values.hooks.virtualIP.kubeVip.defaultTemplateConfigMap.name }}" --dry-run=client --output yaml \
3741
--from-file "${ASSETS_DIR}/${FILE_NAME}" \

make/addons.mk

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
export CALICO_VERSION := v3.28.0
5-
export CILIUM_VERSION := 1.15.5
6-
export NODE_FEATURE_DISCOVERY_VERSION := 0.15.2
7-
export CLUSTER_AUTOSCALER_VERSION := 9.37.0
8-
export AWS_EBS_CSI_CHART_VERSION := 2.28.1
5+
export CILIUM_VERSION := 1.15.6
6+
export NODE_FEATURE_DISCOVERY_VERSION := 0.16.1
7+
export CLUSTER_AUTOSCALER_CHART_VERSION := 9.37.0
8+
export AWS_EBS_CSI_CHART_VERSION := 2.32.0
99
export NUTANIX_STORAGE_CSI_CHART_VERSION := 3.0.0-beta.1912
10-
export NUTANIX_SNAPSHOT_CSI_CHART_VERSION := 6.3.2
1110
export LOCAL_PATH_CSI_CHART_VERSION := 0.0.29
1211
export SNAPSHOT_CONTROLLER_CHART_VERSION := 3.0.5
1312
# 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
2120

2221
export NUTANIX_CCM_CHART_VERSION := 0.3.3
2322

24-
export KUBE_VIP_VERSION := v0.8.0
23+
export KUBE_VIP_VERSION := v0.8.1
2524

2625
export METALLB_CHART_VERSION := 0.14.5
2726

0 commit comments

Comments
 (0)