diff --git a/Dockerfile b/Dockerfile index 2c90967162..0be8521645 100644 --- a/Dockerfile +++ b/Dockerfile @@ -113,7 +113,7 @@ RUN echo ${CACHEBUST}>/dev/null RUN CHART_VERSION="v3.13.3" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="1.10.101" 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.9" CHART_FILE=/charts/rke2-kube-proxy.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="v1.18.10" CHART_FILE=/charts/rke2-kube-proxy.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="2.11.100" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh RUN rm -vf /charts/*.sh /charts/*.md @@ -121,7 +121,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.18.9-k3s1 AS k3s +FROM rancher/k3s:v1.18.10-k3s1 AS k3s FROM rancher/hardened-containerd:v1.3.6-k3s2 AS containerd FROM rancher/hardened-crictl:v1.18.0 AS crictl FROM rancher/hardened-runc:v1.0.0-rc92 AS runc diff --git a/developer-docs/upgrading_kubernetes.md b/developer-docs/upgrading_kubernetes.md index 6052e194be..9010f505e3 100644 --- a/developer-docs/upgrading_kubernetes.md +++ b/developer-docs/upgrading_kubernetes.md @@ -16,7 +16,7 @@ Create a new release asset for in the [rke2-charts](github.com/rancher/rke2-char The following files have references that will need to be updated in the respective locations. Replace the found version with the desired version. -* Dockerfile: `RUN CHART_VERSION="v1.18.9" CHART_FILE=/charts/rke2-kube-proxy.yaml` -* Dockerfile: `FROM rancher/k3s:v1.18.9-k3s1 AS k3s` -* images.go: `KubernetesVersion = "v1.18.9"` -* version.sh: `KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.18.9}` +* Dockerfile: `RUN CHART_VERSION="v1.18.10" CHART_FILE=/charts/rke2-kube-proxy.yaml` +* Dockerfile: `FROM rancher/k3s:v1.18.10-k3s1 AS k3s` +* images.go: `KubernetesVersion = "v1.18.10"` +* version.sh: `KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.18.10}` diff --git a/pkg/images/images.go b/pkg/images/images.go index fd3899df97..f4b0c694b6 100644 --- a/pkg/images/images.go +++ b/pkg/images/images.go @@ -23,7 +23,7 @@ var ( runtime = os.Getenv("RKE2_RUNTIME_IMAGE") etcd = os.Getenv("RKE2_ETCD_IMAGE") - KubernetesVersion = "v1.18.9" // make sure this matches what is in the scripts/version.sh script + KubernetesVersion = "v1.18.10" // 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" diff --git a/scripts/version.sh b/scripts/version.sh index ccb24c8bb3..fe77468a99 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.18.9} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.18.10} if [ -d .git ]; then if [ -z "$GIT_TAG" ]; then