Merge pull request #865 from lsst-it/IT-6034/ayekan-rke2

(ayekan) rke1 -> rke2 conversion

Author: jhoblitt

ayekan/external-secrets/README.md

@@ -6,7 +6,7 @@ config:
     alertmanagers:
       - static_configs:
           - targets:
-              - alertmanager.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
+              - alertmanager.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
 
 ingress:
   enabled: false

ayekan/external-secrets/external-secrets.sh

@@ -91,14 +91,14 @@ ingress:
     cert-manager.io/cluster-issuer: letsencrypt
     nginx.ingress.kubernetes.io/backend-protocol: HTTP
   hosts:
-    - host: blackbox-exporter.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
+    - host: blackbox-exporter.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
       paths:
         - path: /
           pathType: Prefix
   tls:
     - secretName: tls-blackbox-exporter-ingress
       hosts:
-        - blackbox-exporter.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
+        - blackbox-exporter.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
 
 config:
   modules:

ayekan/external-secrets/fetch-credentials.sh

@@ -13,7 +13,7 @@ helm:
     clusterSecretStores:
       onepassword:
         vaults:
-          ${ .ClusterName }.${ .ClusterLabels.site }: 1
+          ${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }: 1
           k8s-${ .ClusterLabels.site }: 2
           k8s-common: 3
 dependsOn:
@@ -35,7 +35,7 @@ targetCustomizations:
           onepassword:
             vaults:
               # helm merges the maps, so we need to remove the default 1 vault
-              ${ .ClusterName }.${ .ClusterLabels.site }: ~
+              ${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }: ~
               # it probaly would have been easier to name the vaults local.<site>...
               rancher.${ .ClusterLabels.site }: 1
   - name: oods-cluster

ayekan/rke/.gitignore

@@ -14,4 +14,4 @@ spec:
     - name: ayekan
       clusterName: ayekan
   correctDrift:
-    enabled: false  # XXX do not enable because of rook
+    enabled: true