Skip to content

Commit

Permalink
Bump hardened-kubernetes to v1.21.3-rke2r2
Browse files Browse the repository at this point in the history
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
  • Loading branch information
brandond committed Aug 10, 2021
1 parent 50d589b commit cfa99d2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Expand Up @@ -99,7 +99,7 @@ RUN CHART_VERSION="v3.19.2-201" CHART_FILE=/charts/rke2-calico.yam
RUN CHART_VERSION="v1.0.101" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="1.16.201-build2021072306" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="3.34.002" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
RUN CHART_VERSION="v1.21.3-rke2r1-build2021072101" \
RUN CHART_VERSION="v1.21.3-rke2r2-build2021080901" \
CHART_PACKAGE="rke2-kube-proxy-1.21" 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 @@ -111,8 +111,8 @@ RUN rm -vf /charts/*.sh /charts/*.md
# This image includes any host level programs that we might need. All binaries
# 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.2-k3s1 AS k3s
FROM rancher/hardened-kubernetes:v1.21.3-rke2r1-build20210721 AS kubernetes
FROM rancher/k3s:v1.21.3-k3s1 AS k3s
FROM rancher/hardened-kubernetes:v1.21.3-rke2r2-build20210809 AS kubernetes
FROM rancher/hardened-containerd:v1.4.8-k3s1-build20210721 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/version.sh
Expand Up @@ -32,7 +32,7 @@ PLATFORM=${GOOS}-${GOARCH}
RELEASE=${PROG}.${PLATFORM}
# hardcode versions unless set specifically
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.21.3}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.21.3-rke2r1-build20210721}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.21.3-rke2r2-build20210809}
ETCD_VERSION=${ETCD_VERSION:-v3.4.13-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.5}
CCM_VERSION=${CCM_VERSION:-v0.0.1-build20210629}
Expand Down

0 comments on commit cfa99d2

Please sign in to comment.