Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-04-21 17:07:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

feat: Allow Kustomize common labels to not apply to selectors (#17329)

Browse source 
* modify crds

Signed-off-by: Collin <cwalker@ancestry.com>
Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* cmd opts and test

Signed-off-by: Collin <cwalker@ancestry.com>
Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* kustomize build and test

Signed-off-by: Collin <cwalker@ancestry.com>
Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* fix option order and add ancestry to users

Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* fix users format

Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* generated files

Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* set flag value

Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* modify crds

Signed-off-by: Collin <cwalker@ancestry.com>
Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* chore(deps): bump library/registry in /test/container (#17317)

Bumps library/registry from `b209a41` to `f4e1b87`.

---
updated-dependencies:
- dependency-name: library/registry
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Collin <cwalker@ancestry.com>
Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* generated files

Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* add docs

Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* fix doc

Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* remove debug prints

Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

* fix autogen docs

Signed-off-by: lets-call-n-walk <cw404@hotmail.com>

---------

Signed-off-by: Collin <cwalker@ancestry.com>
Signed-off-by: lets-call-n-walk <cw404@hotmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Collin Walker <10523817+lets-call-n-walk@users.noreply.github.com>
Co-authored-by: Collin <cwalker@ancestry.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
Collin Walker 2024-03-04 18:13:34 -05:00 committed by GitHub
parent 7eda6e01f4
commit 839526e976
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 1463 additions and 686 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
USERS.md
View file

@ -20,6 +20,7 @@ Currently, the following organizations are **officially** using Argo CD:
1. [Allianz Direct](https://www.allianzdirect.de/)
1. [Amadeus IT Group](https://amadeus.com/)
1. [Ambassador Labs](https://www.getambassador.io/)
1. [Ancestry](https://www.ancestry.com/)
1. [ANSTO - Australian Synchrotron](https://www.synchrotron.org.au/)
1. [Ant Group](https://www.antgroup.com/)
1. [AppDirect](https://www.appdirect.com)

4
assets/swagger.json
View file

@ -6424,6 +6424,10 @@
"type": "string"
}
},
"labelWithoutSelector": {
"type": "boolean",
"title": "LabelWithoutSelector specifies whether to apply common labels to resource selectors or not"
},
"namePrefix": {
"type": "string",
"title": "NamePrefix is a prefix appended to resources for Kustomize apps"

8
cmd/util/app.go
View file

@ -68,6 +68,7 @@ type AppOptions struct {
kustomizeVersion string
kustomizeCommonLabels []string
kustomizeCommonAnnotations []string
kustomizeLabelWithoutSelector bool
kustomizeForceCommonLabels bool
kustomizeForceCommonAnnotations bool
kustomizeNamespace string
@ -125,6 +126,7 @@ func AddAppFlags(command *cobra.Command, opts *AppOptions) {
command.Flags().BoolVar(&opts.Validate, "validate", true, "Validation of repo and cluster")
command.Flags().StringArrayVar(&opts.kustomizeCommonLabels, "kustomize-common-label", []string{}, "Set common labels in Kustomize")
command.Flags().StringArrayVar(&opts.kustomizeCommonAnnotations, "kustomize-common-annotation", []string{}, "Set common labels in Kustomize")
command.Flags().BoolVar(&opts.kustomizeLabelWithoutSelector, "kustomize-label-without-selector", false, "Do not apply common label to selectors or templates")
command.Flags().BoolVar(&opts.kustomizeForceCommonLabels, "kustomize-force-common-label", false, "Force common labels in Kustomize")
command.Flags().BoolVar(&opts.kustomizeForceCommonAnnotations, "kustomize-force-common-annotation", false, "Force common annotations in Kustomize")
command.Flags().StringVar(&opts.kustomizeNamespace, "kustomize-namespace", "", "Kustomize namespace")
@ -250,6 +252,7 @@ type kustomizeOpts struct {
version string
commonLabels map[string]string
commonAnnotations map[string]string
labelWithoutSelector bool
forceCommonLabels bool
forceCommonAnnotations bool
namespace string
@ -277,6 +280,9 @@ func setKustomizeOpt(src *argoappv1.ApplicationSource, opts kustomizeOpts) {
if opts.commonAnnotations != nil {
src.Kustomize.CommonAnnotations = opts.commonAnnotations
}
if opts.labelWithoutSelector {
src.Kustomize.LabelWithoutSelector = opts.labelWithoutSelector
}
if opts.forceCommonLabels {
src.Kustomize.ForceCommonLabels = opts.forceCommonLabels
}
@ -651,6 +657,8 @@ func ConstructSource(source *argoappv1.ApplicationSource, appOpts AppOptions, fl
parsedAnnotations, err := label.Parse(appOpts.kustomizeCommonAnnotations)
errors.CheckError(err)
setKustomizeOpt(source, kustomizeOpts{commonAnnotations: parsedAnnotations})
case "kustomize-label-without-selector":
setKustomizeOpt(source, kustomizeOpts{labelWithoutSelector: appOpts.kustomizeLabelWithoutSelector})
case "kustomize-force-common-label":
setKustomizeOpt(source, kustomizeOpts{forceCommonLabels: appOpts.kustomizeForceCommonLabels})
case "kustomize-force-common-annotation":

5
cmd/util/app_test.go
View file

@ -123,6 +123,11 @@ func Test_setKustomizeOpt(t *testing.T) {
setKustomizeOpt(&src, kustomizeOpts{commonAnnotations: map[string]string{"foo1": "bar1", "foo2": "bar2"}})
assert.Equal(t, &v1alpha1.ApplicationSourceKustomize{CommonAnnotations: map[string]string{"foo1": "bar1", "foo2": "bar2"}}, src.Kustomize)
})
t.Run("Label Without Selector", func(t *testing.T) {
src := v1alpha1.ApplicationSource{}
setKustomizeOpt(&src, kustomizeOpts{commonLabels: map[string]string{"foo1": "bar1", "foo2": "bar2"}, labelWithoutSelector: true})
assert.Equal(t, &v1alpha1.ApplicationSourceKustomize{CommonLabels: map[string]string{"foo1": "bar1", "foo2": "bar2"}, LabelWithoutSelector: true}, src.Kustomize)
})
}
func Test_setJsonnetOpt(t *testing.T) {

1
docs/user-guide/commands/argocd_admin_app_generate-spec.md
View file

@ -67,6 +67,7 @@ argocd admin app generate-spec APPNAME [flags]
--kustomize-force-common-annotation Force common annotations in Kustomize
--kustomize-force-common-label Force common labels in Kustomize
--kustomize-image stringArray Kustomize images (e.g. --kustomize-image node:8.15.0 --kustomize-image mysql=mariadb,alpine@sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d)
--kustomize-label-without-selector Do not apply common label to selectors or templates
--kustomize-namespace string Kustomize namespace
--kustomize-replica stringArray Kustomize replicas (e.g. --kustomize-replica my-development=2 --kustomize-replica my-statefulset=4)
--kustomize-version string Kustomize version

1
docs/user-guide/commands/argocd_app_add-source.md
View file

@ -47,6 +47,7 @@ argocd app add-source APPNAME [flags]
--kustomize-force-common-annotation Force common annotations in Kustomize
--kustomize-force-common-label Force common labels in Kustomize
--kustomize-image stringArray Kustomize images (e.g. --kustomize-image node:8.15.0 --kustomize-image mysql=mariadb,alpine@sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d)
--kustomize-label-without-selector Do not apply common label to selectors or templates
--kustomize-namespace string Kustomize namespace
--kustomize-replica stringArray Kustomize replicas (e.g. --kustomize-replica my-development=2 --kustomize-replica my-statefulset=4)
--kustomize-version string Kustomize version

1
docs/user-guide/commands/argocd_app_create.md
View file

@ -65,6 +65,7 @@ argocd app create APPNAME [flags]
--kustomize-force-common-annotation Force common annotations in Kustomize
--kustomize-force-common-label Force common labels in Kustomize
--kustomize-image stringArray Kustomize images (e.g. --kustomize-image node:8.15.0 --kustomize-image mysql=mariadb,alpine@sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d)
--kustomize-label-without-selector Do not apply common label to selectors or templates
--kustomize-namespace string Kustomize namespace
--kustomize-replica stringArray Kustomize replicas (e.g. --kustomize-replica my-development=2 --kustomize-replica my-statefulset=4)
--kustomize-version string Kustomize version

1
docs/user-guide/commands/argocd_app_set.md
View file

@ -59,6 +59,7 @@ argocd app set APPNAME [flags]
--kustomize-force-common-annotation Force common annotations in Kustomize
--kustomize-force-common-label Force common labels in Kustomize
--kustomize-image stringArray Kustomize images (e.g. --kustomize-image node:8.15.0 --kustomize-image mysql=mariadb,alpine@sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d)
--kustomize-label-without-selector Do not apply common label to selectors or templates
--kustomize-namespace string Kustomize namespace
--kustomize-replica stringArray Kustomize replicas (e.g. --kustomize-replica my-development=2 --kustomize-replica my-statefulset=4)
--kustomize-version string Kustomize version

1
docs/user-guide/kustomize.md
View file

@ -7,6 +7,7 @@ The following configuration options are available for Kustomize:
* `images` is a list of Kustomize image overrides
* `replicas` is a list of Kustomize replica overrides
* `commonLabels` is a string map of additional labels
* `labelWithoutSelector` is a boolean value which defines if the common label(s) should be applied to resource selectors and templates.
* `forceCommonLabels` is a boolean value which defines if it's allowed to override existing labels
* `commonAnnotations` is a string map of additional annotations
* `namespace` is a Kubernetes resources namespace

151
manifests/core-install.yaml
View file

@ -343,6 +343,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to
apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -678,6 +682,10 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -1127,6 +1135,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to apply
common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -1452,6 +1464,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to apply
common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -1943,6 +1959,10 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -2281,6 +2301,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -2764,6 +2789,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors
or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
@ -3120,6 +3150,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies
whether to apply common labels to resource
selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended
to resources for Kustomize apps
@ -3590,6 +3625,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -3939,6 +3979,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
@ -4431,6 +4476,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -4780,6 +4830,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
@ -5209,6 +5264,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -5423,6 +5480,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -5796,6 +5855,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6010,6 +6071,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6387,6 +6450,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6601,6 +6666,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6958,6 +7025,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7172,6 +7241,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7553,6 +7624,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7767,6 +7840,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8140,6 +8215,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8354,6 +8431,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8731,6 +8810,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8945,6 +9026,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9302,6 +9385,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9516,6 +9601,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9883,6 +9970,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -10097,6 +10186,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -10644,6 +10735,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -10858,6 +10951,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -11400,6 +11495,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -11614,6 +11711,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -11985,6 +12084,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12199,6 +12300,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12580,6 +12683,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12794,6 +12899,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13167,6 +13274,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13381,6 +13490,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13758,6 +13869,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13972,6 +14085,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -14329,6 +14444,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -14543,6 +14660,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -14910,6 +15029,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -15124,6 +15245,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -15671,6 +15794,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -15885,6 +16010,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -16427,6 +16554,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -16641,6 +16770,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -17016,6 +17147,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -17230,6 +17363,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -17594,6 +17729,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -17808,6 +17945,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -18355,6 +18494,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -18569,6 +18710,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -19111,6 +19254,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -19325,6 +19470,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -19771,6 +19918,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -19985,6 +20134,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:

55
manifests/crds/application-crd.yaml
View file

@ -342,6 +342,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to
apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -677,6 +681,10 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -1126,6 +1134,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to apply
common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -1451,6 +1463,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to apply
common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -1942,6 +1958,10 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -2280,6 +2300,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -2763,6 +2788,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors
or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
@ -3119,6 +3149,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies
whether to apply common labels to resource
selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended
to resources for Kustomize apps
@ -3589,6 +3624,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -3938,6 +3978,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
@ -4430,6 +4475,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -4779,6 +4829,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps

96
manifests/crds/applicationset-crd.yaml
View file

@ -256,6 +256,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -470,6 +472,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -843,6 +847,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -1057,6 +1063,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -1434,6 +1442,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -1648,6 +1658,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -2005,6 +2017,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -2219,6 +2233,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -2600,6 +2616,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -2814,6 +2832,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -3187,6 +3207,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -3401,6 +3423,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -3778,6 +3802,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -3992,6 +4018,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -4349,6 +4377,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -4563,6 +4593,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -4930,6 +4962,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -5144,6 +5178,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -5691,6 +5727,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -5905,6 +5943,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6447,6 +6487,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6661,6 +6703,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7032,6 +7076,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7246,6 +7292,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7627,6 +7675,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7841,6 +7891,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8214,6 +8266,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8428,6 +8482,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8805,6 +8861,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9019,6 +9077,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9376,6 +9436,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9590,6 +9652,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9957,6 +10021,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -10171,6 +10237,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -10718,6 +10786,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -10932,6 +11002,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -11474,6 +11546,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -11688,6 +11762,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12063,6 +12139,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12277,6 +12355,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12641,6 +12721,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12855,6 +12937,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13402,6 +13486,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13616,6 +13702,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -14158,6 +14246,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -14372,6 +14462,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -14818,6 +14910,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -15032,6 +15126,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:

151
manifests/ha/install.yaml
View file

@ -343,6 +343,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to
apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -678,6 +682,10 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -1127,6 +1135,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to apply
common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -1452,6 +1464,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to apply
common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -1943,6 +1959,10 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -2281,6 +2301,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -2764,6 +2789,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors
or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
@ -3120,6 +3150,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies
whether to apply common labels to resource
selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended
to resources for Kustomize apps
@ -3590,6 +3625,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -3939,6 +3979,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
@ -4431,6 +4476,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -4780,6 +4830,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
@ -5209,6 +5264,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -5423,6 +5480,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -5796,6 +5855,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6010,6 +6071,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6387,6 +6450,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6601,6 +6666,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6958,6 +7025,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7172,6 +7241,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7553,6 +7624,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7767,6 +7840,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8140,6 +8215,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8354,6 +8431,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8731,6 +8810,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8945,6 +9026,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9302,6 +9385,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9516,6 +9601,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9883,6 +9970,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -10097,6 +10186,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -10644,6 +10735,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -10858,6 +10951,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -11400,6 +11495,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -11614,6 +11711,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -11985,6 +12084,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12199,6 +12300,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12580,6 +12683,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12794,6 +12899,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13167,6 +13274,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13381,6 +13490,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13758,6 +13869,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13972,6 +14085,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -14329,6 +14444,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -14543,6 +14660,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -14910,6 +15029,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -15124,6 +15245,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -15671,6 +15794,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -15885,6 +16010,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -16427,6 +16554,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -16641,6 +16770,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -17016,6 +17147,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -17230,6 +17363,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -17594,6 +17729,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -17808,6 +17945,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -18355,6 +18494,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -18569,6 +18710,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -19111,6 +19254,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -19325,6 +19470,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -19771,6 +19918,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -19985,6 +20134,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:

151
manifests/install.yaml
View file

@ -343,6 +343,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to
apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -678,6 +682,10 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -1127,6 +1135,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to apply
common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -1452,6 +1464,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to apply
common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -1943,6 +1959,10 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -2281,6 +2301,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -2764,6 +2789,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors
or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
@ -3120,6 +3150,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies
whether to apply common labels to resource
selectors or not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended
to resources for Kustomize apps
@ -3590,6 +3625,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -3939,6 +3979,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
@ -4431,6 +4476,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to resources
for Kustomize apps
@ -4780,6 +4830,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string
type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix:
description: NamePrefix is a prefix appended to
resources for Kustomize apps
@ -5209,6 +5264,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -5423,6 +5480,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -5796,6 +5855,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6010,6 +6071,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6387,6 +6450,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6601,6 +6666,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -6958,6 +7025,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7172,6 +7241,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7553,6 +7624,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -7767,6 +7840,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8140,6 +8215,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8354,6 +8431,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8731,6 +8810,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -8945,6 +9026,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9302,6 +9385,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9516,6 +9601,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -9883,6 +9970,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -10097,6 +10186,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -10644,6 +10735,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -10858,6 +10951,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -11400,6 +11495,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -11614,6 +11711,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -11985,6 +12084,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12199,6 +12300,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12580,6 +12683,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -12794,6 +12899,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13167,6 +13274,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13381,6 +13490,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13758,6 +13869,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -13972,6 +14085,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -14329,6 +14444,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -14543,6 +14660,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -14910,6 +15029,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -15124,6 +15245,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -15671,6 +15794,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -15885,6 +16010,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -16427,6 +16554,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -16641,6 +16770,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -17016,6 +17147,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -17230,6 +17363,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -17594,6 +17729,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -17808,6 +17945,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -18355,6 +18494,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -18569,6 +18710,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -19111,6 +19254,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -19325,6 +19470,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -19771,6 +19918,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:
@ -19985,6 +20134,8 @@ spec:
items:
type: string
type: array
labelWithoutSelector:
type: boolean
namePrefix:
type: string
nameSuffix:

1404
pkg/apis/application/v1alpha1/generated.pb.go
View file

File diff suppressed because it is too large Load diff

3
pkg/apis/application/v1alpha1/generated.proto
View file

@ -529,6 +529,9 @@ message ApplicationSourceKustomize {
// Components specifies a list of kustomize components to add to the kustomization before building
repeated string components = 13;
// LabelWithoutSelector specifies whether to apply common labels to resource selectors or not
optional bool labelWithoutSelector = 14;
}
// ApplicationSourcePlugin holds options specific to config management plugins

7
pkg/apis/application/v1alpha1/openapi_generated.go
View file

@ -1985,6 +1985,13 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourceKustomize(ref common.
},
},
},
"labelWithoutSelector": {
SchemaProps: spec.SchemaProps{
Description: "LabelWithoutSelector specifies whether to apply common labels to resource selectors or not",
Type: []string{"boolean"},
Format: "",
},
},
},
},
},

2
pkg/apis/application/v1alpha1/types.go
View file

@ -469,6 +469,8 @@ type ApplicationSourceKustomize struct {
Patches KustomizePatches `json:"patches,omitempty" protobuf:"bytes,12,opt,name=patches"`
// Components specifies a list of kustomize components to add to the kustomization before building
Components []string `json:"components,omitempty" protobuf:"bytes,13,rep,name=components"`
//LabelWithoutSelector specifies whether to apply common labels to resource selectors or not
LabelWithoutSelector bool `json:"labelWithoutSelector,omitempty" protobuf:"bytes,14,opt,name=labelWithoutSelector"`
}
type KustomizeReplica struct {

3
util/kustomize/kustomize.go
View file

@ -184,6 +184,9 @@ func (k *kustomize) Build(opts *v1alpha1.ApplicationSourceKustomize, kustomizeOp
if opts.ForceCommonLabels {
args = append(args, "--force")
}
if opts.LabelWithoutSelector {
args = append(args, "--without-selector")
}
commonLabels := map[string]string{}
for name, value := range opts.CommonLabels {
commonLabels[name] = envVars.Envsubst(value)

79
util/kustomize/kustomize_test.go
View file

@ -24,6 +24,7 @@ const kustomization3 = "force_common"
const kustomization4 = "custom_version"
const kustomization5 = "kustomization_yaml_patches"
const kustomization6 = "kustomization_yaml_components"
const kustomization7 = "label_without_selector"
func testDataDir(tb testing.TB, testData string) (string, error) {
res := tb.TempDir()
@ -328,6 +329,84 @@ func TestKustomizeBuildForceCommonAnnotations(t *testing.T) {
}
}
func TestKustomizeLabelWithoutSelector(t *testing.T) {
type testCase struct {
TestData string
KustomizeSource v1alpha1.ApplicationSourceKustomize
ExpectedMetadataLabels map[string]string
ExpectedSelectorLabels map[string]string
ExpectedTemplateLabels map[string]string
ExpectErr bool
Env *v1alpha1.Env
}
testCases := []testCase{
{
TestData: kustomization7,
KustomizeSource: v1alpha1.ApplicationSourceKustomize{
CommonLabels: map[string]string{
"foo": "bar",
},
LabelWithoutSelector: true,
},
ExpectedMetadataLabels: map[string]string{"app": "nginx", "managed-by": "helm", "foo": "bar"},
ExpectedSelectorLabels: map[string]string{"app": "nginx"},
ExpectedTemplateLabels: map[string]string{"app": "nginx"},
Env: &v1alpha1.Env{
&v1alpha1.EnvEntry{
Name: "ARGOCD_APP_NAME",
Value: "argo-cd-tests",
},
},
},
{
TestData: kustomization7,
KustomizeSource: v1alpha1.ApplicationSourceKustomize{
CommonLabels: map[string]string{
"managed-by": "argocd",
},
LabelWithoutSelector: true,
ForceCommonLabels: true,
},
ExpectedMetadataLabels: map[string]string{"app": "nginx", "managed-by": "argocd"},
ExpectedSelectorLabels: map[string]string{"app": "nginx"},
ExpectedTemplateLabels: map[string]string{"app": "nginx"},
Env: &v1alpha1.Env{
&v1alpha1.EnvEntry{
Name: "ARGOCD_APP_NAME",
Value: "argo-cd-tests",
},
},
},
}
for _, tc := range testCases {
appPath, err := testDataDir(t, tc.TestData)
assert.Nil(t, err)
kustomize := NewKustomizeApp(appPath, appPath, git.NopCreds{}, "", "")
objs, _, err := kustomize.Build(&tc.KustomizeSource, nil, tc.Env)
switch tc.ExpectErr {
case true:
assert.Error(t, err)
default:
assert.Nil(t, err)
if assert.Equal(t, len(objs), 1) {
obj := objs[0]
sl, found, err := unstructured.NestedStringMap(obj.Object, "spec", "selector", "matchLabels")
assert.Nil(t, err)
assert.Equal(t, found, true)
tl, found, err := unstructured.NestedStringMap(obj.Object, "spec", "template", "metadata", "labels")
assert.Nil(t, err)
assert.Equal(t, found, true)
assert.Equal(t, tc.ExpectedMetadataLabels, obj.GetLabels())
assert.Equal(t, tc.ExpectedSelectorLabels, sl)
assert.Equal(t, tc.ExpectedTemplateLabels, tl)
}
}
}
}
func TestKustomizeCustomVersion(t *testing.T) {
appPath, err := testDataDir(t, kustomization1)
assert.Nil(t, err)

22
util/kustomize/testdata/label_without_selector/deployment.yaml vendored Normal file
View file

@ -0,0 +1,22 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: nginx-deployment
labels:
app: nginx
managed-by: helm
spec:
replicas: 3
selector:
matchLabels:
app: nginx
template:
metadata:
labels:
app: nginx
spec:
containers:
- name: nginx
image: nginx:1.15.4
ports:
- containerPort: 80

2
util/kustomize/testdata/label_without_selector/kustomization.yaml vendored Normal file
View file

@ -0,0 +1,2 @@
resources:
- ./deployment.yaml