Skip to content

Commit

Permalink
Bump charts and images to fix go CVE
Browse files Browse the repository at this point in the history
Signed-off-by: manuelbuil <[email protected]>
  • Loading branch information
manuelbuil authored and rbrtbnfgl committed Sep 11, 2024
1 parent 64fd74d commit f144582
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions charts/chart_versions.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
charts:
- version: 1.16.103
- version: 1.16.104
filename: /charts/rke2-cilium.yaml
bootstrap: true
- version: v3.28.1-build2024083000
- version: v3.28.1-build2024091000
filename: /charts/rke2-canal.yaml
bootstrap: true
- version: v3.28.100
Expand All @@ -11,19 +11,19 @@ charts:
- version: v3.28.100
filename: /charts/rke2-calico-crd.yaml
bootstrap: true
- version: 1.29.004
- version: 1.29.006
filename: /charts/rke2-coredns.yaml
bootstrap: true
- version: 4.10.401
filename: /charts/rke2-ingress-nginx.yaml
bootstrap: false
- version: 3.12.002
- version: 3.12.003
filename: /charts/rke2-metrics-server.yaml
bootstrap: false
- version: v4.1.000
- version: v4.1.001
filename: /charts/rke2-multus.yaml
bootstrap: true
- version: v0.25.600
- version: v0.25.601
filename: /charts/rke2-flannel.yaml
bootstrap: true
- version: 1.8.000
Expand Down
26 changes: 13 additions & 13 deletions scripts/build-images
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ EOF

xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
${REGISTRY}/rancher/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}
${REGISTRY}/rancher/hardened-coredns:v1.11.1-build20240305
${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.10-build20240124
${REGISTRY}/rancher/hardened-dns-node-cache:1.22.28-build20240125
${REGISTRY}/rancher/hardened-coredns:v1.11.1-build20240910
${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.11-build20240910
${REGISTRY}/rancher/hardened-dns-node-cache:1.23.1-build20240910
${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20240531
${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.1-build20240401
${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20240410
${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.1-build20240910
${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20240910
${REGISTRY}/rancher/klipper-helm:v0.9.2-build20240828
${REGISTRY}/rancher/klipper-lb:v0.4.9
${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION}
Expand All @@ -30,8 +30,8 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt
${REGISTRY}/rancher/hardened-calico:v3.28.1-build20240830
${REGISTRY}/rancher/hardened-flannel:v0.25.6-build20240828
${REGISTRY}/rancher/hardened-calico:v3.28.1-build20240910
${REGISTRY}/rancher/hardened-flannel:v0.25.6-build20240910
EOF

if [ "${GOARCH}" != "s390x" ]; then
Expand All @@ -46,7 +46,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-cilium.txt
${REGISTRY}/rancher/mirrored-cilium-operator-aws:v1.16.1
${REGISTRY}/rancher/mirrored-cilium-operator-azure:v1.16.1
${REGISTRY}/rancher/mirrored-cilium-operator-generic:v1.16.1
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240830
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240910
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt
Expand Down Expand Up @@ -77,9 +77,9 @@ EOF
fi

xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt
${REGISTRY}/rancher/hardened-multus-cni:v4.1.0-build20240830
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240830
${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20240830
${REGISTRY}/rancher/hardened-multus-cni:v4.1.0-build20240910
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240910
${REGISTRY}/rancher/hardened-whereabouts:v0.8.0-build20240910
${REGISTRY}/rancher/mirrored-library-busybox:1.36.1
EOF

Expand All @@ -94,8 +94,8 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-harvester.txt
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-flannel.txt
${REGISTRY}/rancher/hardened-flannel:v0.25.6-build20240828
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240830
${REGISTRY}/rancher/hardened-flannel:v0.25.6-build20240910
${REGISTRY}/rancher/hardened-cni-plugins:v1.5.1-build20240910
EOF
fi
# Continue to provide a legacy airgap archive set with the default CNI images
Expand Down

0 comments on commit f144582

Please sign in to comment.