UNCLASSIFIED

Skip to content

GitLab

Commit 2622a630 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files

Bump hardened-kubernetes to v1.19.13-rke2r2-build20210806 


Signed-off-by: default avatarBrad Davidson <brad.davidson@rancher.com>
parent 9485245c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
Dockerfile
View file @ 2622a630
......@@ -80,7 +80,7 @@ RUN echo ${CACHEBUST}>/dev/null
RUN CHART_VERSION="v3.13.300-build2021022302" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="1.10.101-build2021022301" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh
RUN CHART_VERSION="1.36.300" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh
RUN CHART_VERSION="v1.19.13-rke2r1-build2021072101" \
RUN CHART_VERSION="v1.19.13-rke2r2-build2021080601" \
CHART_PACKAGE="rke2-kube-proxy-1.19" 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 rm -vf /charts/*.sh /charts/*.md
......@@ -90,7 +90,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.19.12-k3s1 AS k3s
FROM rancher/hardened-kubernetes:v1.19.13-rke2r1-build20210721 AS kubernetes
FROM rancher/hardened-kubernetes:v1.19.13-rke2r2-build20210806 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-rc95-build20210519 AS runc
......
pkg/images/images.go
View file @ 2622a630
......@@ -16,7 +16,7 @@ const (
)
var (
KubernetesVersion = "v1.19.13-rke2r1-build20210721" // make sure this matches what is in the scripts/version.sh script
KubernetesVersion = "v1.19.13-rke2r2-build20210806" // make sure this matches what is in the scripts/version.sh script
PauseVersion = "3.2" // make sure this matches what is in the scripts/build-images script
EtcdVersion = "v3.4.13-k3s1-build20210223" // make sure this matches what is in the scripts/build-images script
RuntimeImageName = "rke2-runtime"
......
scripts/version.sh
View file @ 2622a630
......@@ -32,7 +32,7 @@ PLATFORM=${GOOS}-${GOARCH}
RELEASE=${PROG}.${PLATFORM}
# hardcode k8s version unless its set specifically
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.19.13}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.19.13-rke2r1-build20210721}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.19.13-rke2r2-build20210806}
ETCD_VERSION=${ETCD_VERSION:-v3.4.13-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.2}
CCM_VERSION=${CCM_VERSION:-v0.0.1-build20210629}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED