Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-05-24 09:50:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: convert 'namesuffix', 'nameprefix' string flags to boolean flags in 'argocd app unset' (#3300)

Browse source
This commit is contained in:
Alexander Matyushentsev 2020-03-27 20:26:22 -07:00 committed by GitHub
parent 27141ff083
commit 521f87fe5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
cmd/argocd/commands/app.go
View file

@ -734,8 +734,8 @@ func NewApplicationUnsetCommand(clientOpts *argocdclient.ClientOptions) *cobra.C
var (
parameters []string
valuesFiles []string
nameSuffix string
namePrefix string
nameSuffix bool
namePrefix bool
kustomizeImages []string
)
var command = &cobra.Command{
@ -763,31 +763,29 @@ func NewApplicationUnsetCommand(clientOpts *argocdclient.ClientOptions) *cobra.C
updated := false
if app.Spec.Source.Kustomize != nil {
c.Flags().Visit(func(f *pflag.Flag) {
switch f.Name {
case "nameprefix":
updated = true
app.Spec.Source.Kustomize.NamePrefix = ""
case "namesuffix":
updated = true
app.Spec.Source.Kustomize.NameSuffix = ""
case "kustomize-image":
for _, kustomizeImage := range kustomizeImages {
for i, item := range app.Spec.Source.Kustomize.Images {
if argoappv1.KustomizeImage(kustomizeImage).Match(item) {
updated = true
//remove i
a := app.Spec.Source.Kustomize.Images
copy(a[i:], a[i+1:]) // Shift a[i+1:] left one index.
a[len(a)-1] = "" // Erase last element (write zero value).
a = a[:len(a)-1] // Truncate slice.
app.Spec.Source.Kustomize.Images = a
}
}
}
if namePrefix {
updated = true
app.Spec.Source.Kustomize.NamePrefix = ""
}
if nameSuffix {
updated = true
app.Spec.Source.Kustomize.NameSuffix = ""
}
for _, kustomizeImage := range kustomizeImages {
for i, item := range app.Spec.Source.Kustomize.Images {
if argoappv1.KustomizeImage(kustomizeImage).Match(item) {
updated = true
//remove i
a := app.Spec.Source.Kustomize.Images
copy(a[i:], a[i+1:]) // Shift a[i+1:] left one index.
a[len(a)-1] = "" // Erase last element (write zero value).
a = a[:len(a)-1] // Truncate slice.
app.Spec.Source.Kustomize.Images = a
}
}
})
}
}
if app.Spec.Source.Ksonnet != nil {
if len(parameters) == 0 && len(valuesFiles) == 0 {
@ -849,8 +847,8 @@ func NewApplicationUnsetCommand(clientOpts *argocdclient.ClientOptions) *cobra.C
}
command.Flags().StringArrayVarP(&parameters, "parameter", "p", []string{}, "unset a parameter override (e.g. -p guestbook=image)")
command.Flags().StringArrayVar(&valuesFiles, "values", []string{}, "unset one or more helm values files")
command.Flags().StringVar(&nameSuffix, "namesuffix", "", "Kustomize namesuffix")
command.Flags().StringVar(&namePrefix, "nameprefix", "", "Kustomize nameprefix")
command.Flags().BoolVar(&nameSuffix, "namesuffix", false, "Kustomize namesuffix")
command.Flags().BoolVar(&namePrefix, "nameprefix", false, "Kustomize nameprefix")
command.Flags().StringArrayVar(&kustomizeImages, "kustomize-image", []string{}, "Kustomize images name (e.g. --kustomize-image node --kustomize-image mysql)")
return command
}