Merge pull request #570 from ncopa/kubernetes-1.20.1

Bump kubernetes to 1.20.1
k0sproject · Dec 22, 2020 · 67b36fd · 67b36fd
2 parents 1b5c085 + 9490538
commit 67b36fd
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.12
 
 RUN apk add --no-cache bash coreutils findutils iptables curl
 
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl \
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.20.1/bin/linux/amd64/kubectl \
        && chmod +x ./kubectl \
        && mv ./kubectl /usr/local/bin/kubectl
 ENV KUBECONFIG=/var/lib/k0s/pki/admin.conf

diff --git a/docs/configuration.md b/docs/configuration.md
@@ -102,7 +102,7 @@ images:
     version: v0.3.7
   kubeproxy:
     image: k8s.gcr.io/kube-proxy
-    version: v1.20.0
+    version: v1.20.1
   coredns:
     image: docker.io/coredns/coredns
     version: 1.7.0

diff --git a/embedded-bins/Makefile b/embedded-bins/Makefile
@@ -1,7 +1,7 @@
 
 runc_version = 1.0.0-rc92
 containerd_version = 1.4.3
-kubernetes_version = 1.20.0
+kubernetes_version = 1.20.1
 kine_version = 0.6.0
 etcd_version = 3.4.14
 konnectivity_version = 0.0.14

diff --git a/examples/footloose-ha-controllers/Dockerfile b/examples/footloose-ha-controllers/Dockerfile
@@ -2,7 +2,7 @@ FROM quay.io/footloose/ubuntu18.04
 
 ADD k0s.service /etc/systemd/system/k0s.service
 
-RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl && \
+RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.20.1/bin/linux/amd64/kubectl && \
     chmod +x /usr/local/bin/kubectl
 
 ENV KUBECONFIG=/var/lib/k0s/pki/admin.conf
diff --git a/inttest/conformance/README.md b/inttest/conformance/README.md
@@ -32,12 +32,12 @@ This can be done in two ways.
 In the same directory as your `main.tf` file, create an additional file `terraform.tfvars` with the following input:
 ```
 k0s_version=v0.9.0
-k8s_version=v1.20.0
+k8s_version=v1.20.1
 onobuoy_version=0.20.0
 ```  
 ### 2. Environment variables
 ```
-TF_VAR_k0s_version=v0.7.0-beta1 TF_VAR_sonobuoy_version=0.18.0 TF_VAR_k8s_version=v1.20.0 terraform apply
+TF_VAR_k0s_version=v0.7.0-beta1 TF_VAR_sonobuoy_version=0.18.0 TF_VAR_k8s_version=v1.20.1 terraform apply
 ```
 **NOTE:** By default, terraform will fetch sonobuoy version **0.20.0**. If you want to use a different version you can override this with one of the above methods. 
 

diff --git a/inttest/conformance/terraform/main.tf b/inttest/conformance/terraform/main.tf
@@ -13,7 +13,7 @@ variable "sonobuoy_version" {
 }
 
 variable "k8s_version" {
-  // format: v1.20.0
+  // format: v1.20.1
   type = string
 }
 

diff --git a/inttest/sonobuoy/signetwork_test.go b/inttest/sonobuoy/signetwork_test.go
@@ -64,7 +64,7 @@ func (s *NetworkSuite) TestSigNetwork() {
 		`--e2e-focus=\[sig-network\].*\[Conformance\]`,
 		`--e2e-skip=\[Serial\]`,
 		"--e2e-parallel=y",
-		"--kube-conformance-image-version=v1.20.0",
+		"--kube-conformance-image-version=v1.20.1",
 	}
 	s.T().Log("running sonobuoy, this may take a while")
 	sonoFinished := make(chan bool)

diff --git a/pkg/constant/constant_shared.go b/pkg/constant/constant_shared.go
@@ -57,7 +57,7 @@ const (
 	MetricsImage               = "gcr.io/k8s-staging-metrics-server/metrics-server"
 	MetricsImageVersion        = "v0.3.7"
 	KubeProxyImage             = "k8s.gcr.io/kube-proxy"
-	KubeProxyImageVersion      = "v1.20.0"
+	KubeProxyImageVersion      = "v1.20.1"
 	CoreDNSImage               = "docker.io/coredns/coredns"
 	CoreDNSImageVersion        = "1.7.0"
 	CalicoImage                = "calico/cni"