Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-11 20:35:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Kubernetes version minimum requirements

Browse Source 
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan
2021-10-06 11:34:33 +03:00
parent 83c3e8c2fc
commit 4c99117c7c
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cmd/flux/check.go
View File

@@ -24,7 +24,6 @@ import (
"github.com/Masterminds/semver/v3" "github.com/Masterminds/semver/v3"
"github.com/spf13/cobra" "github.com/spf13/cobra"
v1 "k8s.io/api/apps/v1" v1 "k8s.io/api/apps/v1"
apimachineryversion "k8s.io/apimachinery/pkg/version"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
@@ -54,8 +53,11 @@ type checkFlags struct {
extraComponents []string extraComponents []string
} }
type kubectlVersion struct { var kubernetesConstraints = []string{
ClientVersion *apimachineryversion.Info `json:"clientVersion"` ">=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",
} }
var checkArgs checkFlags var checkArgs checkFlags
@@ -76,7 +78,7 @@ func runCheckCmd(cmd *cobra.Command, args []string) error {
fluxCheck() fluxCheck()
if !kubernetesCheck(">=1.16.0-0") { if !kubernetesCheck(kubernetesConstraints) {
checkFailed = true checkFailed = true
} }
@@ -121,7 +123,7 @@ func fluxCheck() {
} }
} }
func kubernetesCheck(constraint string) bool { func kubernetesCheck(constraints []string) bool {
cfg, err := utils.KubeConfig(rootArgs.kubeconfig, rootArgs.kubecontext) cfg, err := utils.KubeConfig(rootArgs.kubeconfig, rootArgs.kubecontext)
if err != nil { if err != nil {
logger.Failuref("Kubernetes client initialization failed: %s", err.Error()) logger.Failuref("Kubernetes client initialization failed: %s", err.Error())
@@ -146,13 +148,23 @@ func kubernetesCheck(constraint string) bool {
return false return false
} }
c, _ := semver.NewConstraint(constraint) var valid bool
if !c.Check(v) { var vrange string
logger.Failuref("Kubernetes version %s < %s", v.Original(), constraint) for _, constraint := range constraints {
c, _ := semver.NewConstraint(constraint)
if c.Check(v) {
valid = true
vrange = constraint
break
}
}
if !valid {
logger.Failuref("Kubernetes version %s does not match %s", v.Original(), constraints[0])
return false return false
} }
logger.Successf("Kubernetes %s %s", v.String(), constraint) logger.Successf("Kubernetes %s %s", v.String(), vrange)
return true return true
} }

2
cmd/flux/testdata/check/check_pre.golden vendored
View File

@@ -1,3 +1,3 @@
► checking prerequisites ► checking prerequisites
✔ Kubernetes {{ .serverVersion }} >=1.16.0-0 ✔ Kubernetes {{ .serverVersion }} >=1.19.0-0
✔ prerequisites checks passed ✔ prerequisites checks passed