Skip to content

Commit

Permalink
Merge pull request #2343 from fluxcd/check-kubernetes-1.20.6
Browse files Browse the repository at this point in the history
Set minimum supported version to Kubernetes 1.20.6
  • Loading branch information
stefanprodan authored Jan 26, 2022
2 parents 776a7fc + f154326 commit 6f053c4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
5 changes: 1 addition & 4 deletions cmd/flux/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/flux/testdata/check/check_pre.golden
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
► checking prerequisites
✔ Kubernetes {{ .serverVersion }} >=1.19.0-0
✔ Kubernetes {{ .serverVersion }} >=1.20.6-0
✔ prerequisites checks passed

0 comments on commit 6f053c4

Please sign in to comment.