diff --git a/Dockerfile b/Dockerfile index 69fe96486c..897525c554 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,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.12" CHART_FILE=/charts/rke2-kube-proxy.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="v1.18.13" 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 @@ -127,7 +127,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.12-k3s1 AS k3s +FROM rancher/k3s:v1.18.13-k3s1 AS k3s FROM rancher/hardened-containerd:v1.3.9-k3s1 AS containerd FROM rancher/hardened-crictl:v1.18.0 AS crictl FROM rancher/hardened-runc:v1.0.0-rc92 AS runc diff --git a/channels.yaml b/channels.yaml index 14c7520c65..631b676a3e 100644 --- a/channels.yaml +++ b/channels.yaml @@ -1,6 +1,6 @@ channels: - name: stable - latest: v1.18.12+rke2r1 + latest: v1.18.13+rke2r1 - name: latest latestRegexp: .* excludeRegexp: ^[^+]+- diff --git a/contrib/custom-image-kubelet/README.md b/contrib/custom-image-kubelet/README.md index b04d1a285d..413de45772 100644 --- a/contrib/custom-image-kubelet/README.md +++ b/contrib/custom-image-kubelet/README.md @@ -24,7 +24,7 @@ The remaining RKE2 components include: Requirements ---- -1. RKE2 v1.18.12-beta1+rke2r2 or newer (with image/kubelet override support) +1. RKE2 v1.18.13+rke2r1 or newer (with image/kubelet override support) 1. Python 3 1. Access to AWS ECR (either via AWS CLI IAM keys, or EC2 instance role) *This is only necessary if the replacement RKE2 images are stored in ECR* @@ -35,7 +35,7 @@ Installing On an Ubuntu host: ```bash -curl -sfL https://get.rke2.io | INSTALL_RKE2_VERSION=v1.18.12-beta1+rke2r2 sh - +curl -sfL https://get.rke2.io | INSTALL_RKE2_VERSION=v1.18.13+rke2r1 sh - sudo apt update sudo apt install -y python3-venv python3-wheel python3-pip diff --git a/developer-docs/upgrading_kubernetes.md b/developer-docs/upgrading_kubernetes.md index 9010f505e3..2e9fbb385e 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.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}` +* Dockerfile: `RUN CHART_VERSION="v1.18.13" CHART_FILE=/charts/rke2-kube-proxy.yaml` +* Dockerfile: `FROM rancher/k3s:v1.18.13-k3s1 AS k3s` +* images.go: `KubernetesVersion = "v1.18.13"` +* version.sh: `KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.18.13}` diff --git a/docs/upgrade/automated_upgrade.md b/docs/upgrade/automated_upgrade.md index d70ecfa096..af23874e94 100644 --- a/docs/upgrade/automated_upgrade.md +++ b/docs/upgrade/automated_upgrade.md @@ -57,7 +57,7 @@ spec: # force: true upgrade: image: rancher/rke2-upgrade - version: v1.18.9+rke2r1 + version: v1.18.13+rke2r1 --- # Agent plan apiVersion: upgrade.cattle.io/v1 @@ -85,7 +85,7 @@ spec: force: true upgrade: image: rancher/rke2-upgrade - version: v1.18.9+rke2r1 + version: v1.18.13+rke2r1 ``` diff --git a/pkg/images/images.go b/pkg/images/images.go index f9d5e435b5..2f9f99be10 100644 --- a/pkg/images/images.go +++ b/pkg/images/images.go @@ -15,7 +15,7 @@ const ( ) var ( - KubernetesVersion = "v1.18.12" // make sure this matches what is in the scripts/version.sh script + KubernetesVersion = "v1.18.13" // 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 22f6aa20b4..afc8863526 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.12} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.18.13} if [ -d .git ]; then if [ -z "$GIT_TAG" ]; then