Skip to content

feat: Update addon versions #785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
data:
values.yaml: |-
image:
tag: v0.15.2-minimal
tag: v0.16.1-minimal
master:
extraLabelNs:
- nvidia.com
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions hack/addons/kustomize/nfd/kustomization.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions hack/addons/mindthegap-helm-registry/repos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions hack/addons/update-cluster-autoscaler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 8 additions & 4 deletions hack/addons/update-kube-vip-manifests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
Expand Down
11 changes: 5 additions & 6 deletions make/addons.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
Loading