Skip to content

Commit

Permalink
Upgrade to newer Kubernetes image
Browse files Browse the repository at this point in the history
This new image fixes the bug described in rancher#1298

Signed-off-by: manuel <mbuil@suse.com>
  • Loading branch information
manuelbuil committed Jul 14, 2021
1 parent 08f1845 commit 12512ff
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ RUN CHART_VERSION="v1.0.007" CHART_FILE=/charts/rke2-calico-crd
RUN CHART_VERSION="1.10.101-build2021022304" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="3.34.001" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
# override the CHART_URL directly instead of constructing. See https://github.com/rancher/rancher/issues/33269
RUN CHART_URL="https://rke2-charts.rancher.io/assets/rke2-kube-proxy-1.21/rke2-kube-proxy-v1.21.2-build2021061701.tgz" \
RUN CHART_URL="https://rke2-charts.rancher.io/assets/rke2-kube-proxy-1.21/rke2-kube-proxy-v1.21.2-build2021071403.tgz" \
CHART_FILE=/charts/rke2-kube-proxy.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="2.11.100-build2021022300" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
RUN CHART_VERSION="v3.7.1-build2021041603" CHART_FILE=/charts/rke2-multus.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
Expand All @@ -113,7 +113,7 @@ RUN rm -vf /charts/*.sh /charts/*.md
# must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation.
# This means bin/foo/bar will become bin/bar when rke2 installs this to the host
FROM rancher/k3s:v1.21.1-rc2-k3s1 AS k3s
FROM rancher/hardened-kubernetes:v1.21.2-rke2r1-build20210706 AS kubernetes
FROM rancher/hardened-kubernetes:v1.21.2-rke2r2-build20210714 AS kubernetes
FROM rancher/hardened-containerd:v1.4.4-k3s2-build20210520 AS containerd
FROM rancher/hardened-crictl:v1.19.0-build20210223 AS crictl
FROM rancher/hardened-runc:v1.0.0-build20210708 AS runc
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-images
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
${REGISTRY}/rancher/hardened-coredns:v1.6.9-${IMAGE_BUILD_VERSION}
${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-${IMAGE_BUILD_VERSION}
${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.3.6-${IMAGE_BUILD_VERSION}
${REGISTRY}/rancher/hardened-kube-proxy:${KUBERNETES_VERSION}-build20210617
${REGISTRY}/rancher/hardened-kube-proxy:${KUBERNETES_VERSION}-build20210714
${REGISTRY}/rancher/klipper-helm:v0.6.1-build20210616
${REGISTRY}/rancher/pause:${PAUSE_VERSION}
${REGISTRY}/rancher/mirrored-jettech-kube-webhook-certgen:v1.5.1
Expand Down

0 comments on commit 12512ff

Please sign in to comment.