11apiVersion : argoproj.io/v1alpha1
22kind : ApplicationSet
33metadata :
4- name : cluster-monitoring
4+ name : cluster-addons
55 namespace : argocd
66spec :
77 syncPolicy :
@@ -20,11 +20,11 @@ spec:
2020 fleet_member : hub-cluster
2121 values :
2222 chartName : application-sets
23- chartRepo : " 12345678910 .dkr.ecr.eu-west-2.amazonaws.com"
23+ chartRepo : " 1234567890 .dkr.ecr.eu-west-2.amazonaws.com"
2424 chartPath : " charts/application-sets"
2525 applicationSetGroup : " monitoring"
2626 groupRelease : ' {{default "" (index .metadata.labels "monitoringRelease")}}'
27- useSelectors : " true "
27+ useSelectors : " false "
2828 useVersionSelectors : " true"
2929 - git :
3030 repoURL : " {{ .metadata.annotations.fleet_repo_url }}"
4747 {{- /* We look for the defined releases */ -}}
4848 {{- $found := false -}}
4949 {{- range $releaseName := $releaseNames -}}
50- {{- if eq $releaseName.type $groupRelease -}}
50+ {{- if eq $releaseName.releaseName $groupRelease -}}
5151 {{- $found = true -}}
5252 {{- end -}}
5353 {{- end -}}
6969 # ##################################################
7070 template :
7171 metadata :
72- name : " cluster-{{.values.applicationSetGroup}}-{{.name}}-{{.type | lower }}"
72+ name : " cluster-{{.values.applicationSetGroup}}-{{.name}}-{{.releaseName | lower }}"
7373 spec :
7474 project : default
7575 destination :
@@ -138,15 +138,16 @@ spec:
138138 useSelectors: '{{.values.useSelectors}}'
139139 useVersionSelectors: '{{.values.useVersionSelectors}}'
140140 applicationSetGroup: {{.values.applicationSetGroup}}
141+ groupRelease: '{{.values.groupRelease}}'
141142 # Defining the way to group addons This application set will handly Addons and ACK values
142143 mergeValues:
143144 monitoring:
144145 use: true
145- releaseType : '{{.type | lower }}'
146+ releaseName : '{{default "" .releaseName | lower }}'
146147 # If we are using version selector we add the version of the releases on the matchlabels
147- {{- if and (eq .values.useVersionSelectors "true") (or (eq .type .values.groupRelease) (gt (int .totalReleases) 1)) }}
148+ {{- if and (eq .values.useVersionSelectors "true") (or (eq .releaseName .values.groupRelease) (gt (int .totalReleases) 1)) }}
148149 releases:
149- {{.values.applicationSetGroup}}Release: '{{.type | lower}}'
150+ {{.values.applicationSetGroup}}Release: '{{.releaseName | lower}}'
150151 {{- end }}
151152 {{- if eq .values.useSelectors "false"}}
152153 globalSelectors:
0 commit comments