Include prerelease data in k8s version constraints

This ensures the advertised version from e.g. GKE or EKS (for example
`v1.17.15-gke.800`) do not trigger a false warning.

Signed-off-by: Hidde Beydals <hello@hidde.co>
pull/949/head
Hidde Beydals 4 years ago
parent a5272b2b39
commit 5903dfc627

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

Loading…
Cancel
Save