Merge pull request #1687 from briandowns/upgrade_k8s-v1.20.10

update k8s to v1.20.10

Dockerfile

@@ -81,7 +81,7 @@ RUN CHART_VERSION="1.9.604"                   CHART_FILE=/charts/rke2-cilium.yam
 RUN CHART_VERSION="v3.13.300-build2021022306" CHART_FILE=/charts/rke2-canal.yaml          CHART_BOOTSTRAP=true   /charts/build-chart.sh
 RUN CHART_VERSION="1.10.101-build2021022303"  CHART_FILE=/charts/rke2-coredns.yaml        CHART_BOOTSTRAP=true   /charts/build-chart.sh
 RUN CHART_VERSION="1.36.301"                  CHART_FILE=/charts/rke2-ingress-nginx.yaml  CHART_BOOTSTRAP=false  /charts/build-chart.sh
-RUN CHART_VERSION="v1.20.9-rke2r2-build2021080501" \
+RUN CHART_VERSION="v1.20.10-rke2r1-build2021082001" \
     CHART_PACKAGE="rke2-kube-proxy-1.20"      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="1.0.000"                   CHART_FILE=/charts/rancher-vsphere-cpi.yaml CHART_BOOTSTRAP=true   CHART_REPO="https://charts.rancher.io" /charts/build-chart.sh
@@ -92,8 +92,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.20.8-k3s1 AS k3s
-FROM rancher/hardened-kubernetes:v1.20.9-rke2r2-build20210805 AS kubernetes
+FROM rancher/k3s:v1.20.10-k3s1 AS k3s
+FROM rancher/hardened-kubernetes:v1.20.10-rke2r1-build20210820 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

scripts/version.sh

@@ -31,8 +31,8 @@ REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code;
 PLATFORM=${GOOS}-${GOARCH}
 RELEASE=${PROG}.${PLATFORM}
 # hardcode versions unless set specifically
-KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.20.9}
-KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.20.9-rke2r2-build20210805}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.20.10}
+KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.20.10-rke2r1-build20210820}
 ETCD_VERSION=${ETCD_VERSION:-v3.4.13-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.2}
 CCM_VERSION=${CCM_VERSION:-v0.0.1-build20210629}