mirror of
https://github.com/fluxcd/flux2.git
synced 2026-02-22 07:31:47 +00:00
Add semver condition to check output
This commit is contained in:
parent
13760258ab
commit
2d300d7344
1 changed files with 15 additions and 8 deletions
|
|
@ -32,27 +32,34 @@ func init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func runCheckCmd(cmd *cobra.Command, args []string) error {
|
func runCheckCmd(cmd *cobra.Command, args []string) error {
|
||||||
|
checkFailed := false
|
||||||
if !sshCheck() {
|
if !sshCheck() {
|
||||||
os.Exit(1)
|
checkFailed = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if !kubectlCheck(">=1.14.0") {
|
if !kubectlCheck(">=1.18.0") {
|
||||||
os.Exit(1)
|
checkFailed = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if !kustomizeCheck(">=3.5.0") {
|
if !kustomizeCheck(">=3.5.0") {
|
||||||
os.Exit(1)
|
checkFailed = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if checkPre {
|
if checkPre {
|
||||||
|
if checkFailed {
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
fmt.Println(`✔`, "all prerequisites checks passed")
|
fmt.Println(`✔`, "all prerequisites checks passed")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if !kubernetesCheck(">=1.14.0") {
|
if !kubernetesCheck(">=1.14.0") {
|
||||||
os.Exit(1)
|
checkFailed = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if checkFailed {
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
fmt.Println(`✔`, "all checks passed")
|
fmt.Println(`✔`, "all checks passed")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
@ -97,7 +104,7 @@ func kubectlCheck(version string) bool {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println(`✔`, "kubectl", v.String())
|
fmt.Println(`✔`, "kubectl", v.String(), version)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -134,7 +141,7 @@ func kustomizeCheck(version string) bool {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println(`✔`, "kustomize", v.String())
|
fmt.Println(`✔`, "kustomize", v.String(), version)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -163,6 +170,6 @@ func kubernetesCheck(version string) bool {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println(`✔`, "kubernetes", v.String())
|
fmt.Println(`✔`, "kubernetes", v.String(), version)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue