Merge pull request #933 from lsst-it/IT-6177_fleet_cluster_display_name

cbarria · web-flow · commit c283a38fb1ac · 2025-05-15T10:18:45.000-04:00
(bundles/fleet) change clusterName to clusterSelector DEV
diff --git a/fleet/lib/cnpg-cluster/fleet.yaml b/fleet/lib/cnpg-cluster/fleet.yaml
@@ -37,7 +37,12 @@ targetCustomizations:
       overlays:
         - pillan
   - name: ruka
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     yaml:
       overlays:
         - ruka
diff --git a/fleet/lib/fleet-conf/overlays/dev/gitrepo-kueyen.yaml b/fleet/lib/fleet-conf/overlays/dev/gitrepo-kueyen.yaml
@@ -12,6 +12,11 @@ spec:
     - fleet/s/dev/c/kueyen/*
   targets:
     - name: kueyen
-      clusterName: kueyen
+      clusterSelector:
+        matchExpressions:
+          - key: management.cattle.io/cluster-display-name
+            operator: In
+            values:
+              - kueyen
   correctDrift:
     enabled: false  # XXX do not enable because of rook
diff --git a/fleet/lib/fleet-conf/overlays/dev/gitrepo-ruka.yaml b/fleet/lib/fleet-conf/overlays/dev/gitrepo-ruka.yaml
@@ -12,6 +12,11 @@ spec:
     - fleet/s/dev/c/ruka/*
   targets:
     - name: ruka
-      clusterName: ruka
+      clusterSelector:
+        matchExpressions:
+          - key: management.cattle.io/cluster-display-name
+            operator: In
+            values:
+              - ruka
   correctDrift:
     enabled: true
diff --git a/fleet/lib/htcondor/fleet.yaml b/fleet/lib/htcondor/fleet.yaml
@@ -16,7 +16,12 @@ targetCustomizations:
       overlays:
         - manke
   - name: ruka
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     yaml:
       overlays:
         - ruka
diff --git a/fleet/lib/keycloak-pg/fleet.yaml b/fleet/lib/keycloak-pg/fleet.yaml
@@ -20,7 +20,12 @@ targetCustomizations:
         - generic
         - luan
   - name: ruka
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     yaml:
       overlays:
         - generic
diff --git a/fleet/lib/kube-prometheus-stack-pre/fleet.yaml b/fleet/lib/kube-prometheus-stack-pre/fleet.yaml
@@ -14,7 +14,12 @@ dependsOn:
         bundle: external-secrets
 targetCustomizations:
   - name: ayekan
-    clusterName: ayekan
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ayekan
     yaml:
       overlays:
         - ayekan
diff --git a/fleet/lib/kube-prometheus-stack/fleet.yaml b/fleet/lib/kube-prometheus-stack/fleet.yaml
@@ -57,7 +57,12 @@ targetCustomizations:
         - ldap/values.yaml
         - overlays/pillan/values.yaml
   - name: ruka
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     helm:
       valuesFiles:
         - pvc/values.yaml
diff --git a/fleet/lib/metallb-conf/fleet.yaml b/fleet/lib/metallb-conf/fleet.yaml
@@ -14,7 +14,12 @@ dependsOn:
         bundle: metallb
 targetCustomizations:
   - name: kueyen
-    clusterName: kueyen
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - kueyen
     yaml:
       overlays:
         - kueyen
@@ -29,7 +34,12 @@ targetCustomizations:
       overlays:
         - ayekan
   - name: ruka
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     yaml:
       overlays:
         - ruka
diff --git a/fleet/lib/metallb-demo/fleet.yaml b/fleet/lib/metallb-demo/fleet.yaml
@@ -8,7 +8,12 @@ helm:
   force: true
 targetCustomizations:
   - name: ruka
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     helm:
       values:
         pools:
diff --git a/fleet/lib/mimir-pre/fleet.yaml b/fleet/lib/mimir-pre/fleet.yaml
@@ -25,12 +25,22 @@ targetCustomizations:
       overlays:
         - pillan
   - name: ruka
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     yaml:
       overlays:
         - ruka
   - name: ayekan
-    clusterName: ayekan
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ayekan
     yaml:
       overlays:
         - ayekan
diff --git a/fleet/lib/mimir/fleet.yaml b/fleet/lib/mimir/fleet.yaml
@@ -23,12 +23,22 @@ dependsOn:
         bundle: prometheus-operator-crds
 targetCustomizations:
   - name: ayekan
-    clusterName: ayekan
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ayekan
     helm:
       valuesFiles:
         - overlays/ayekan/values.yaml
   - name: rke2
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     helm:
       valuesFiles:
         - overlays/rke2/values.yaml
diff --git a/fleet/lib/multus-conf/fleet.yaml b/fleet/lib/multus-conf/fleet.yaml
@@ -14,12 +14,22 @@ dependsOn:
         bundle: multus
 targetCustomizations:
   - name: kueyen
-    clusterName: kueyen
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - kueyen
     yaml:
       overlays:
         - kueyen
   - name: ruka
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     yaml:
       overlays:
         - ruka
diff --git a/fleet/lib/multus-demo/fleet.yaml b/fleet/lib/multus-demo/fleet.yaml
@@ -9,14 +9,24 @@ helm:
   waitForJobs: true
 targetCustomizations:
   - name: kueyen
-    clusterName: kueyen
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - kueyen
     helm:
       values:
         networks:
           - dds
           - ra-lhn
   - name: ruka
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     helm:
       values:
         networks:
diff --git a/fleet/lib/opensearch-logging/fleet.yaml b/fleet/lib/opensearch-logging/fleet.yaml
@@ -30,7 +30,12 @@ dependsOn:
 targetCustomizations:
   # first match is used
   - name: ayekan
-    clusterName: ayekan
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ayekan
     yaml:
       overlays:
         - ayekan
diff --git a/fleet/lib/rook-ceph-cluster/fleet.yaml b/fleet/lib/rook-ceph-cluster/fleet.yaml
@@ -45,7 +45,12 @@ diff:
         - /spec/upgradeOSDRequiresHealthyPGs
 targetCustomizations:
   - name: kueyen
-    clusterName: kueyen
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - kueyen
     helm:
       valuesFiles:
         - overlays/kueyen/values.yaml
@@ -60,7 +65,12 @@ targetCustomizations:
       valuesFiles:
         - overlays/ayekan/values.yaml
   - name: ruka
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     helm:
       valuesFiles:
         - overlays/ruka/values.yaml
diff --git a/fleet/lib/rook-ceph-conf/fleet.yaml b/fleet/lib/rook-ceph-conf/fleet.yaml
@@ -27,7 +27,12 @@ diff:
         - /spec/healthCheck
 targetCustomizations:
   - name: kueyen
-    clusterName: kueyen
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - kueyen
     helm:
       values:
         subchart:
@@ -46,7 +51,12 @@ targetCustomizations:
           ayekan:
             enabled: true
   - name: ruka
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     helm:
       values:
         subchart:
diff --git a/fleet/lib/rook-ceph-demo/fleet.yaml b/fleet/lib/rook-ceph-demo/fleet.yaml
@@ -13,7 +13,12 @@ dependsOn:
         bundle: rook-ceph
 targetCustomizations:
   - name: kueyen
-    clusterName: kueyen
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - kueyen
     helm:
       values:
         pvc:
@@ -25,7 +30,12 @@ targetCustomizations:
               path: /auxtel
               server: 139.229.134.81
   - name: ruka
-    clusterName: ruka
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - ruka
     helm:
       values:
         pvc:
