From f618405f29aaa03df638f6cd0d9e9091c21edd51 Mon Sep 17 00:00:00 2001
From: Menna Elmasry <65324011+MonzElmasry@users.noreply.github.com>
Date: Fri, 19 Mar 2021 18:39:45 +0200
Subject: [PATCH] update rke2 version to v1.19.9+rke2r1 (#808)

---
 Dockerfile           | 4 ++--
 pkg/images/images.go | 2 +-
 scripts/build-images | 2 +-
 scripts/version.sh   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5eae18bd53..9c14e68bde 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -130,7 +130,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.8"                   CHART_FILE=/charts/rke2-kube-proxy.yaml        CHART_BOOTSTRAP=true    /charts/build-chart.sh
+RUN CHART_VERSION="v1.19.9-build2021031801"   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
 
@@ -138,7 +138,7 @@ 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.19.8-rc1-k3s1 AS k3s
+FROM rancher/k3s:v1.19.9-rc1-k3s1 AS k3s
 FROM rancher/hardened-containerd:v1.4.4-k3s1-build20210316 AS containerd
 FROM rancher/hardened-crictl:v1.19.0-build20210223 AS crictl
 FROM rancher/hardened-runc:v1.0.0-rc93-build20210223 AS runc
diff --git a/pkg/images/images.go b/pkg/images/images.go
index 9ed62d6ab5..1f7b45df9f 100644
--- a/pkg/images/images.go
+++ b/pkg/images/images.go
@@ -15,7 +15,7 @@ const (
 )
 
 var (
-	KubernetesVersion = "v1.19.8"                    // make sure this matches what is in the scripts/version.sh script
+	KubernetesVersion = "v1.19.9"                    // 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"
diff --git a/scripts/build-images b/scripts/build-images
index 7ccc1dd8b6..1f660b3428 100755
--- a/scripts/build-images
+++ b/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-build20210223
     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}
+    docker.io/rancher/hardened-kube-proxy:${KUBERNETES_VERSION}-build20210318
     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
diff --git a/scripts/version.sh b/scripts/version.sh
index d93e9f1697..563d8cf57d 100755
--- a/scripts/version.sh
+++ b/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.19.8}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.19.9}
 
 if [ -d .git ]; then
     if [ -z "$GIT_TAG" ]; then