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
19 changes: 9 additions & 10 deletions manifests/platform/argocd/operator/components/argocd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,12 @@ spec:
memory: 128Mi
route:
enabled: true
# sso:
# dex:
# resources:
# limits:
# cpu: 500m
# memory: 256Mi
# requests:
# cpu: 250m
# memory: 128Mi
# provider: dex
oidcConfig: |
name: azure
issuer: https://login.microsoftonline.com/<path:projects/648542105177/secrets/azure_tenant_id#azure_tenant_id>/v2.0
clientID: <path:projects/648542105177/secrets/azure_client_id#azure_client_id>
clientSecret: <path:projects/648542105177/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.
requestedIDTokenClaims: {"groups": {"essential": true}}
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ resources:
- argocd.yaml
- avp-cmp-plugin.yaml
- google-creds-configmap.yaml
- serviceaccount.yaml
- subscription.yaml
13 changes: 1 addition & 12 deletions terraform/okd/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -161,18 +161,7 @@ resource "azuread_application" "okd_cluster" {
redirect_uris = [
"https://oauth-openshift.apps.okd.jenniferpweir.com/oauth2callback/Azure_AD",
"https://console-openshift-console.apps.okd.jenniferpweir.com/auth/callback",
"https://argocd-server-argocd.apps.okd.jenniferpweir.com/auth/callback"
]
}
}

resource "azuread_service_principal" "okd_cluster" {
client_id = azuread_application.okd_cluster.client_id
}

resource "azuread_application_federated_identity_credential" "okd_cluster_byo_oidc" {
application_id = azuread_application.okd_cluster.id
display_name = "okd-cluster-byo-oidc"
issuer = "https://storage.googleapis.com/jennweir-homelab"
subject = "system:serviceaccount:openshift-config:oauth-reader"
audiences = ["api://AzureADTokenExchange"]
}