Skip to content

Commit 1c7f7a7

Browse files
authored
Merge pull request #922 from lsst-it/IT-6152_rke2_rancher_tu
(rke2/rancher.tu) migrate configuration
2 parents 382dbff + 53acddb commit 1c7f7a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+5154
-67
lines changed

fleet/lib/blackbox-exporter/fleet.yaml

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

fleet/lib/ccs-grafana/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ targetCustomizations:
2424
valuesFiles:
2525
- overlays/manke/values.yaml
2626
- name: pillan
27-
clusterName: pillan
27+
clusterSelector:
28+
matchExpressions:
29+
- key: management.cattle.io/cluster-display-name
30+
operator: In
31+
values:
32+
- pillan
2833
helm:
2934
valuesFiles:
3035
- overlays/pillan/values.yaml

fleet/lib/ccs-influxdb/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ targetCustomizations:
2020
valuesFiles:
2121
- overlays/manke/values.yaml
2222
- name: pillan
23-
clusterName: pillan
23+
clusterSelector:
24+
matchExpressions:
25+
- key: management.cattle.io/cluster-display-name
26+
operator: In
27+
values:
28+
- pillan
2429
helm:
2530
valuesFiles:
2631
- overlays/pillan/values.yaml

fleet/lib/cnpg-cluster/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ targetCustomizations:
2727
overlays:
2828
- manke
2929
- name: pillan
30-
clusterName: pillan
30+
clusterSelector:
31+
matchExpressions:
32+
- key: management.cattle.io/cluster-display-name
33+
operator: In
34+
values:
35+
- pillan
3136
yaml:
3237
overlays:
3338
- pillan

fleet/lib/external-secrets-conf/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,12 @@ targetCustomizations:
5454
vaults:
5555
oods.${ .ClusterLabels.site }: 1
5656
- name: pillan
57-
clusterName: pillan
57+
clusterSelector:
58+
matchExpressions:
59+
- key: management.cattle.io/cluster-display-name
60+
operator: In
61+
values:
62+
- pillan
5863
helm:
5964
values:
6065
clusterSecretStores:

fleet/lib/fleet-conf/overlays/tu/gitrepo-pillan.yaml

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

fleet/lib/keycloak/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ targetCustomizations:
2727
valuesFiles:
2828
- overlays/luan/values.yaml
2929
- name: pillan
30-
clusterName: pillan
30+
clusterSelector:
31+
matchExpressions:
32+
- key: management.cattle.io/cluster-display-name
33+
operator: In
34+
values:
35+
- pillan
3136
helm:
3237
valuesFiles:
3338
- overlays/pillan/values.yaml

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ diff:
4444
- /spec/automountServiceAccountToken
4545
targetCustomizations:
4646
- name: pillan
47-
clusterName: pillan
47+
clusterSelector:
48+
matchExpressions:
49+
- key: management.cattle.io/cluster-display-name
50+
operator: In
51+
values:
52+
- pillan
4853
helm:
4954
valuesFiles:
5055
- pvc/values.yaml

fleet/lib/metallb-conf/fleet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@ targetCustomizations:
3434
overlays:
3535
- ruka
3636
- name: pillan
37-
clusterName: pillan
37+
clusterSelector:
38+
matchExpressions:
39+
- key: management.cattle.io/cluster-display-name
40+
operator: In
41+
values:
42+
- pillan
3843
yaml:
3944
overlays:
4045
- pillan

fleet/lib/metallb-demo/fleet.yaml

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

0 commit comments

Comments
 (0)