Revert "Move release-1.21 branch from k3s/master to k3s/engine-1.21"

This reverts commit 3ffa45ac.

go.mod

@@ -5,7 +5,7 @@ go 1.16
 replace (
 	github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.20
 	github.com/benmoss/go-powershell => github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7
-	github.com/containerd/containerd => github.com/k3s-io/containerd v1.4.9-k3s1
+	github.com/containerd/containerd => github.com/k3s-io/containerd v1.4.8-k3s1
 	github.com/containerd/continuity => github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1
 	github.com/containerd/cri => github.com/k3s-io/cri v1.4.0-k3s.7 // k3s-release/1.4
 	github.com/docker/distribution => github.com/docker/distribution v2.7.1+incompatible
@@ -23,34 +23,34 @@ replace (
 	google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884
 	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.21.4-k3s1
-	k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.4-k3s1
-	k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.4-k3s1
-	k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.4-k3s1
-	k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.4-k3s1
-	k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.4-k3s1
-	k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.4-k3s1
-	k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.4-k3s1
-	k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.4-k3s1
-	k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.4-k3s1
-	k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.4-k3s1
-	k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.4-k3s1
-	k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.4-k3s1
-	k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.4-k3s1
-	k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.4-k3s1
-	k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.4-k3s1
-	k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.4-k3s1
-	k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.4-k3s1
-	k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.4-k3s1
-	k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.4-k3s1
-	k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.21.4-k3s1
-	k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.4-k3s1
-	k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.4-k3s1
-	k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.4-k3s1
-	k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.21.4-k3s1
-	k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.21.4-k3s1
-	k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.21.4-k3s1
-	k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.21.4-k3s1
+	k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.3-k3s1
+	k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.3-k3s1
+	k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.3-k3s1
+	k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.3-k3s1
+	k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.3-k3s1
+	k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.3-k3s1
+	k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.3-k3s1
+	k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.3-k3s1
+	k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.3-k3s1
+	k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.3-k3s1
+	k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.3-k3s1
+	k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.3-k3s1
+	k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.3-k3s1
+	k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.3-k3s1
+	k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.3-k3s1
+	k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.3-k3s1
+	k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.3-k3s1
+	k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.3-k3s1
+	k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.3-k3s1
+	k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.3-k3s1
+	k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.21.3-k3s1
+	k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.3-k3s1
+	k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.3-k3s1
+	k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.3-k3s1
+	k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.21.3-k3s1
+	k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.21.3-k3s1
+	k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.21.3-k3s1
+	k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.21.3-k3s1
 	mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7
 )
 
@@ -63,7 +63,7 @@ require (
 	github.com/iamacarpet/go-win64api v0.0.0-20210311141720-fe38760bed28
 	github.com/k3s-io/helm-controller v0.10.5
 	github.com/pkg/errors v0.9.1
-	github.com/rancher/k3s v1.21.1-rc1.0.20210820193422-ed5991f13b14 // engine-1.21
+	github.com/rancher/k3s v1.21.1-rc1.0.20210817230230-e32292478107
 	github.com/rancher/wharfie v0.4.1
 	github.com/rancher/wrangler v0.6.2
 	github.com/rancher/wrangler-api v0.6.0

go.sum

@@ -526,8 +526,8 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
 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/containerd v1.4.9-k3s1 h1:gV6EDgGcp4sxeZ+5dOaul+K+Z6nSx3rfzmC28DIDSSo=
-github.com/k3s-io/containerd v1.4.9-k3s1/go.mod h1:O7TXIlGKEOd9pX4UfoQW7kzPLmpjWSRRE1V0qZ+XZFw=
+github.com/k3s-io/containerd v1.4.8-k3s1 h1:p4Z22iGEy7EaOCDChlgojqm6Jnziv19EuqnnLnK4tpk=
+github.com/k3s-io/containerd v1.4.8-k3s1/go.mod h1:FxLYZ8JAZ2kqHz/1mpWp1wkcquVwfNbDlUKjrT1B0iI=
 github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1 h1:KEz2rd9IDbrQT8w6RibEYlwfTXiu0P6hQDE+6O4IJdI=
 github.com/k3s-io/continuity v0.0.0-20210309170710-f93269e0d5c1/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
 github.com/k3s-io/cri v1.4.0-k3s.7 h1:1ycdF3dMDJMW/k/UxDC6eMsyGSMZ/p0AoUBVdJvNGQs=
@@ -539,53 +539,53 @@ github.com/k3s-io/helm-controller v0.10.6 h1:3OKYu1ljQC2HfhHQKX0ZJXWx1wRQ9w/SJSr
 github.com/k3s-io/helm-controller v0.10.6/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74=
 github.com/k3s-io/kine v0.6.2 h1:1aJTPfB8HG4exqMKFVE5H0z4bepF05tJHtYNXotWXa4=
 github.com/k3s-io/kine v0.6.2/go.mod h1:rzCs93+rQHZGOiewMd84PDrER92QeZ6eeHbWkfEy4+w=
-github.com/k3s-io/kubernetes v1.21.4-k3s1 h1:l7QpI2NUbJQoCSZSoIq+WWKwZ4j8+SEqASzptiXfYDA=
-github.com/k3s-io/kubernetes v1.21.4-k3s1/go.mod h1:yNRsD2sfx76jpLKTgr0lJdVnILFWRo7b+HCo94tD48c=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.4-k3s1 h1:CVCfQ6tds9jbUnLispQFIoPIU9psU1qH6EJXbxouCeE=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.4-k3s1/go.mod h1:DKjoC7WTLvupppdmb5jEvRDPQENLZqz/stEUs19TOOc=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.4-k3s1 h1:18AyIzLyMSdNYmIhnFZnvaYOf+O/syZMW8LnW+gCiwQ=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.4-k3s1/go.mod h1:IXcceOZlxk/QwmKgxzlbq9KxBUtVM4eyUyV8fnvmNXQ=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.4-k3s1 h1:3AlGIJ0gOuLy8lWix2N1BuCDILh6ojh+4nHt+HYGmbo=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.4-k3s1/go.mod h1:gMKkLjxtyo46SzBqVAeRHWwH7m4d2zNbcW6c3sp5ADY=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.4-k3s1 h1:VY5penQMtfYmU4uCSde5VUAlAkajEycerZm6/J8SnKk=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.4-k3s1/go.mod h1:2Y9RSNXBfz+riYDg618kPhphADV72AAgn6lzIQ6usVc=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.4-k3s1/go.mod h1:4vy7xXlS9QNceWCoFBkdxsp50ToEpoM5TjtRKTRxyF0=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.4-k3s1 h1:jZD+7AvRvrzp1wq3IwqQpoWx6W4XWIjzKVE48HPY7h4=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.4-k3s1/go.mod h1:GYHnmKRvZoUbl1/4qXlnBKeipxIT+bJDxDP0T+ttZ4M=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.4-k3s1 h1:wC0CEIm4lWjFQbnFX64S5teSozpiMyaVP/h0k+jc4RY=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.4-k3s1/go.mod h1:LOQtDqZAF6SU/+dQ4bDbsIWiPQ1dGx7EsvMq96pXa/k=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.4-k3s1 h1:lszHrDUJjnRVzKmw4FMak+dkPRc+sB/tPVcxmbm6xjM=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.4-k3s1/go.mod h1:yvPZprzrt0uOuPx/Tkg3zCSdulxPWxWU2nznGYKmMVk=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.4-k3s1/go.mod h1:Tli7B7jNY6zPfuq2b/jJKv0IjmPtnqd0oQOWUgMR9D8=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.4-k3s1 h1:Fg5NMZfNqJ0h70axPtkE9Y5QopsZ3ixAHVWmiZWQXRE=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.4-k3s1/go.mod h1:nx6pwxjFc3YpuvLHXrXu10vFTdNuyJ6bmRrNYdF2Z68=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.4-k3s1 h1:wET4fJCUzDngito3S+c9p82kLmC7tO+Rm8mct5eQ/NU=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.4-k3s1/go.mod h1:kutkhetwPn05JbZkAtXBuIm5+cHbrBa1loHlO540yFk=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.4-k3s1 h1:aZoYow+l25+f4OaIlyx/77+oJvQe30ImjhGMGibEgPY=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.4-k3s1/go.mod h1:SnaQa8bOBayBORIZwicYBm9QrlwUPi2PKlMQOhI6HAU=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.4-k3s1 h1:QR78mIrFPD11zBC6mOTqy8Y3Vp07gCe/omfst5QIX6M=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.4-k3s1/go.mod h1:8a9+wxOscdSWUhL3k9ZL59Q/DmUJ0wlOAMalnNTNDSs=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.4-k3s1 h1:MFtXk6eJvF1P5ava4Oy80/l+jo+i2r3CtVtUphX8b/w=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.4-k3s1/go.mod h1:NmtKDopOnphD2IlcH9OjoxoI4mEkkgGhVw7dTbdBTY0=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.4-k3s1 h1:zmtCvGq6idOnD9ATmZY6yFiRihdDL84w3V5930F85Lk=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.4-k3s1/go.mod h1:45U8VTZzQ7HFiUs2ZYWXpqBQVVfaD4W964AG+MQuNHM=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.4-k3s1 h1:oCIlAJyLDvo8Ojm46yQ+3Ru3n/PyjOTolvl1TQVlFFM=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.4-k3s1/go.mod h1:46iKO45TZat/zvPyqe8TjLLrTS/U/nGB92Ft63PEPF0=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.4-k3s1 h1:HtT1obVflgjTgSNz6yfpOWreMxbDBQ0BimtWh5E1eR8=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.4-k3s1/go.mod h1:6mEp02ABsuOeeBuUrrol78v9LYysX7Z8CZOMFlkPOOI=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.4-k3s1 h1:pZg0f9OynATLslU5k5jBSYBLxtSQu267/EiZwPJJ9Go=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.4-k3s1/go.mod h1:2YTC4iC4FdyjWdoteA+Z3lDuwrH+6Cm1W59SS0RzioE=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.4-k3s1 h1:X/PfWme2WOnU0yBEPs8XdQr+p5BpMXjB/OQMdoZQxgs=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.4-k3s1/go.mod h1:9wq1Uz9l9XWtJKigYn/xv8z7yhVpfQh76/aPw27fxKM=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.4-k3s1 h1:Oi/ylzfkczHrMmsUNQHic/bpn+x3Aj37CyJbw/WKubo=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.4-k3s1/go.mod h1:o8/6oYd5NojfXqZcgzwRY6/N9H0txmvDbs4Sk6Laz0A=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.4-k3s1 h1:vr0gr5ftnAF9RqpJtfrRup7eLKrp05ofw3odFAZOTlA=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.4-k3s1/go.mod h1:J/qZeQTPahToXaMJSjdjrJek4VAporM+4/62jAxvRLI=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.4-k3s1 h1:/1HNwpC2EFgjBQtT4yYnGGMwT9rloy6cWOvshtFbDX4=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.4-k3s1/go.mod h1:/SknInvlq+Fm+vrO/Z7JYHjxwIsxAl32mAI9tUH/lGY=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.4-k3s1 h1:549wYQjVqqAuTjypMbovMrCMITHQXKtVGWsuD8OTp80=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.4-k3s1/go.mod h1:99KFJSKqMgMvpCWJr4w6ooLZgR+2usWp5GPaILFNq9k=
-github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.21.4-k3s1/go.mod h1:WkDfrpYVRWS0Muw8Vg5XicfVdTxnLvgiT8tX8DSD0Zo=
+github.com/k3s-io/kubernetes v1.21.3-k3s1 h1:tx3stNWTT1dcAh47pS06oEqOS7APkOtAW8KKjU/USno=
+github.com/k3s-io/kubernetes v1.21.3-k3s1/go.mod h1:7X44Q251LxNEMElkIC4X0v6kuiVSuHE3V/4IppweQ4A=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.3-k3s1 h1:z5jAHhmM5M6JL4G+zQccJ/tlYECn52a+mpJ4x7Ig/JU=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.21.3-k3s1/go.mod h1:DKjoC7WTLvupppdmb5jEvRDPQENLZqz/stEUs19TOOc=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.3-k3s1 h1:w7pGMNpuTvBJYJsyj4gYibUJCPFkxLWE2tT7CvhrMO8=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.21.3-k3s1/go.mod h1:IXcceOZlxk/QwmKgxzlbq9KxBUtVM4eyUyV8fnvmNXQ=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.3-k3s1 h1:3lWaFVYpGr1C5SkWaRp2MQmHv8lWJRe29bNwAUtO7x0=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.21.3-k3s1/go.mod h1:gMKkLjxtyo46SzBqVAeRHWwH7m4d2zNbcW6c3sp5ADY=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.3-k3s1 h1:IfEg8NHSfe7eCECJLu2ekNfubzEJogRnK7imif+c56w=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.21.3-k3s1/go.mod h1:RiAOi3ZPHTDg2VTMjvvKs/DnjjRK89ypw2WdnHgdcjg=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.21.3-k3s1/go.mod h1:4vy7xXlS9QNceWCoFBkdxsp50ToEpoM5TjtRKTRxyF0=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.3-k3s1 h1:Gjx9NJwEh6y6v0xpwVo3RezH7bdBPDUqSz8H9ixQ96E=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.21.3-k3s1/go.mod h1:GYHnmKRvZoUbl1/4qXlnBKeipxIT+bJDxDP0T+ttZ4M=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.3-k3s1 h1:DpIf9PuBigQIkV7R5GPA6cAhLbnBIdBQGsscox20u18=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.21.3-k3s1/go.mod h1:LOQtDqZAF6SU/+dQ4bDbsIWiPQ1dGx7EsvMq96pXa/k=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.3-k3s1 h1:esAZe1Lp9caXi4lqOfv0gssXEHlJ1Edl24OcVa8XI/E=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.21.3-k3s1/go.mod h1:yvPZprzrt0uOuPx/Tkg3zCSdulxPWxWU2nznGYKmMVk=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.21.3-k3s1/go.mod h1:Tli7B7jNY6zPfuq2b/jJKv0IjmPtnqd0oQOWUgMR9D8=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.3-k3s1 h1:yzbgydmpnyckRufQEiupAm2iMzHeMT80k4UeCd5fIiU=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.21.3-k3s1/go.mod h1:nx6pwxjFc3YpuvLHXrXu10vFTdNuyJ6bmRrNYdF2Z68=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.3-k3s1 h1:PyLWPQl1jGU5o7Zkn3m0NLg11Vr+T//v2Up5FGEabCY=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.21.3-k3s1/go.mod h1:kutkhetwPn05JbZkAtXBuIm5+cHbrBa1loHlO540yFk=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.3-k3s1 h1:mF6km5k3ZOOGBwUwlHnvjVHzyobl/vlY6lzs89YlLeY=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.21.3-k3s1/go.mod h1:SnaQa8bOBayBORIZwicYBm9QrlwUPi2PKlMQOhI6HAU=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.3-k3s1 h1:We1l21qSrQ/Tu2Z8rVVXUWzxNFr0d+EK4hN034ez9bU=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.21.3-k3s1/go.mod h1:8a9+wxOscdSWUhL3k9ZL59Q/DmUJ0wlOAMalnNTNDSs=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.3-k3s1 h1:6rFw56zQvaOmDHW8eTN104FRUB+JVunfFr3Ogd1CIbU=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.21.3-k3s1/go.mod h1:NmtKDopOnphD2IlcH9OjoxoI4mEkkgGhVw7dTbdBTY0=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.3-k3s1 h1:gvBJpIQhZwP/NJbHwbQkzr76KBFoNdVy/nOAuBZ5oGY=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.21.3-k3s1/go.mod h1:45U8VTZzQ7HFiUs2ZYWXpqBQVVfaD4W964AG+MQuNHM=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.3-k3s1 h1:R3c6MhTOY1FDefvDBYDDFgcCvDuwfKOvBjrcxnm8FfM=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.21.3-k3s1/go.mod h1:46iKO45TZat/zvPyqe8TjLLrTS/U/nGB92Ft63PEPF0=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.3-k3s1 h1:iwO7f34ve2ktfcamupF4Nal3HXH+ZftzSTF/xfnFdfk=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.21.3-k3s1/go.mod h1:6mEp02ABsuOeeBuUrrol78v9LYysX7Z8CZOMFlkPOOI=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.3-k3s1 h1:DxBrtG5+XldJQmEvnCl8X4BEi+f0JWUV3fFX7Y8IWiw=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.21.3-k3s1/go.mod h1:2YTC4iC4FdyjWdoteA+Z3lDuwrH+6Cm1W59SS0RzioE=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.3-k3s1 h1:qTaYchz67zm6wVpTzshpyRygUuHxMKtbPpViYBgtumE=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.21.3-k3s1/go.mod h1:9wq1Uz9l9XWtJKigYn/xv8z7yhVpfQh76/aPw27fxKM=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.3-k3s1 h1:BnJwSQhWg3RlqjPLm5jnfVzaUDyBO849MNT6OAV9XsA=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.21.3-k3s1/go.mod h1:o8/6oYd5NojfXqZcgzwRY6/N9H0txmvDbs4Sk6Laz0A=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.3-k3s1 h1:jr3iCLKNGvPaHg7Ns52FG9kpgi9At6qunIhYm0O069w=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.21.3-k3s1/go.mod h1:J/qZeQTPahToXaMJSjdjrJek4VAporM+4/62jAxvRLI=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.3-k3s1 h1:GOgm076plvUT6eT5jbaRC4fLI/SZIEGuLIDjeWV9w30=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.21.3-k3s1/go.mod h1:/SknInvlq+Fm+vrO/Z7JYHjxwIsxAl32mAI9tUH/lGY=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.3-k3s1 h1:RmU+WlBBrZ6gZse59Hpqm8Mf1rMKhElmahA+Nm6xd24=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.21.3-k3s1/go.mod h1:99KFJSKqMgMvpCWJr4w6ooLZgR+2usWp5GPaILFNq9k=
+github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.21.3-k3s1/go.mod h1:WkDfrpYVRWS0Muw8Vg5XicfVdTxnLvgiT8tX8DSD0Zo=
 github.com/k3s-io/protobuf v1.4.3-k3s1 h1:gduXrSm/6KkbTuctP6bASYqKQ/tyC/PNYqxBmJnk4Tc=
 github.com/k3s-io/protobuf v1.4.3-k3s1/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw=
@@ -813,8 +813,8 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T
 github.com/quobyte/api v0.1.8/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
 github.com/rancher/dynamiclistener v0.2.3 h1:FHn0Gkx+kIUqsFs3zMMR2QC9ufH/AoBLqO5zH5hbtqw=
 github.com/rancher/dynamiclistener v0.2.3/go.mod h1:9WusTANoiRr8cDWCTtf5txieulezHbpv4vhLADPp0zU=
-github.com/rancher/k3s v1.21.1-rc1.0.20210820193422-ed5991f13b14 h1:2nHEMXPpe9Qa4nxljkEj0HRdFPZb/wVdpYgXUUfngT4=
-github.com/rancher/k3s v1.21.1-rc1.0.20210820193422-ed5991f13b14/go.mod h1:DwwBXxDZLIjnn8x/qDc9PaDs0Dek6eMAiUKfMGpt0BQ=
+github.com/rancher/k3s v1.21.1-rc1.0.20210817230230-e32292478107 h1:hd/ZwOUlZORPFtABuXDxtTNx1X4cA5t6Fq+I1YNeiuk=
+github.com/rancher/k3s v1.21.1-rc1.0.20210817230230-e32292478107/go.mod h1:DwwBXxDZLIjnn8x/qDc9PaDs0Dek6eMAiUKfMGpt0BQ=
 github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod h1:wpITyDPTi/Na5h73XkbuEf2AP9fbgrIGqqxVzFhYD6U=
 github.com/rancher/remotedialer v0.2.0 h1:xD7t3K6JYwTdAsxmGtTHQMkEkFgKouQ1foLxVW424Dc=
 github.com/rancher/remotedialer v0.2.0/go.mod h1:tkU8ZvrR5lRgaKWaX71nAy6daeqvPFx/lJEnbW7tXSI=
@@ -1372,8 +1372,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22 h1:fmRfl9WJ4ApJn7LxNuED4m0t18qivVQOxP6aAYG9J6c=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.19 h1:0jaDAAxtqIrrqas4vtTqxct4xS5kHfRNycTRLTyJmVM=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.19/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/kustomize/api v0.8.8/go.mod h1:He1zoK0nk43Pc6NlV085xDXDXTNprtcyKZVm3swsdNY=
 sigs.k8s.io/kustomize/cmd/config v0.9.10/go.mod h1:Mrby0WnRH7hA6OwOYnYpfpiY0WJIMgYrEDfwOeFdMK0=
 sigs.k8s.io/kustomize/kustomize/v4 v4.1.2/go.mod h1:PxBvo4WGYlCLeRPL+ziT64wBXqbgfcalOS/SXa/tcyo=