Merge commit 'fe564d72279f4ab061b961dd528623f0ed272667' as 'cluster-config'

cluster-config/components/oauth/overlays/htpass/htpass-secret-external.yaml

@@ -0,0 +1,15 @@
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: htpass-secret
+  namespace: openshift-config
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: doppler-cluster
+  target:
+    name: htpass-secret
+  data:
+    - secretKey: htpasswd
+      remoteRef:
+        key: HTPASSWD

cluster-config/components/oauth/overlays/htpass/kustomization.yaml

@@ -0,0 +1,19 @@
+resources:
+  - htpass-secret-external.yaml
+
+patches:
+  - patch: |-
+      - op: add
+        path: /spec/identityProviders/1
+        value:
+          htpasswd:
+            fileData:
+              name: htpass-secret
+          mappingMethod: claim
+          name: htpasswd
+          type: HTPasswd
+    target:
+      group: config.openshift.io
+      kind: OAuth
+      name: cluster
+      version: v1