Skip to content

Commit 89d8870

Browse files
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

0 commit comments

Comments
 (0)