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

Merge pull request #949 from fluxcd/k8s-ver-check

Browse Source 
Include prerelease data in k8s version constraints
This commit is contained in:
Hidde Beydals
2021-02-19 12:01:14 +01:00
committed by GitHub
parent a5272b2b39 5903dfc627
commit aab3452773
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/flux/check.go
View File

@@ -81,11 +81,11 @@ func runCheckCmd(cmd *cobra.Command, args []string) error {
fluxCheck()
if !kubectlCheck(ctx, ">=1.18.0") {
if !kubectlCheck(ctx, ">=1.18.0-0") {
checkFailed = true
}
if !kubernetesCheck(">=1.16.0") {
if !kubernetesCheck(">=1.16.0-0") {
checkFailed = true
}
@@ -158,7 +158,7 @@ func kubectlCheck(ctx context.Context, constraint string) bool {
c, _ := semver.NewConstraint(constraint)
if !c.Check(v) {
logger.Failuref("kubectl version must be %s", constraint)
logger.Failuref("kubectl version %s < %s", v.Original(), constraint)
return false
}
@@ -193,7 +193,7 @@ func kubernetesCheck(constraint string) bool {
c, _ := semver.NewConstraint(constraint)
if !c.Check(v) {
logger.Failuref("Kubernetes version must be %s", constraint)
logger.Failuref("Kubernetes version %s < %s", v.Original(), constraint)
return false
}