actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-24 08:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3193 from bkreitch/process-getversion-error

Browse source 
Process getVersion error in bootstrap
This commit is contained in:
Stefan Prodan 2022-11-23 14:19:00 +02:00 committed by GitHub
commit cbebad9586
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/flux/bootstrap_bitbucket_server.go
View file

@ -128,7 +128,9 @@ func bootstrapBServerCmdRun(cmd *cobra.Command, args []string) error {
} }
// Manifest base // Manifest base
if ver, err := getVersion(bootstrapArgs.version); err == nil { if ver, err := getVersion(bootstrapArgs.version); err != nil {
return err
} else {
bootstrapArgs.version = ver bootstrapArgs.version = ver
} }
manifestsBase, err := buildEmbeddedManifestBase() manifestsBase, err := buildEmbeddedManifestBase()

4
cmd/flux/bootstrap_git.go
View file

@ -147,7 +147,9 @@ func bootstrapGitCmdRun(cmd *cobra.Command, args []string) error {
} }
// Manifest base // Manifest base
if ver, err := getVersion(bootstrapArgs.version); err == nil { if ver, err := getVersion(bootstrapArgs.version); err != nil {
return err
} else {
bootstrapArgs.version = ver bootstrapArgs.version = ver
} }
manifestsBase, err := buildEmbeddedManifestBase() manifestsBase, err := buildEmbeddedManifestBase()

4
cmd/flux/bootstrap_github.go
View file

@ -132,7 +132,9 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
} }
// Manifest base // Manifest base
if ver, err := getVersion(bootstrapArgs.version); err == nil { if ver, err := getVersion(bootstrapArgs.version); err != nil {
return err
} else {
bootstrapArgs.version = ver bootstrapArgs.version = ver
} }
manifestsBase, err := buildEmbeddedManifestBase() manifestsBase, err := buildEmbeddedManifestBase()

4
cmd/flux/bootstrap_gitlab.go
View file

@ -136,7 +136,9 @@ func bootstrapGitLabCmdRun(cmd *cobra.Command, args []string) error {
} }
// Manifest base // Manifest base
if ver, err := getVersion(bootstrapArgs.version); err == nil { if ver, err := getVersion(bootstrapArgs.version); err != nil {
return err
} else {
bootstrapArgs.version = ver bootstrapArgs.version = ver
} }
manifestsBase, err := buildEmbeddedManifestBase() manifestsBase, err := buildEmbeddedManifestBase()