Merge pull request #709 from erikwilson/k8s-v1.19.8

Update to k8s v1.19.8

.drone.yml

@@ -11,7 +11,7 @@ steps:
 - name: build-and-package
   image: rancher/dapper:v0.5.3
   commands:
-  - docker pull --quiet rancher/hardened-build-base:v1.13.15b4
+  - docker pull --quiet rancher/hardened-build-base:v1.15.8b5
   - dapper -f Dockerfile --target dapper make dapper-ci
   volumes:
   - name: docker
@@ -51,7 +51,7 @@ steps:
     - refs/tags/*
 
 - name: publish-image-kubernetes
-  image: rancher/hardened-build-base:v1.13.15b4
+  image: rancher/hardened-build-base:v1.15.8b5
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - DRONE_TAG=${DRONE_TAG} make publish-image-kubernetes
@@ -73,7 +73,7 @@ steps:
     - refs/tags/*
 
 - name: publish-image-runtime
-  image: rancher/hardened-build-base:v1.13.15b4
+  image: rancher/hardened-build-base:v1.15.8b5
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - DRONE_TAG=${DRONE_TAG} make publish-image-runtime
@@ -110,7 +110,7 @@ platform:
 
 steps:
 - name: go-mod-tidy
-  image: rancher/hardened-build-base:v1.13.15b4
+  image: rancher/hardened-build-base:v1.15.8b5
   commands:
   - go mod tidy
   - git diff --exit-code
@@ -134,7 +134,7 @@ platform:
 
 steps:
 - name: manifest-runtime
-  image: rancher/hardened-build-base:v1.13.15b4
+  image: rancher/hardened-build-base:v1.15.8b5
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - DRONE_TAG=${DRONE_TAG} make publish-manifest-runtime
@@ -156,7 +156,7 @@ steps:
     - refs/tags/*
 
 - name: manifest-kubernetes
-  image: rancher/hardened-build-base:v1.13.15b4
+  image: rancher/hardened-build-base:v1.15.8b5
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - DRONE_TAG=${DRONE_TAG} make publish-manifest-kubernetes

Dockerfile

@@ -1,6 +1,6 @@
 ARG KUBERNETES_VERSION=dev
 # Build environment
-FROM rancher/hardened-build-base:v1.15.5b5 AS build
+FROM rancher/hardened-build-base:v1.15.8b5 AS build
 RUN set -x \
  && apk --no-cache add \
     bash \
@@ -120,15 +120,15 @@ 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.19.7"    CHART_FILE=/charts/rke2-kube-proxy.yaml        CHART_BOOTSTRAP=true    /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="2.11.100"    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.19.7-k3s1 AS k3s
+FROM rancher/k3s:v1.19.8-rc1-k3s1 AS k3s
 FROM rancher/hardened-containerd:v1.4.3-k3s3 AS containerd
 FROM rancher/hardened-crictl:v1.19.0 AS crictl
 FROM rancher/hardened-runc:v1.0.0-rc92 AS runc

developer-docs/upgrading_kubernetes.md

@@ -25,10 +25,10 @@ Create a PR in [rke2-charts](https://github.com/rancher/rke2-charts) that update
 
 The following files have references that will need to be updated in the respective locations. Replace the found version with the desired version. There are also references in documentation that should be updated and kept in sync. 
 
-* Dockerfile: `RUN CHART_VERSION="v1.19.7"     CHART_FILE=/charts/rke2-kube-proxy.yaml`
-* Dockerfile: `FROM rancher/k3s:v1.19.7-k3s1 AS k3s`
-* images.go:  `KubernetesVersion = "v1.19.7"`
-* version.sh: `KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.19.7}`
+* Dockerfile: `RUN CHART_VERSION="v1.19.8"     CHART_FILE=/charts/rke2-kube-proxy.yaml`
+* Dockerfile: `FROM rancher/k3s:v1.19.8-k3s1 AS k3s`
+* images.go:  `KubernetesVersion = "v1.19.8"`
+* version.sh: `KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.19.8}`
 
 Once these changes are made, submit a PR for review and let CI complete. When CI is finished and 2 approvals are had, merge the PR. CI will run for the master merge. 
 
@@ -39,7 +39,7 @@ Next, we need to create a release candidate (RC).
 * Click "Releases"
 * Click "Draft new release"
 * Enter the desired version into the "Tag version" box. 
-    * Example tag: `v1.19.7-rc1+rke2r1`
+    * Example tag: `v1.19.8-rc1+rke2r1`
 
 CI will run and build the release assets as well as kick off an image build for [RKE2 Upgrade images](https://hub.docker.com/r/rancher/rke2-upgrade/tags?page=1&ordering=last_updated).
 
@@ -50,7 +50,7 @@ Along with creating a new RKE2 release, we need to trigger a new build of the as
 * Click "Releases"
 * Click "Draft new release"
 * Enter the desired version into the "Tag version" box. 
-    * Example tag: `v1.19.7-rc1+rke2r1.testing.0`
+    * Example tag: `v1.19.8-rc1+rke2r1.testing.0`
     * The first part of the tag here must match the tag created in the RKE2 repo.
 
 When CI completes, let QA know so they can perform testing.
@@ -62,7 +62,7 @@ Once QA signs off on the RC, it's time to cut the primary release. Go to the [rk
 * Click "Releases"
 * Click "Draft new release"
 * Enter the desired version into the "Tag version" box. 
-    * Example tag: `v1.19.7+rke2r1`
+    * Example tag: `v1.19.8+rke2r1`
 
 Leave the release as "prerelease". This will be unchecked as soon as CI completes successfully.
 
@@ -71,22 +71,22 @@ Once complete, the process is repeated in the [rke2-packaging](https://github.co
 * Click "Releases"
 * Click "Draft new release"
 * Enter the desired version into the "Tag version" box. 
-    * Example tag: `v1.19.7+rke2r1.testing.0`
+    * Example tag: `v1.19.8+rke2r1.testing.0`
     * The first part of the tag here must match the tag created in the RKE2 repo.
 
 Make sure that CI passes. This is for RPM availability in the testing channel.
 
-Once complete, perform the steps above again however this time, use the tag "latest" tag. E.g. `v1.19.7+rke2r1.latest.0`.
+Once complete, perform the steps above again however this time, use the tag "latest" tag. E.g. `v1.19.8+rke2r1.latest.0`.
 
 We choose "latest" here since we want to wait at least 24 hours in case the community finds an issue. Patches will need at least 24 hours. We'll then wait up to 7 days until marking the release as "stable".
 
 ### Updating Channel Server
 
 After all of the builds are complete and QA has signed off on the release, we need to update the channel server. This is done by editing the `channels.yaml` file at the root of the [rke2](https://github.com/rancher/rke2) repository.
 
-* Update the line: `latest: <release>` to be the recent release. e.g. `v1.19.7+rke2r1`.
+* Update the line: `latest: <release>` to be the recent release. e.g. `v1.19.8+rke2r1`.
 * Verify updated in the JSON output from a call [here](https://update.rke2.io/).
 
 ### Promoting to Stable
 
-After 24 hours, we'll promote the release to stable by updating the channel server's config as we did at above, however this time changing "latest" to "stable". We need to do the same thing for RPM's too. This involves the same steps for RPM releases but changing "latest" to "stable" in the release name. E.g. `v1.19.7+rke2r1.stable.0`.
+After 24 hours, we'll promote the release to stable by updating the channel server's config as we did at above, however this time changing "latest" to "stable". We need to do the same thing for RPM's too. This involves the same steps for RPM releases but changing "latest" to "stable" in the release name. E.g. `v1.19.8+rke2r1.stable.0`.

go.mod

@@ -22,50 +22,47 @@ replace (
 	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
 	google.golang.org/grpc => google.golang.org/grpc v1.27.1
 	gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2
-	k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.19.5-k3s1
-	k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.19.5-k3s1
-	k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.19.5-k3s1
-	k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.19.5-k3s1
-	k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.19.5-k3s1
-	k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.19.5-k3s1
-	k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.19.5-k3s1
-	k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.19.5-k3s1
-	k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.19.5-k3s1
-	k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.19.5-k3s1
-	k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.19.5-k3s1
-	k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.19.5-k3s1
-	k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.19.5-k3s1
-	k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.19.5-k3s1
-	k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.19.5-k3s1
-	k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.19.5-k3s1
-	k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.19.5-k3s1
-	k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.19.5-k3s1
-	k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.19.5-k3s1
-	k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.19.5-k3s1
-	k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.19.5-k3s1
-	k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.19.5-k3s1
-	k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.19.5-k3s1
-	k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.19.5-k3s1
-	k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.19.5-k3s1
+	k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.19.8-k3s1
+	k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.19.8-k3s1
+	k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.19.8-k3s1
+	k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.19.8-k3s1
+	k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.19.8-k3s1
+	k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.19.8-k3s1
+	k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.19.8-k3s1
+	k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.19.8-k3s1
+	k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.19.8-k3s1
+	k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.19.8-k3s1
+	k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.19.8-k3s1
+	k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.19.8-k3s1
+	k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.19.8-k3s1
+	k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.19.8-k3s1
+	k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.19.8-k3s1
+	k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.19.8-k3s1
+	k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.19.8-k3s1
+	k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.19.8-k3s1
+	k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.19.8-k3s1
+	k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.19.8-k3s1
+	k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.19.8-k3s1
+	k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.19.8-k3s1
+	k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.19.8-k3s1
+	k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.19.8-k3s1
+	k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.19.8-k3s1
 	mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34
 )
 
 require (
 	github.com/containerd/containerd v1.4.3 // indirect
-	github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible // indirect
 	github.com/google/go-containerregistry v0.0.0-20190617215043-876b8855d23c
 	github.com/k3s-io/helm-controller v0.8.3
 	github.com/pkg/errors v0.9.1
-	github.com/rancher/k3s v1.19.2-0.20201208230637-989c936993fb
+	github.com/rancher/k3s v1.19.8-rc1.0.20210218212206-95fc76b206b1
 	github.com/rancher/wrangler v0.6.1
 	github.com/sirupsen/logrus v1.6.0
 	github.com/urfave/cli v1.22.2
-	golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
 	google.golang.org/grpc v1.31.1
 	k8s.io/api v0.19.0
 	k8s.io/apimachinery v0.19.0
 	k8s.io/apiserver v0.19.0
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	k8s.io/kubernetes v1.19.5 // indirect
 	sigs.k8s.io/yaml v1.2.0
 )