Update Kubernetes to v1.20.4

Signed-off-by: Brad Davidson <[email protected]>

Dockerfile

@@ -132,15 +132,15 @@ RUN echo ${CACHEBUST}>/dev/null
 RUN CHART_VERSION="v3.13.300-build20210223"   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.20.2"     CHART_FILE=/charts/rke2-kube-proxy.yaml        CHART_BOOTSTRAP=true    /charts/build-chart.sh
+RUN CHART_VERSION="v1.20.4-build2021030201"   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.20.2-k3s1 AS k3s
+FROM rancher/k3s:v1.20.4-k3s1 AS k3s
 FROM rancher/hardened-containerd:v1.4.3-k3s3-build20210223 AS containerd
 FROM rancher/hardened-crictl:v1.19.0-build20210223 AS crictl
 FROM rancher/hardened-runc:v1.0.0-rc93-build20210223 AS runc

scripts/build-images

@@ -17,7 +17,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images.txt
     ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-${IMAGE_BUILD_VERSION}
     ${REGISTRY}/rancher/hardened-flannel:v0.13.0-rancher1-${IMAGE_BUILD_VERSION}
     ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.3.6-${IMAGE_BUILD_VERSION}
-    ${REGISTRY}/rancher/hardened-kube-proxy:${KUBERNETES_VERSION}
+    ${REGISTRY}/rancher/hardened-kube-proxy:${KUBERNETES_VERSION}-build20210302
     ${REGISTRY}/rancher/klipper-helm:v0.4.3-build20210225
     ${REGISTRY}/rancher/pause:${PAUSE_VERSION}
     ${REGISTRY}/rancher/nginx-ingress-controller-defaultbackend:1.5-rancher1

scripts/version.sh

@@ -31,7 +31,7 @@ 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.2}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.20.4}
 ETCD_VERSION=${ETCD_VERSION:-v3.4.13-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.2}
 IMAGE_BUILD_VERSION=${IMAGE_BUILD_VERSION:-build20210223}