From f154326391ce82d19cace39eea59d44b79e75e7f Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Wed, 26 Jan 2022 10:41:17 +0200
Subject: [PATCH] Set minimum supported version to Kubernetes 1.20.6
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
---
.github/workflows/e2e.yaml | 2 +-
CONTRIBUTING.md | 6 +++---
cmd/flux/check.go | 5 +----
cmd/flux/testdata/check/check_pre.golden | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 866af2c6..7a4f6165 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -27,7 +27,7 @@ jobs:
uses: engineerd/setup-kind@v0.5.0
with:
version: v0.11.1
- image: kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729
+ image: kindest/node:v1.20.7
config: .github/kind/config.yaml # disable KIND-net
- name: Setup Calico for network policy
run: |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c492f631..e60c9469 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -67,9 +67,9 @@ for source changes.
Prerequisites:
-* go >= 1.16
-* kubectl >= 1.19
-* kustomize >= 4.0
+* go >= 1.17
+* kubectl >= 1.20
+* kustomize >= 4.4
Install the [controller-runtime/envtest](https://github.com/kubernetes-sigs/controller-runtime/tree/master/tools/setup-envtest) binaries with:
diff --git a/cmd/flux/check.go b/cmd/flux/check.go
index a36159d0..d530f553 100644
--- a/cmd/flux/check.go
+++ b/cmd/flux/check.go
@@ -56,10 +56,7 @@ type checkFlags struct {
}
var kubernetesConstraints = []string{
- ">=1.19.0-0",
- ">=1.16.11-0 <=1.16.15-0",
- ">=1.17.7-0 <=1.17.17-0",
- ">=1.18.4-0 <=1.18.20-0",
+ ">=1.20.6-0",
}
var checkArgs checkFlags
diff --git a/cmd/flux/testdata/check/check_pre.golden b/cmd/flux/testdata/check/check_pre.golden
index 02ba7892..ebb6294d 100644
--- a/cmd/flux/testdata/check/check_pre.golden
+++ b/cmd/flux/testdata/check/check_pre.golden
@@ -1,3 +1,3 @@
► checking prerequisites
-✔ Kubernetes {{ .serverVersion }} >=1.19.0-0
+✔ Kubernetes {{ .serverVersion }} >=1.20.6-0
✔ prerequisites checks passed
--
GitLab