Merge pull request #2019 from replicatedhq/divolgin/k8s-1-21

Remove k8s 1.18 tests and add k8s 1.21 tests
replicatedhq · Jul 30, 2021 · 1eac853 · 1eac853
2 parents 2121417 + 2ca3496
commit 1eac853
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 11 deletions.
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -229,7 +229,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        k8s_version: [v1.18.19-k3s1,v1.19.11-k3s1,v1.20.7-k3s1]
+        k8s_version: [v1.19.11-k3s1,v1.20.7-k3s1,v1.21.1-k3s1]
     steps:
       - uses: debianmaster/actions-k3s@v1.0.3
         id: k3s
@@ -358,7 +358,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        k8s_version: [v1.18.19-k3s1,v1.19.11-k3s1,v1.20.7-k3s1]
+        k8s_version: [v1.19.11-k3s1,v1.20.7-k3s1,v1.21.1-k3s1]
     steps:
       - uses: debianmaster/actions-k3s@v1.0.3
         id: k3s
@@ -426,7 +426,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        k8s_version: [v1.18.19-k3s1,v1.19.11-k3s1,v1.20.7-k3s1]
+        k8s_version: [v1.19.11-k3s1,v1.20.7-k3s1,v1.21.1-k3s1]
     steps:
       - uses: debianmaster/actions-k3s@v1.0.3
         id: k3s
@@ -503,7 +503,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        k8s_version: [v1.18.19-k3s1,v1.19.11-k3s1,v1.20.7-k3s1]
+        k8s_version: [v1.19.11-k3s1,v1.20.7-k3s1,v1.21.1-k3s1]
     steps:
       - uses: debianmaster/actions-k3s@v1.0.3
         id: k3s
@@ -581,7 +581,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        k8s_version: [v1.18.19-k3s1,v1.19.11-k3s1,v1.20.7-k3s1]
+        k8s_version: [v1.19.11-k3s1,v1.20.7-k3s1,v1.21.1-k3s1]
     steps:
       - uses: debianmaster/actions-k3s@v1.0.3
         id: k3s

diff --git a/hack/dev/Dockerfile.skaffold b/hack/dev/Dockerfile.skaffold
@@ -64,8 +64,24 @@ ENV KUBECTL_1_19_SHA256SUM=84eeb8237448e4f431fef0f0ec0ba8b07558d8e52d5a7e89b4ae6
 RUN curl -fsSLO "${KUBECTL_1_19_URL}" \
 	&& echo "${KUBECTL_1_19_SHA256SUM}  kubectl" | sha256sum -c - \
 	&& chmod +x kubectl \
-	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_1_19_VERSION}" \
-	&& ln -s "/usr/local/bin/kubectl-${KUBECTL_1_19_VERSION}" /usr/local/bin/kubectl
+	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_1_19_VERSION}"
+
+ENV KUBECTL_1_20_VERSION=v1.20.4
+ENV KUBECTL_1_20_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_1_20_VERSION}/bin/linux/amd64/kubectl
+ENV KUBECTL_1_20_SHA256SUM=98e8aea149b00f653beeb53d4bd27edda9e73b48fed156c4a0aa1dabe4b1794c
+RUN curl -fsSLO "${KUBECTL_1_20_URL}" \
+	&& echo "${KUBECTL_1_20_SHA256SUM}  kubectl" | sha256sum -c - \
+	&& chmod +x kubectl \
+	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_1_20_VERSION}"
+
+ENV KUBECTL_1_21_VERSION=v1.21.2
+ENV KUBECTL_1_21_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_1_21_VERSION}/bin/linux/amd64/kubectl
+ENV KUBECTL_1_21_SHA256SUM=55b982527d76934c2f119e70bf0d69831d3af4985f72bb87cd4924b1c7d528da
+RUN curl -fsSLO "${KUBECTL_1_21_URL}" \
+	&& echo "${KUBECTL_1_21_SHA256SUM}  kubectl" | sha256sum -c - \
+	&& chmod +x kubectl \
+	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_1_21_VERSION}" \
+	&& ln -s "/usr/local/bin/kubectl-${KUBECTL_1_21_VERSION}" /usr/local/bin/kubectl
 
 # Install kustomize 3
 RUN curl -L "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv3.5.4/kustomize_v3.5.4_linux_amd64.tar.gz" > /tmp/kustomize.tar.gz && \

diff --git a/kotsadm/operator/Dockerfile.skaffold b/kotsadm/operator/Dockerfile.skaffold
@@ -58,8 +58,24 @@ ENV KUBECTL_1_19_SHA256SUM=84eeb8237448e4f431fef0f0ec0ba8b07558d8e52d5a7e89b4ae6
 RUN curl -fsSLO "${KUBECTL_1_19_URL}" \
 	&& echo "${KUBECTL_1_19_SHA256SUM}  kubectl" | sha256sum -c - \
 	&& chmod +x kubectl \
-	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_1_19_VERSION}" \
-	&& ln -s "/usr/local/bin/kubectl-${KUBECTL_1_19_VERSION}" /usr/local/bin/kubectl
+	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_1_19_VERSION}"
+
+ENV KUBECTL_1_20_VERSION=v1.20.4
+ENV KUBECTL_1_20_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_1_20_VERSION}/bin/linux/amd64/kubectl
+ENV KUBECTL_1_20_SHA256SUM=98e8aea149b00f653beeb53d4bd27edda9e73b48fed156c4a0aa1dabe4b1794c
+RUN curl -fsSLO "${KUBECTL_1_20_URL}" \
+	&& echo "${KUBECTL_1_20_SHA256SUM}  kubectl" | sha256sum -c - \
+	&& chmod +x kubectl \
+	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_1_20_VERSION}"
+
+ENV KUBECTL_1_21_VERSION=v1.21.2
+ENV KUBECTL_1_21_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_1_21_VERSION}/bin/linux/amd64/kubectl
+ENV KUBECTL_1_21_SHA256SUM=55b982527d76934c2f119e70bf0d69831d3af4985f72bb87cd4924b1c7d528da
+RUN curl -fsSLO "${KUBECTL_1_21_URL}" \
+	&& echo "${KUBECTL_1_21_SHA256SUM}  kubectl" | sha256sum -c - \
+	&& chmod +x kubectl \
+	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_1_21_VERSION}" \
+	&& ln -s "/usr/local/bin/kubectl-${KUBECTL_1_21_VERSION}" /usr/local/bin/kubectl
 
 # Install helm v3.4.2
 RUN curl -L "https://get.helm.sh/helm-v3.4.2-linux-amd64.tar.gz" -o /tmp/helm.tar.gz && \

diff --git a/kotsadm/operator/deploy/Dockerfile b/kotsadm/operator/deploy/Dockerfile
@@ -44,8 +44,24 @@ ENV KUBECTL_1_19_SHA256SUM=84eeb8237448e4f431fef0f0ec0ba8b07558d8e52d5a7e89b4ae6
 RUN curl -fsSLO "${KUBECTL_1_19_URL}" \
 	&& echo "${KUBECTL_1_19_SHA256SUM}  kubectl" | sha256sum -c - \
 	&& chmod +x kubectl \
-	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_1_19_VERSION}" \
-	&& ln -s "/usr/local/bin/kubectl-${KUBECTL_1_19_VERSION}" /usr/local/bin/kubectl
+	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_1_19_VERSION}"
+
+ENV KUBECTL_1_20_VERSION=v1.20.4
+ENV KUBECTL_1_20_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_1_20_VERSION}/bin/linux/amd64/kubectl
+ENV KUBECTL_1_20_SHA256SUM=98e8aea149b00f653beeb53d4bd27edda9e73b48fed156c4a0aa1dabe4b1794c
+RUN curl -fsSLO "${KUBECTL_1_20_URL}" \
+	&& echo "${KUBECTL_1_20_SHA256SUM}  kubectl" | sha256sum -c - \
+	&& chmod +x kubectl \
+	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_1_20_VERSION}"
+
+ENV KUBECTL_1_21_VERSION=v1.21.2
+ENV KUBECTL_1_21_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_1_21_VERSION}/bin/linux/amd64/kubectl
+ENV KUBECTL_1_21_SHA256SUM=55b982527d76934c2f119e70bf0d69831d3af4985f72bb87cd4924b1c7d528da
+RUN curl -fsSLO "${KUBECTL_1_21_URL}" \
+	&& echo "${KUBECTL_1_21_SHA256SUM}  kubectl" | sha256sum -c - \
+	&& chmod +x kubectl \
+	&& mv kubectl "/usr/local/bin/kubectl-${KUBECTL_1_21_VERSION}" \
+	&& ln -s "/usr/local/bin/kubectl-${KUBECTL_1_21_VERSION}" /usr/local/bin/kubectl
 
 # Install helm v3.4.2
 RUN curl -L "https://get.helm.sh/helm-v3.4.2-linux-amd64.tar.gz" -o /tmp/helm.tar.gz && \

diff --git a/kotsadm/operator/pkg/util/kubectl_version.go b/kotsadm/operator/pkg/util/kubectl_version.go
@@ -10,6 +10,8 @@ import (
 )
 
 var knownKubectlVersions = []semver.Version{
+	semver.MustParse("1.21.2"),
+	semver.MustParse("1.20.4"),
 	semver.MustParse("1.19.3"),
 	semver.MustParse("1.18.10"),
 	semver.MustParse("1.17.13"),