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
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- https://{{ argocd_domain }}/auth/callback
{% if dsc.argocd.secondaryZones is defined and dsc.argocd.secondaryZones %}
{% for zone in dsc.argocd.secondaryZones %}
- https://{{ zone.domain }}/auth/callback
{% endfor %}
{% endif %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- https://{{ argocd_domain }}
{% if dsc.argocd.secondaryZones is defined and dsc.argocd.secondaryZones %}
{% for zone in dsc.argocd.secondaryZones %}
- https://{{ zone.domain }}
{% endfor %}
{% endif %}
7 changes: 2 additions & 5 deletions roles/gitops/post-install/keycloak/vars/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,8 @@ keycloak_clients:
clientAuthenticatorType: client-secret
standardFlowEnabled: true
directAccessGrantsEnabled: true
redirectUris:
- https://{{ argocd_domain }}/auth/callback
- "*"
webOrigins:
- https://{{ argocd_domain }}
redirectUris: "{{ lookup('ansible.builtin.template', 'argocd-redirectUris.yaml.j2') | from_yaml }}"
webOrigins: "{{ lookup('ansible.builtin.template', 'argocd-webOrigins.yaml.j2') | from_yaml }}"
defaultClientScopes:
- basic
- generic
Expand Down
13 changes: 13 additions & 0 deletions roles/socle-config/templates/crd-conf-dso.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,19 @@ spec:
zoneChartVersion:
description: Version of the Helm Chart to use to manage zone objects. See https://github.com/cloud-pi-native/helm-charts/tree/main/charts/dso-argocd-zone
type: string
secondaryZones:
Comment thread
KepoParis marked this conversation as resolved.
description: List of secondary zones each run an Argo CD instance to manage all applications deployed in the secondary zone.
type: array
default: []
items:
type: object
properties:
name:
description: Name of the zone.
type: string
domain:
description: The fully qualified domain name of the Argo CD of the zone.
type: string
required:
- admin
- installEnabled
Expand Down