Merge pull request #303 from briandowns/issue-255

Update Kubernetes from 1.18.4 to 1.18.8

Dockerfile

@@ -69,15 +69,15 @@ RUN echo ${CACHEBUST}>/dev/null
 RUN CHART_VERSION="v3.13.3"     CHART_FILE=/charts/rke2-canal-chart.yml             CHART_BOOTSTRAP=true    /charts/build-chart.sh
 RUN CHART_VERSION="1.10.101"    CHART_FILE=/charts/rke2-coredns-chart.yml           CHART_BOOTSTRAP=true    /charts/build-chart.sh
 RUN CHART_VERSION="1.36.300"    CHART_FILE=/charts/rke2-ingress-nginx-chart.yml     CHART_BOOTSTRAP=false   /charts/build-chart.sh
-RUN CHART_VERSION="v1.18.4"     CHART_FILE=/charts/rke2-kube-proxy-chart.yml        CHART_BOOTSTRAP=true    /charts/build-chart.sh
+RUN CHART_VERSION="v1.18.8"     CHART_FILE=/charts/rke2-kube-proxy-chart.yml        CHART_BOOTSTRAP=true    /charts/build-chart.sh
 RUN CHART_VERSION="2.11.100"    CHART_FILE=/charts/rke2-metrics-server-chart.yml    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.4-k3s1 AS k3s
+FROM rancher/k3s:v1.18.8-k3s1 AS k3s
 FROM rancher/containerd:v1.3.6-k3s2 AS containerd
 FROM rancher/crictl:v1.18.0 AS crictl
 

charts/build-chart.sh

@@ -1,15 +1,20 @@
 #!/usr/bin/env bash
+
 set -eux -o pipefail
+
 : "${CHART_FILE?required}"
+: "${CHART_NAME:="$(basename "${CHART_FILE%%-chart.yml}")"}"
+: "${CHART_URL:="${CHART_REPO:="https://rke2-charts.rancher.io"}/assets/${CHART_NAME}/${CHART_NAME}-${CHART_VERSION:="v0.0.0"}.tgz"}"
+curl -fsSL "${CHART_URL}" -o "${CHART_TMP:=$(mktemp)}"
 cat <<-EOF > "${CHART_FILE}"
 apiVersion: helm.cattle.io/v1
 kind: HelmChart
 metadata:
-  name: "${CHART_NAME:="$(basename "${CHART_FILE%%-chart.yml}")"}"
+  name: "${CHART_NAME}"
   namespace: "${CHART_NAMESPACE:="kube-system"}"
   annotations:
-    helm.cattle.io/chart-url: "${CHART_URL:="${CHART_REPO:="https://rke2-charts.rancher.io"}/assets/${CHART_NAME}/${CHART_NAME}-${CHART_VERSION:="v0.0.0"}.tgz"}"
+    helm.cattle.io/chart-url: "${CHART_URL}"
 spec:
   bootstrap: ${CHART_BOOTSTRAP:=false}
-  chartContent: $(curl -fsSL "${CHART_URL}" | base64 -w0)
+  chartContent: $(base64 -w0 < "${CHART_TMP}")
 EOF

pkg/images/images.go

@@ -23,7 +23,7 @@ var (
 	runtime           = os.Getenv("RKE2_RUNTIME_IMAGE")
 	etcd              = os.Getenv("RKE2_ETCD_IMAGE")
 
-	KubernetesVersion = "v1.18.4" // make sure this matches what is in the scripts/version.sh script
+	KubernetesVersion = "v1.18.8" // 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" // make sure this matches what is in the scripts/build-images script
 	RuntimeImageName  = "rke2-runtime"

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.4}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.18.8}
 
 if [ -d .git ]; then
     if [ -z "$GIT_TAG" ]; then