Skip to content
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.

Sign up for GitHub

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

[release-1.27] update rke2-whereabouts to v0.6.3 and bump rke2-multus parent chart #5245

Merged
merged 1 commit into from
Jan 12, 2024
Merged

[release-1.27] update rke2-whereabouts to v0.6.3 and bump rke2-multus parent chart #5245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion charts/chart_versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ charts:
- version: 2.11.100-build2023051511
filename: /charts/rke2-metrics-server.yaml
bootstrap: false
- version: v4.0.2-build2023081106
- version: v4.0.2-build2023081107
filename: /charts/rke2-multus.yaml
bootstrap: true
- version: 1.5.100
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt
${REGISTRY}/rancher/hardened-ib-sriov-cni:v1.0.2-build20231009
${REGISTRY}/rancher/hardened-sriov-network-resources-injector:v1.5-build20231009
${REGISTRY}/rancher/hardened-sriov-network-webhook:v1.2.0-build20230607
${REGISTRY}/rancher/hardened-whereabouts:v0.6.2-build20231009
${REGISTRY}/rancher/hardened-whereabouts:v0.6.3-build20240109
${REGISTRY}/rancher/mirrored-library-busybox:1.36.1
EOF

Expand Down
4 changes: 2 additions & 2 deletions scripts/validate-charts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ check_system_registry() {
chart_tmp=$3

yaml_tmp=$(mktemp --suffix .yaml)
values="global.systemDefaultRegistry=my-registry,global.cattle.systemDefaultRegistry=my-registry,vCenter.clusterId=test-id"
values="global.systemDefaultRegistry=my-registry,global.cattle.systemDefaultRegistry=my-registry,vCenter.clusterId=test-id,rke2-whereabouts.enabled=true"
helm template test-chart --kube-version ${KUBERNETES_VERSION} --set $values $chart_tmp > $yaml_tmp;

awk '$1 ~ /^image:/ {
Expand Down Expand Up @@ -110,7 +110,7 @@ check_airgap() {
chart_tmp=$3

yaml_tmp=$(mktemp --suffix .yaml)
values="vCenter.clusterId=test-id"
values="vCenter.clusterId=test-id,rke2-whereabouts.enabled=true"
helm template test-chart --kube-version ${KUBERNETES_VERSION} --set $values $chart_tmp > $yaml_tmp;

chart_folder=$(mktemp -d)
Expand Down