Skip to content

Commit

Permalink
kubernetes: v1.18.20 (rancher#140)
Browse files Browse the repository at this point in the history 
- rancher/kubectl:v1.18.20
- sonobuoy/sonobuoy:v0.18.5
- k3s:v1.18.20+k3s1

Signed-off-by: Jacob Blain Christen <[email protected]>
  • Loading branch information
@dweomer
dweomer authored Sep 13, 2021
1 parent c70c6e0 commit fdf6400
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 81 deletions.
6 changes: 2 additions & 4 deletions Dockerfile.dapper
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
ARG KUBECTL=rancher/kubectl:v1.17.0
# ARG SONOBUOY=sonobuoy/sonobuoy:v0.17.2
# FROM ${SONOBUOY} AS sonobuoy
ARG KUBECTL=rancher/kubectl:v1.18.20
FROM ${KUBECTL} AS kubectl

FROM golang:1.16-alpine3.14
Expand All @@ -22,7 +20,7 @@ RUN if [ "$(go env GOARCH)" = "amd64" ]; then \
RUN if [ "${ARCH}" == "amd64" ]; then \
go get sigs.k8s.io/kustomize/kustomize/[email protected]; \
fi
ARG SONOBUOY_VERSION=0.17.2
ARG SONOBUOY_VERSION=0.18.5
RUN if [ "${ARCH}" != "arm" ]; then \
set -x; \
curl -sL "https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}/sonobuoy_${SONOBUOY_VERSION}_linux_${ARCH}.tar.gz" \
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ of the controller and the resources spawned by it.

## Testing

Integration tests are bundled as a [Sonobuoy plugin](https://sonobuoy.io/docs/v0.17.2/plugins/) that expects to be run within a pod.
Integration tests are bundled as a [Sonobuoy plugin](https://sonobuoy.io/docs/v0.19.0/plugins/) that expects to be run within a pod.
To verify locally:

```shell script
Expand Down
2 changes: 1 addition & 1 deletion e2e/cluster/local/images/k3s/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ARG ALPINE="library/alpine:3.14"
FROM ${ALPINE} AS k3s
ARG ARCH
ARG K3S_VERSION="v1.17.2+k3s1"
ARG K3S_VERSION="v1.18.20+k3s1"
RUN set -x \
&& apk --no-cache add \
bash \
Expand Down
4 changes: 2 additions & 2 deletions e2e/cluster/local/scripts/cluster-prepare
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ set -e
: "${ARCH?required}"
: "${DIST?required}"
: "${ALPINE_TAG:=3.14}"
: "${KUBECTL_TAG:=v1.17.0}"
: "${SONOBUOY_TAG:=v0.17.2}"
: "${KUBECTL_TAG:=v1.18.20}"
: "${SONOBUOY_TAG:=v0.18.5}"

docker-image-save() {
echo "Pulling '$1:$2' ..."
Expand Down
5 changes: 2 additions & 3 deletions examples/k3s-upgrade.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
k3s-upgrade: server
spec:
concurrency: 1
version: v1.18.8+k3s1
version: v1.18.20+k3s1
nodeSelector:
matchExpressions:
- {key: k3s-upgrade, operator: Exists}
Expand All @@ -34,7 +34,7 @@ metadata:
k3s-upgrade: agent
spec:
concurrency: 2 # in general, this should be the number of workers - 1
version: v1.18.8+k3s1
version: v1.18.20+k3s1
nodeSelector:
matchExpressions:
- {key: k3s-upgrade, operator: Exists}
Expand All @@ -45,7 +45,6 @@ spec:
serviceAccountName: system-upgrade
prepare:
# Since v0.5.0-m1 SUC will use the resolved version of the plan for the tag on the prepare container.
# image: rancher/k3s-upgrade:v1.17.4-k3s1
image: rancher/k3s-upgrade
args: ["prepare", "k3s-server"]
drain:
Expand Down
4 changes: 2 additions & 2 deletions examples/ubuntu/bionic.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
namespace: system-upgrade
type: Opaque
stringData:
curl: 7.58.0-2ubuntu3.8
openssl: 1.1.1-1ubuntu2.1~18.04.5
curl: 7.58.0-2ubuntu3.14
openssl: 1.1.1-1ubuntu2.1~18.04.13
upgrade.sh: |
#!/bin/sh
set -e
Expand Down
2 changes: 1 addition & 1 deletion examples/ubuntu/bionic/k3s/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN set -x \
/var/lib/apt/lists/* \
/var/tmp/*

ARG INSTALL_K3S_VERSION=v1.17.2+k3s1
ARG INSTALL_K3S_VERSION=v1.18.20+k3s1
ARG INSTALL_K3S_SKIP_START=true
ADD https://raw.githubusercontent.com/rancher/k3s/${INSTALL_K3S_VERSION}/install.sh /usr/share/rancher/k3s/
RUN sh -x /usr/share/rancher/k3s/install.sh || true
Expand Down
58 changes: 29 additions & 29 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,37 @@ require (
github.com/rancher/wrangler v0.8.1-0.20210424045532-c389a3e0ae51
github.com/sirupsen/logrus v1.4.2
github.com/urfave/cli v1.22.2
k8s.io/api v0.18.19
k8s.io/apimachinery v0.18.19
k8s.io/client-go v0.18.19
k8s.io/kubectl v0.0.0
k8s.io/kubernetes v1.18.19
k8s.io/api v0.18.20
k8s.io/apimachinery v0.18.20
k8s.io/client-go v0.18.20
k8s.io/kubectl v0.18.20
k8s.io/kubernetes v1.18.20
)

replace (
github.com/rancher/system-upgrade-controller/pkg/apis => ./pkg/apis
k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.19-k3s1
k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.19-k3s1
k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.19-k3s1
k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.19-k3s1
k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.18.19-k3s1
k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.19-k3s1
k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.19-k3s1
k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.19-k3s1
k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.19-k3s1
k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.19-k3s1
k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.19-k3s1
k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.19-k3s1
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.19-k3s1
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.19-k3s1
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.18.19-k3s1
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.19-k3s1
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.19-k3s1
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.18.19-k3s1
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.18.19-k3s1
k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.19-k3s1
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.18.19-k3s1
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.18.19-k3s1
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.18.19-k3s1
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.18.19-k3s1
k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.20-k3s1
k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.20-k3s1
k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.20-k3s1
k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.20-k3s1
k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.18.20-k3s1
k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.20-k3s1
k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.20-k3s1
k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.20-k3s1
k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.20-k3s1
k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.20-k3s1
k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.20-k3s1
k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.20-k3s1
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.20-k3s1
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.20-k3s1
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.18.20-k3s1
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.20-k3s1
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.20-k3s1
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.18.20-k3s1
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.18.20-k3s1
k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.20-k3s1
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.18.20-k3s1
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.18.20-k3s1
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.18.20-k3s1
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.18.20-k3s1
)
70 changes: 35 additions & 35 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,41 +351,41 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
github.com/k3s-io/kubernetes v1.18.19-k3s1 h1:fvnFu5oeTnRqj33rY+rxnPCuBhVkoBD1L62draay5Jg=
github.com/k3s-io/kubernetes v1.18.19-k3s1/go.mod h1:2WmqQaRSlUlhX69or0YjnjAYxCkuI9O2Fz9hGog7heg=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.19-k3s1 h1:iX8HqeGNedtgC4xE6KpoVsXni3JyZgh7R2cQ/sXIA7c=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.19-k3s1/go.mod h1:PC9bcnfNLq1T31Rtbqltzj+ITG7OgRj+MK5DF8iHUqk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.19-k3s1 h1:Gumgfcf5bItFSgRDOIQOlNOKauxlyDlToyBcPYiWw54=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.19-k3s1/go.mod h1:2qiGgN2MRNVYMXKCsoZ/ysR4QJvd9jY5MyZel3n64dc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.19-k3s1 h1:yRrl+Mb1GPOUi78c3cgF28IBbukUjGQJs4mMSfpmx/8=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.19-k3s1/go.mod h1:7RMrL3mZjFkieIQzH5GlWcs7dg4HoIQPDQcTImrvQpY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.19-k3s1 h1:F1pTF1yU0ocq9QN9z9ZHgpMo216Lx9MBas/CJYlMd8E=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.19-k3s1/go.mod h1:hTbV9qTY3JfDIq09q697Di8Whude1qm/WZoS7eNgmWY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.18.19-k3s1/go.mod h1:rfS96fmWvrKQRuLrQPbMZ2xAgn+XBygQHdHeCRROsew=
github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.19-k3s1 h1:vny8/qwVAPF1FRiSWLfP2wedE0NwvAGCgbBDfD3SSZI=
github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.19-k3s1/go.mod h1:RBeVxbBIHo2fPCKhKvw3C8xmTfDgDmz4TEIOJhOdYxE=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.19-k3s1 h1:cCEgiJSxRzMIZQ8zF4MhIaTG8cFy/bbb1WuX8QYWe3Y=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.19-k3s1/go.mod h1:/K0GTm7zBgH+mh+V3UYvaNpv6hsY513kdZVavz78dt0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.19-k3s1/go.mod h1:GO6aJAE0G4vDExO1wjIYkSUNSHl/zxvqRDD9DeAzjoo=
github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.19-k3s1 h1:7eHqbKcYayJhTyNM4QRgk+bjMgM7cAJPLPZA4EbIAJU=
github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.19-k3s1/go.mod h1:khOUcwZP0BTqJU/LJOtE8Jl9bo5p9vULMKRKciv+AIg=
github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.19-k3s1 h1:KWzur09dMCy6epd4Eagyk3PW/Fe4RgheW/mT0kZy0jY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.19-k3s1/go.mod h1:sk2sgP6I0EQaSU1ADwJe8oYtNzOHI0QlyPlr/3+vcDc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.19-k3s1 h1:6YxOzPAhurvrz0hahFJK11UlW1fwvxx+rcnDnZPebsQ=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.19-k3s1/go.mod h1:XnplkOLKxeKbT+y5vvjPWc+eONU9byDTVKI9hsqZTR4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.19-k3s1 h1:VRaa8gtG7MeEJAX5JwbPJzNO8ZqsVhS2fPUR7zp5eEk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.19-k3s1/go.mod h1:LQxrz5PyHX52C2QZCG0kSk+ImaVXBFpfVWD5K47VYXY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.19-k3s1/go.mod h1:0kouigesaO14L8x1Dpi2q3iEI43Zb+TjIMeNddpcvT8=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.19-k3s1/go.mod h1:PT4l/+Eiddqn5FnxLR+19Y6tbTsY0Jm2YyQyBMz+Uks=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.18.19-k3s1/go.mod h1:rQfCml0+V6Sm8UX+2Ol6aEp5Vx5Ia3jZ80DC4u7pjcc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.19-k3s1 h1:5hs8rUaM2ulXNH8hlRX1IQsyFsISftoBZkGXzIg21Uk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.19-k3s1/go.mod h1:x0AgqxB6jm40GkP+Qn3VQGqZq6SEs7AaG52z4H78Lp0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.19-k3s1 h1:JhpBDXPA42cNSy2oXW9tP5nws/Jy2/5m+ni7q8p3emE=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.19-k3s1/go.mod h1:EVnvFvv90NpwDnScQlb4sI7rv68MOioOPBYAEjGEwXk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.18.19-k3s1/go.mod h1:vGzo6okdIPUlm1uKqvArNIb6lXo5aGAT4zXyrlCoMMA=
github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.19-k3s1/go.mod h1:BBJvgp6V/akRY2bCFkJw+8xKx9o3sdabCbv1t0okkW4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.18.19-k3s1/go.mod h1:E7cbaHkNadVcB+b9CqXqoRa++EwOikkSZTdGaJFHm58=
github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.18.19-k3s1/go.mod h1:lIYmFFDZSe2V4cvuXEVfgXo/9igVESR7VVV6i1kDOyw=
github.com/k3s-io/kubernetes v1.18.20-k3s1 h1:ovTc9gcTwQjkHO2O4YBvPXXM5BC2tnMJWIsHEpy+lXI=
github.com/k3s-io/kubernetes v1.18.20-k3s1/go.mod h1:2WmqQaRSlUlhX69or0YjnjAYxCkuI9O2Fz9hGog7heg=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.20-k3s1 h1:CXeharqseNFyvFbczxucODgkrDvfvNU3uA3e69P2imA=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.18.20-k3s1/go.mod h1:PC9bcnfNLq1T31Rtbqltzj+ITG7OgRj+MK5DF8iHUqk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.20-k3s1 h1:OSGuhSyK9j6rDOFVe/GqBOVQcDuQhI/+ACpscdiDwXw=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.18.20-k3s1/go.mod h1:2qiGgN2MRNVYMXKCsoZ/ysR4QJvd9jY5MyZel3n64dc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.20-k3s1 h1:abs6DaXgQLREOBpZUUl8o5DPnXusIjy53YDaJxPIgdo=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.18.20-k3s1/go.mod h1:7RMrL3mZjFkieIQzH5GlWcs7dg4HoIQPDQcTImrvQpY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.20-k3s1 h1:JfPWW1qxilxRQCIT5UxilQaPxLvBIm+mSwJGuqiJU1w=
github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.18.20-k3s1/go.mod h1:hTbV9qTY3JfDIq09q697Di8Whude1qm/WZoS7eNgmWY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.18.20-k3s1/go.mod h1:rfS96fmWvrKQRuLrQPbMZ2xAgn+XBygQHdHeCRROsew=
github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.20-k3s1 h1:Iz2x7Q8T9RHSBrMtJhjv95dhihGUaSC+UIRmU7iJ50I=
github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.18.20-k3s1/go.mod h1:RBeVxbBIHo2fPCKhKvw3C8xmTfDgDmz4TEIOJhOdYxE=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.20-k3s1 h1:k0yQ7WJ7YDKhV8ID2cUOzzNqhfCv/7KIiu//zsUv4Ug=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.18.20-k3s1/go.mod h1:/K0GTm7zBgH+mh+V3UYvaNpv6hsY513kdZVavz78dt0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.18.20-k3s1/go.mod h1:GO6aJAE0G4vDExO1wjIYkSUNSHl/zxvqRDD9DeAzjoo=
github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.20-k3s1 h1:m9qBsDyjFCt83EB5Xbn6XHv5igr2aDYUnMoSJ3InqtU=
github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.18.20-k3s1/go.mod h1:khOUcwZP0BTqJU/LJOtE8Jl9bo5p9vULMKRKciv+AIg=
github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.20-k3s1 h1:UwI3IANU2TbTluHD2/ZbTuYpc3Bs1P5GE8zkHvt7nnk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.18.20-k3s1/go.mod h1:sk2sgP6I0EQaSU1ADwJe8oYtNzOHI0QlyPlr/3+vcDc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.20-k3s1 h1:QU3eWSZ/HAouDWPEjJ75JMI/YstANz0Tt4x+jLzNcik=
github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.18.20-k3s1/go.mod h1:XnplkOLKxeKbT+y5vvjPWc+eONU9byDTVKI9hsqZTR4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.20-k3s1 h1:SKQ+zAFlkGvRr1ZSgtqxwJDB4lN8MumSM6HtZO2Qkuc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.18.20-k3s1/go.mod h1:LQxrz5PyHX52C2QZCG0kSk+ImaVXBFpfVWD5K47VYXY=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.18.20-k3s1/go.mod h1:0kouigesaO14L8x1Dpi2q3iEI43Zb+TjIMeNddpcvT8=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.18.20-k3s1/go.mod h1:PT4l/+Eiddqn5FnxLR+19Y6tbTsY0Jm2YyQyBMz+Uks=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.18.20-k3s1/go.mod h1:rQfCml0+V6Sm8UX+2Ol6aEp5Vx5Ia3jZ80DC4u7pjcc=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.20-k3s1 h1:m1OCJnE7ZndXWmlvD1BQ0zcdHI0nhjcddrZx5U1RwWQ=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.18.20-k3s1/go.mod h1:x0AgqxB6jm40GkP+Qn3VQGqZq6SEs7AaG52z4H78Lp0=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.20-k3s1 h1:ZKCCzi0GwOFxdxmjr/xAr4CpVFzp6DA9D7Jht7Xd7LA=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.18.20-k3s1/go.mod h1:EVnvFvv90NpwDnScQlb4sI7rv68MOioOPBYAEjGEwXk=
github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.18.20-k3s1/go.mod h1:vGzo6okdIPUlm1uKqvArNIb6lXo5aGAT4zXyrlCoMMA=
github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.18.20-k3s1/go.mod h1:BBJvgp6V/akRY2bCFkJw+8xKx9o3sdabCbv1t0okkW4=
github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.18.20-k3s1/go.mod h1:E7cbaHkNadVcB+b9CqXqoRa++EwOikkSZTdGaJFHm58=
github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.18.20-k3s1/go.mod h1:lIYmFFDZSe2V4cvuXEVfgXo/9igVESR7VVV6i1kDOyw=
github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
Expand Down
2 changes: 1 addition & 1 deletion manifests/system-upgrade-controller.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ data:
SYSTEM_UPGRADE_JOB_ACTIVE_DEADLINE_SECONDS: "900"
SYSTEM_UPGRADE_JOB_BACKOFF_LIMIT: "99"
SYSTEM_UPGRADE_JOB_IMAGE_PULL_POLICY: "Always"
SYSTEM_UPGRADE_JOB_KUBECTL_IMAGE: "rancher/kubectl:v1.18.3"
SYSTEM_UPGRADE_JOB_KUBECTL_IMAGE: "rancher/kubectl:v1.18.20"
SYSTEM_UPGRADE_JOB_PRIVILEGED: "true"
SYSTEM_UPGRADE_JOB_TTL_SECONDS_AFTER_FINISH: "900"
SYSTEM_UPGRADE_PLAN_POLLING_INTERVAL: "15m"
Expand Down
2 changes: 1 addition & 1 deletion pkg/upgrade/job/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const (
defaultBackoffLimit = int32(2)
defaultActiveDeadlineSeconds = int64(600)
defaultPrivileged = true
defaultKubectlImage = "rancher/kubectl:1.18.3"
defaultKubectlImage = "rancher/kubectl:v1.18.20"
defaultImagePullPolicy = corev1.PullIfNotPresent
defaultTTLSecondsAfterFinished = int32(900)
)
Expand Down
2 changes: 1 addition & 1 deletion scripts/e2e-sonobuoy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export ARCH COMMIT DIST REPO TAG VERSION E2E_CLUSTER=${E2E_CLUSTER:=local} KUBEC
export PATH="$PWD/e2e/cluster/${E2E_CLUSTER}/scripts:$PATH"

e2e-sonobuoy-run() {
: ${SONOBUOY_RUN_SONOBUOY_IMAGE:="sonobuoy/sonobuoy:v0.17.2"}
: ${SONOBUOY_RUN_SONOBUOY_IMAGE:="sonobuoy/sonobuoy:v0.18.5"}
: ${SONOBUOY_RUN_IMAGE_PULL_POLICY:=Never}
: ${SONOBUOY_RUN_WAIT:=10}

Expand Down

0 comments on commit fdf6400

Please sign in to comment.