s/keycloack/keycloak/

Author: jhoblitt

…re/externalsecret-grafana-keycloack.yaml …secret-grafana-keycloak-credentials.yamlfleet/lib/kube-prometheus-stack-pre/externalsecret-grafana-keycloack.yaml renamed to fleet/lib/kube-prometheus-stack-pre/externalsecret-grafana-keycloak-credentials.yaml fleet/lib/kube-prometheus-stack-pre/externalsecret-grafana-keycloack.yaml renamed to fleet/lib/kube-prometheus-stack-pre/externalsecret-grafana-keycloak-credentials.yaml

@@ -1,24 +1,24 @@
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: grafana-keycloack-credentials
+  name: grafana-keycloak-credentials
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
     name: onepassword
   data:
   - remoteRef:
-      key: grafana-keycloack-credentials
+      key: grafana-keycloak-credentials
       property: username
     secretKey: client_id
   - remoteRef:
-      key: grafana-keycloack-credentials
+      key: grafana-keycloak-credentials
       property: credential
     secretKey: client_secret
   - remoteRef:
-      key: grafana-keycloack-credentials
+      key: grafana-keycloak-credentials
       property: hostname
-    secretKey: keycloack_url
+    secretKey: keycloak_url
   refreshInterval: 1h
   target:
     creationPolicy: Owner

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

@@ -246,13 +246,13 @@ grafana:
       allow_sign_up: true
       api_url: https://keycloak.ls.lsst.org/realms/master/protocol/openid-connect/userinfo
       auth_url: https://keycloak.ls.lsst.org/realms/master/protocol/openid-connect/auth
-      client_id: $__file{/etc/secrets/keycloack-credentials/client_id}
-      client_secret: $__file{/etc/secrets/keycloack-credentials/client_secret}
+      client_id: $__file{/etc/secrets/keycloak-credentials/client_id}
+      client_secret: $__file{/etc/secrets/keycloak-credentials/client_secret}
       email_attribute_path: email
       enabled: true
       group_attribute_path: groups
       login_attribute_path: preferred_username
-      name: keycloack.ls.lsst.org
+      name: keycloak.ls.lsst.org
       role_attribute_path: contains(groups[*], 'grafana-admin') && 'GrafanaAdmin' || contains(groups[*], 'grafana-admin') && 'Admin' || contains(groups[*], 'grafana-editor') && 'Editor' || 'Viewer'
       scopes: openid profile email groups roles offline_access
       token_url: https://keycloak.ls.lsst.org/realms/master/protocol/openid-connect/token
@@ -292,9 +292,9 @@ grafana:
     datasources:
       enabled: true
   extraSecretMounts:
-    - name: keycloack-credentials
-      mountPath: /etc/secrets/keycloack-credentials
-      secretName: grafana-keycloack-credentials
+    - name: keycloak-credentials
+      mountPath: /etc/secrets/keycloak-credentials
+      secretName: grafana-keycloak-credentials
       readOnly: true
   datasources:
     datasource.yaml:

fleet/lib/opensearch-logging/clusters/logging-configmap.yaml

@@ -30,7 +30,7 @@ data:
               config:
                 subject_key: preferred_username
                 roles_key: roles
-                openid_connect_url: "{{ .keycloackURL }}"
+                openid_connect_url: "{{ .keycloakURL }}"
             authentication_backend:
               type: noop
   roles_mappings.yml: |

fleet/lib/opensearch-logging/clusters/logging-externalsecrets.yaml

@@ -22,23 +22,23 @@ spec:
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: os-dashboard-keycloack-credentials
+  name: os-dashboard-keycloak-credentials
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
     name: onepassword
   data:
   - secretKey: CLIENT_ID
     remoteRef:
-      key: os-dashboard-keycloack-credentials
+      key: os-dashboard-keycloak-credentials
       property: username
   - secretKey: CLIENT_SECRET
     remoteRef:
-      key: os-dashboard-keycloack-credentials
+      key: os-dashboard-keycloak-credentials
       property: credential
   - secretKey: url
     remoteRef:
-      key: os-dashboard-keycloack-credentials
+      key: os-dashboard-keycloak-credentials
       property: url
   target:
     creationPolicy: Owner
@@ -72,9 +72,9 @@ spec:
     kind: ClusterSecretStore
     name: onepassword
   data:
-  - secretKey: keycloackURL
+  - secretKey: keycloakURL
     remoteRef:
-      key: os-dashboard-keycloack-credentials
+      key: os-dashboard-keycloak-credentials
       property: url
   target:
     template:

fleet/lib/opensearch-logging/clusters/logging.yaml

@@ -36,27 +36,27 @@ spec:
       opensearch_security.auth.type: '["basicauth", "openid"]'
       opensearch_security.auth.multiple_auth_enabled: "true"
       opensearch_security.openid.base_redirect_url: "https://opensearch.ayekan.dev.lsst.org/dashboard"
-      opensearch_security.openid.client_id: "${KEYCLOACK_CLIENT_ID}"
-      opensearch_security.openid.client_secret: "${KEYCLOACK_CLIENT_SECRET}"
-      opensearch_security.openid.connect_url: "${KEYCLOACK_URL}"
+      opensearch_security.openid.client_id: "${KEYCLOAK_CLIENT_ID}"
+      opensearch_security.openid.client_secret: "${KEYCLOAK_CLIENT_SECRET}"
+      opensearch_security.openid.connect_url: "${KEYCLOAK_URL}"
       opensearch_security.openid.header: "Authorization"
       opensearch_security.openid.scope: "openid profile email offline_access"
       opensearch_security.openid.trust_dynamic_headers: "true"
     env:
-    - name: KEYCLOACK_CLIENT_ID
+    - name: KEYCLOAK_CLIENT_ID
       valueFrom:
         secretKeyRef:
-          name: os-dashboard-keycloack-credentials
+          name: os-dashboard-keycloak-credentials
           key: CLIENT_ID
-    - name: KEYCLOACK_CLIENT_SECRET
+    - name: KEYCLOAK_CLIENT_SECRET
       valueFrom:
         secretKeyRef:
-          name: os-dashboard-keycloack-credentials
+          name: os-dashboard-keycloak-credentials
           key: CLIENT_SECRET
-    - name: KEYCLOACK_URL
+    - name: KEYCLOAK_URL
       valueFrom:
         secretKeyRef:
-          name: os-dashboard-keycloack-credentials
+          name: os-dashboard-keycloak-credentials
           key: url
   security:
     config: