Skip to content

Commit

Permalink
Bump dependencies (#4865)
Browse files Browse the repository at this point in the history 
* merge

Signed-off-by: Johnatas Santos <[email protected]>

* fix chart versions

Signed-off-by: Johnatas Santos <[email protected]>

* more changes

Signed-off-by: Johnatas Santos <[email protected]>

* add changes for build windows script

Signed-off-by: Johnatas Santos <[email protected]>

* set charts

Signed-off-by: Johnatas Santos <[email protected]>

* set new image canal

Signed-off-by: Johnatas Santos <[email protected]>

* update charts

Signed-off-by: Johnatas Santos <[email protected]>

* fix deps

Signed-off-by: Johnatas <[email protected]>

* putting back etcd version in windows binary

Signed-off-by: Johnatas <[email protected]>

---------

Signed-off-by: Johnatas Santos <[email protected]>
  • Loading branch information
Johnatas authored Oct 16, 2023
1 parent 45c2122 commit 08f7595
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,13 @@ ARG CACHEBUST="cachebust"
COPY charts/ /charts/
RUN echo ${CACHEBUST}>/dev/null
RUN CHART_VERSION="1.14.200" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.26.1-build2023080200" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.26.1-build2023100902" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.26.101" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="v3.26.101" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="1.24.006" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="1.24.007" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="4.6.101" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
RUN CHART_VERSION="2.11.100-build2023051510" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
RUN CHART_VERSION="v4.0.2-build2023081100" CHART_FILE=/charts/rke2-multus.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="2.11.100-build2023051511" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
RUN CHART_VERSION="v4.0.2-build2023081101" CHART_FILE=/charts/rke2-multus.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="1.5.100" CHART_FILE=/charts/rancher-vsphere-cpi.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="3.0.1-rancher101" CHART_FILE=/charts/rancher-vsphere-csi.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="0.2.200" CHART_FILE=/charts/harvester-cloud-provider.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
Expand All @@ -128,8 +128,8 @@ RUN rm -vf /charts/*.sh /charts/*.md
# This means bin/foo/bar will become bin/bar when rke2 installs this to the host
FROM rancher/hardened-kubernetes:v1.28.2-rke2r1-build20230913 AS kubernetes
FROM rancher/hardened-containerd:v1.7.7-k3s1-build20231010 AS containerd
FROM rancher/hardened-crictl:v1.26.1-build20230606 AS crictl
FROM rancher/hardened-runc:v1.1.8-build20230802 AS runc
FROM rancher/hardened-crictl:v1.26.1-build20231010 AS crictl
FROM rancher/hardened-runc:v1.1.8-build20231009 AS runc

FROM scratch AS runtime-collect
COPY --from=runc \
Expand Down
30 changes: 15 additions & 15 deletions scripts/build-images
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ 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.10.1-build20230607
${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.6-build20230609
${REGISTRY}/rancher/hardened-dns-node-cache:1.22.20-build20230607
${REGISTRY}/rancher/hardened-coredns:v1.10.1-build20231009
${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.6-build20231009
${REGISTRY}/rancher/hardened-dns-node-cache:1.22.20-build20231010
${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20230802
${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.6.3-build20230607
${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.6.3-build20231009
${REGISTRY}/rancher/klipper-helm:v0.8.2-build20230815
${REGISTRY}/rancher/klipper-lb:v0.4.4
${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION}
Expand All @@ -29,8 +29,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.26.1-build20230802
${REGISTRY}/rancher/hardened-flannel:v0.22.1-build20230802
${REGISTRY}/rancher/hardened-calico:v3.26.1-build20231009
${REGISTRY}/rancher/hardened-flannel:v0.22.1-build20231009
EOF

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

xargs -n1 -t docker image pull --quiet << EOF > build/images-calico.txt
Expand All @@ -73,16 +73,16 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt
${REGISTRY}/rancher/hardened-multus-cni:v4.0.2-build20230811
${REGISTRY}/rancher/hardened-cni-plugins:v1.2.0-build20230523
${REGISTRY}/rancher/hardened-sriov-network-operator:v1.2.0-build20230607
${REGISTRY}/rancher/hardened-multus-cni:v4.0.2-build20231009
${REGISTRY}/rancher/hardened-cni-plugins:v1.2.0-build20231009
${REGISTRY}/rancher/hardened-sriov-network-operator:v1.2.0-build20231010
${REGISTRY}/rancher/hardened-sriov-network-config-daemon:v1.2.0-build20230607
${REGISTRY}/rancher/hardened-sriov-network-device-plugin:v3.5.1-build20230607
${REGISTRY}/rancher/hardened-sriov-cni:v2.6.3-build20230607
${REGISTRY}/rancher/hardened-ib-sriov-cni:v1.0.2-build20230607
${REGISTRY}/rancher/hardened-sriov-network-resources-injector:v1.5-build20230607
${REGISTRY}/rancher/hardened-sriov-network-device-plugin:v3.5.1-build20231009
${REGISTRY}/rancher/hardened-sriov-cni:v2.6.3-build20231009
${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-build20230717
${REGISTRY}/rancher/hardened-whereabouts:v0.6.2-build20231009
EOF

xargs -n1 -t docker image pull --quiet << EOF > build/images-harvester.txt
Expand Down

0 comments on commit 08f7595

Please sign in to comment.