Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/platform/argocd/operator/components/argocd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ spec:
name: azure
issuer: <path:projects/1086456784694/secrets/azure_issuer_url#azure_issuer_url>
clientID: <path:projects/1086456784694/secrets/azure_client_id#azure_client_id>
clientSecret: $oidc.azure_client_secret
clientSecret: <path:projects/1086456784694/secrets/azure_client_secret#azure_client_secret>
# Optional set of OIDC scopes to request. If omitted, defaults to: ["openid", "profile", "email", "groups"]
requestedScopes: ["openid", "profile", "email"]
# Optional set of OIDC claims to request on the ID token.
Expand Down
2 changes: 1 addition & 1 deletion manifests/platform/argocd/overlays/okd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ kind: Kustomization
resources:
- ../../operator/base
- ../../operator/components
- oidc-external-secret.yaml
# - oidc-external-secret.yaml
- quay-external-secret.yaml
- secretstore.yaml
38 changes: 19 additions & 19 deletions manifests/platform/argocd/overlays/okd/oidc-external-secret.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
apiVersion: external-secrets.io/v1
kind: ExternalSecret
metadata:
name: oidc
namespace: argocd
annotations:
argocd.argoproj.io/sync-wave: "3"
spec:
refreshInterval: 1h
secretStoreRef:
name: gsm-secret-store
kind: SecretStore
target:
name: oidc
creationPolicy: Owner
data:
- secretKey: azure_client_secret
remoteRef:
key: azure_client_secret
# apiVersion: external-secrets.io/v1
# kind: ExternalSecret
# metadata:
# name: oidc
# namespace: argocd
# annotations:
# argocd.argoproj.io/sync-wave: "3"
# spec:
# refreshInterval: 1h
# secretStoreRef:
# name: gsm-secret-store
# kind: SecretStore
# target:
# name: oidc
# creationPolicy: Owner
# data:
# - secretKey: azure_client_secret
# remoteRef:
# key: azure_client_secret
6 changes: 3 additions & 3 deletions terraform/okd/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ locals {
"grafana_admin_user",
"grafana_admin_password",
"azure_client_id",
"azure_issuer_url"
"azure_issuer_url",
"azure_client_secret"
]
argocd_eso_secrets = [
"quay-jennweir-pull-secret",
"azure_client_secret"
"quay-jennweir-pull-secret"
]
}

Expand Down
Loading