kubernetes: v1.18.20 (#1160)

See #1146

Signed-off-by: Jacob Blain Christen <[email protected]>

Dockerfile

@@ -131,15 +131,17 @@ 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.18.19-build2021052000"  CHART_FILE=/charts/rke2-kube-proxy.yaml        CHART_BOOTSTRAP=true    /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.18/rke2-kube-proxy-v1.18.20-build2021061701.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 rm -vf /charts/*.sh /charts/*.md
 
 # rke-runtime image
 # 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.18.19-k3s1 AS k3s
+FROM rancher/k3s:v1.18.20-rc1-k3s1 AS k3s
 FROM rancher/hardened-containerd:v1.3.10-k3s4-build20210401 AS containerd
 FROM rancher/hardened-crictl:v1.18.0 AS crictl
 FROM rancher/hardened-runc:v1.0.0-rc95-build20210519 AS runc

pkg/images/images.go

@@ -15,7 +15,7 @@ const (
 )
 
 var (
-	KubernetesVersion = "v1.18.19"     // make sure this matches what is in the scripts/version.sh script
+	KubernetesVersion = "v1.18.20"     // 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" // make sure this matches what is in the scripts/build-images script
 	RuntimeImageName  = "rke2-runtime"

scripts/build-images

@@ -14,7 +14,7 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images.txt
     docker.io/rancher/hardened-etcd:v3.4.13-k3s1
     docker.io/rancher/hardened-flannel:v0.13.0-rancher1-build20210223
     docker.io/rancher/hardened-k8s-metrics-server:v0.3.6-build20210223
-    docker.io/rancher/hardened-kube-proxy:${KUBERNETES_VERSION}-build20210520
+    docker.io/rancher/hardened-kube-proxy:${KUBERNETES_VERSION}-build20210617
     docker.io/rancher/klipper-helm:v0.4.3-build20210225
     docker.io/rancher/pause:3.2
     docker.io/rancher/nginx-ingress-controller-defaultbackend:1.5-rancher1

scripts/version.sh

@@ -30,7 +30,7 @@ REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code;
 PLATFORM=${GOOS}-${GOARCH}
 RELEASE=${PROG}.${PLATFORM}
 # hardcode k8s version unless its set specifically
-KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.18.19}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.18.20}
 
 if [ -d .git ]; then
     if [ -z "$GIT_TAG" ]; then