Skip to content

Commit 89d8870

Browse files
cbarriacbarria
authored
Merge pull request #944 from lsst-it/IT-6041_clusterselector_ls
(fleet/bundles) change clustername to clusterSelector for LS
2 parents 8522cda + 9ec5055 commit 89d8870

File tree

21 files changed

+228
-50
lines changed

21 files changed

+228
-50
lines changed

‎fleet/lib/ccs-grafana/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ dependsOn:
1919
bundle: ccs-influxdb
2020
targetCustomizations:
2121
- name: manke
22-
clusterName: manke
22+
clusterSelector:
23+
matchExpressions:
24+
- key: management.cattle.io/cluster-display-name
25+
operator: In
26+
values:
27+
- manke
2328
helm:
2429
valuesFiles:
2530
- overlays/manke/values.yaml

‎fleet/lib/ccs-influxdb/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ helm:
1515
- values.yaml
1616
targetCustomizations:
1717
- name: manke
18-
clusterName: manke
18+
clusterSelector:
19+
matchExpressions:
20+
- key: management.cattle.io/cluster-display-name
21+
operator: In
22+
values:
23+
- manke
1924
helm:
2025
valuesFiles:
2126
- overlays/manke/values.yaml

‎fleet/lib/cert-manager-conf/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ dependsOn:
2020
bundle: external-secrets
2121
targetCustomizations:
2222
- name: konkong
23-
clusterName: konkong
23+
clusterSelector:
24+
matchExpressions:
25+
- key: management.cattle.io/cluster-display-name
26+
operator: In
27+
values:
28+
- konkong
2429
kustomize:
2530
dir: overlays/konkong
2631
- name: dev

‎fleet/lib/cnpg-cluster/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ dependsOn:
2222
bundle: prometheus-operator-crds
2323
targetCustomizations:
2424
- name: manke
25-
clusterName: manke
25+
clusterSelector:
26+
matchExpressions:
27+
- key: management.cattle.io/cluster-display-name
28+
operator: In
29+
values:
30+
- manke
2631
yaml:
2732
overlays:
2833
- manke

‎fleet/lib/fleet-conf/overlays/ls/gitrepo-antu.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ spec:
1212
- fleet/s/ls/c/antu/*
1313
targets:
1414
- name: antu
15-
clusterName: antu
15+
clusterSelector:
16+
matchExpressions:
17+
- key: management.cattle.io/cluster-display-name
18+
operator: In
19+
values:
20+
- antu
1621
correctDrift:
1722
enabled: true

‎fleet/lib/fleet-conf/overlays/ls/gitrepo-gaw.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ spec:
1212
- fleet/s/ls/c/gaw/*
1313
targets:
1414
- name: gaw
15-
clusterName: gaw
15+
clusterSelector:
16+
matchExpressions:
17+
- key: management.cattle.io/cluster-display-name
18+
operator: In
19+
values:
20+
- gaw
1621
correctDrift:
1722
enabled: true

‎fleet/lib/fleet-conf/overlays/ls/gitrepo-konkong.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ spec:
1212
- fleet/s/ls/c/konkong/*
1313
targets:
1414
- name: konkong
15-
clusterName: konkong
15+
clusterSelector:
16+
matchExpressions:
17+
- key: management.cattle.io/cluster-display-name
18+
operator: In
19+
values:
20+
- konkong
1621
correctDrift:
1722
enabled: true

‎fleet/lib/fleet-conf/overlays/ls/gitrepo-luan.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ spec:
1212
- fleet/s/ls/c/luan/*
1313
targets:
1414
- name: luan
15-
clusterName: luan
15+
clusterSelector:
16+
matchExpressions:
17+
- key: management.cattle.io/cluster-display-name
18+
operator: In
19+
values:
20+
- luan
1621
correctDrift:
1722
enabled: true

‎fleet/lib/fleet-conf/overlays/ls/gitrepo-manke.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ spec:
1212
- fleet/s/ls/c/manke/*
1313
targets:
1414
- name: manke
15-
clusterName: manke
15+
clusterSelector:
16+
matchExpressions:
17+
- key: management.cattle.io/cluster-display-name
18+
operator: In
19+
values:
20+
- manke
1621
correctDrift:
1722
enabled: true

‎fleet/lib/htcondor/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ dependsOn:
1111
bundle: external-secrets
1212
targetCustomizations:
1313
- name: manke
14-
clusterName: manke
14+
clusterSelector:
15+
matchExpressions:
16+
- key: management.cattle.io/cluster-display-name
17+
operator: In
18+
values:
19+
- manke
1520
yaml:
1621
overlays:
1722
- manke

‎fleet/lib/keycloak-pg/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ dependsOn:
1414
bundle: cnpg-system
1515
targetCustomizations:
1616
- name: luan
17-
clusterName: luan
17+
clusterSelector:
18+
matchExpressions:
19+
- key: management.cattle.io/cluster-display-name
20+
operator: In
21+
values:
22+
- luan
1823
yaml:
1924
overlays:
2025
- generic

‎fleet/lib/keycloak/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ dependsOn:
2222
bundle: keycloak-pg
2323
targetCustomizations:
2424
- name: luan
25-
clusterName: luan
25+
clusterSelector:
26+
matchExpressions:
27+
- key: management.cattle.io/cluster-display-name
28+
operator: In
29+
values:
30+
- luan
2631
helm:
2732
valuesFiles:
2833
- overlays/luan/values.yaml

‎fleet/lib/kube-prometheus-stack/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,12 @@ targetCustomizations:
8383
- ldap/values.yaml
8484
- overlays/ruka/values.yaml
8585
- name: antu
86-
clusterName: antu
86+
clusterSelector:
87+
matchExpressions:
88+
- key: management.cattle.io/cluster-display-name
89+
operator: In
90+
values:
91+
- antu
8792
helm:
8893
valuesFiles:
8994
- pvc/values.yaml

‎fleet/lib/metallb-conf/fleet.yaml

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,42 @@ targetCustomizations:
5454
overlays:
5555
- pillan
5656
- name: gaw
57-
clusterName: gaw
57+
clusterSelector:
58+
matchExpressions:
59+
- key: management.cattle.io/cluster-display-name
60+
operator: In
61+
values:
62+
- gaw
5863
yaml:
5964
overlays:
6065
- gaw
6166
- name: luan
62-
clusterName: luan
67+
clusterSelector:
68+
matchExpressions:
69+
- key: management.cattle.io/cluster-display-name
70+
operator: In
71+
values:
72+
- luan
6373
yaml:
6474
overlays:
6575
- luan
6676
- name: konkong
67-
clusterName: konkong
77+
clusterSelector:
78+
matchExpressions:
79+
- key: management.cattle.io/cluster-display-name
80+
operator: In
81+
values:
82+
- konkong
6883
yaml:
6984
overlays:
7085
- konkong
7186
- name: manke
72-
clusterName: manke
87+
clusterSelector:
88+
matchExpressions:
89+
- key: management.cattle.io/cluster-display-name
90+
operator: In
91+
values:
92+
- manke
7393
yaml:
7494
overlays:
7595
- manke
@@ -89,7 +109,12 @@ targetCustomizations:
89109
overlays:
90110
- yepun
91111
- name: antu
92-
clusterName: antu
112+
clusterSelector:
113+
matchExpressions:
114+
- key: management.cattle.io/cluster-display-name
115+
operator: In
116+
values:
117+
- antu
93118
yaml:
94119
overlays:
95120
- antu

‎fleet/lib/metallb-demo/fleet.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,24 @@ targetCustomizations:
3131
pools:
3232
- general
3333
- name: konkong
34-
clusterName: konkong
34+
clusterSelector:
35+
matchExpressions:
36+
- key: management.cattle.io/cluster-display-name
37+
operator: In
38+
values:
39+
- konkong
3540
helm:
3641
values:
3742
pools:
3843
- default
3944
- lhn
4045
- name: manke
41-
clusterName: manke
46+
clusterSelector:
47+
matchExpressions:
48+
- key: management.cattle.io/cluster-display-name
49+
operator: In
50+
values:
51+
- manke
4252
helm:
4353
values:
4454
pools:

‎fleet/lib/mimir-pre/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ targetCustomizations:
4545
overlays:
4646
- ayekan
4747
- name: antu
48-
clusterName: antu
48+
clusterSelector:
49+
matchExpressions:
50+
- key: management.cattle.io/cluster-display-name
51+
operator: In
52+
values:
53+
- antu
4954
yaml:
5055
overlays:
5156
- antu

‎fleet/lib/multus-conf/fleet.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,22 @@ targetCustomizations:
4444
overlays:
4545
- pillan
4646
- name: konkong
47-
clusterName: konkong
47+
clusterSelector:
48+
matchExpressions:
49+
- key: management.cattle.io/cluster-display-name
50+
operator: In
51+
values:
52+
- konkong
4853
yaml:
4954
overlays:
5055
- konkong
5156
- name: manke
52-
clusterName: manke
57+
clusterSelector:
58+
matchExpressions:
59+
- key: management.cattle.io/cluster-display-name
60+
operator: In
61+
values:
62+
- manke
5363
yaml:
5464
overlays:
5565
- manke

‎fleet/lib/multus-demo/fleet.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,23 @@ targetCustomizations:
4343
networks:
4444
- dds
4545
- name: konkong
46-
clusterName: konkong
46+
clusterSelector:
47+
matchExpressions:
48+
- key: management.cattle.io/cluster-display-name
49+
operator: In
50+
values:
51+
- konkong
4752
helm:
4853
values:
4954
networks:
5055
- lhn
5156
- name: manke
52-
clusterName: manke
57+
clusterSelector:
58+
matchExpressions:
59+
- key: management.cattle.io/cluster-display-name
60+
operator: In
61+
values:
62+
- manke
5363
helm:
5464
values:
5565
networks:

‎fleet/lib/rook-ceph-cluster/fleet.yaml

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,42 @@ targetCustomizations:
8585
valuesFiles:
8686
- overlays/pillan/values.yaml
8787
- name: gaw
88-
clusterName: gaw
88+
clusterSelector:
89+
matchExpressions:
90+
- key: management.cattle.io/cluster-display-name
91+
operator: In
92+
values:
93+
- gaw
8994
helm:
9095
valuesFiles:
9196
- overlays/gaw/values.yaml
9297
- name: luan
93-
clusterName: luan
98+
clusterSelector:
99+
matchExpressions:
100+
- key: management.cattle.io/cluster-display-name
101+
operator: In
102+
values:
103+
- luan
94104
helm:
95105
valuesFiles:
96106
- overlays/luan/values.yaml
97107
- name: konkong
98-
clusterName: konkong
108+
clusterSelector:
109+
matchExpressions:
110+
- key: management.cattle.io/cluster-display-name
111+
operator: In
112+
values:
113+
- konkong
99114
helm:
100115
valuesFiles:
101116
- overlays/konkong/values.yaml
102117
- name: manke
103-
clusterName: manke
118+
clusterSelector:
119+
matchExpressions:
120+
- key: management.cattle.io/cluster-display-name
121+
operator: In
122+
values:
123+
- manke
104124
helm:
105125
valuesFiles:
106126
- overlays/manke/values.yaml
@@ -120,7 +140,12 @@ targetCustomizations:
120140
valuesFiles:
121141
- overlays/yepun/values.yaml
122142
- name: antu
123-
clusterName: antu
143+
clusterSelector:
144+
matchExpressions:
145+
- key: management.cattle.io/cluster-display-name
146+
operator: In
147+
values:
148+
- antu
124149
helm:
125150
valuesFiles:
126151
- overlays/antu/values.yaml

0 commit comments

Comments
 (0)