Merge pull request #181 from grycap/devel

Add OpenEO oidc params
grycap · Sep 4, 2024 · f8cf9f2 · f8cf9f2
2 parents dd85052 + f698631
commit f8cf9f2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/artifacts/openeo_k8s.yml b/artifacts/openeo_k8s.yml
@@ -3,6 +3,9 @@
   connection: local
   vars:
     stac_url: "{{ openeo_stac_url | default('https://stac.eodc.eu/api/v1') }}"
+    oidc_url: "{{ openeo_oidc_url | default('https://aai.egi.eu/auth/realms/egi') }}"
+    oidc_organisation: "{{ openeo_oidc_organisation | default('egi') }}"
+    oidc_roles: "{{ openeo_oidc_roles | default(['developer']) }}"
   tasks:
     - name: Create OpenEO Helm values file
       copy:
@@ -16,9 +19,9 @@
               apiTLS: false
               apiTitle: "OpenEO ArgoWorkflows"
               apiDescription: "A K8S deployment of the openeo api for argoworkflows."
-              oidcUrl: "https://aai.egi.eu/auth/realms/egi"
-              odicOrganisation: "egi"
-              oidcRoles: ["developer"]
+              oidcUrl: "{{ oidc_url }}"
+              odicOrganisation: "{{ oidc_organisation }}"
+              oidcRoles: {{ oidc_roles }}
               stacCatalogueUrl: "{{ stac_url }}"
               workspaceRoot: "/user_workspaces"
               executorImage: "ghcr.io/eodcgmbh/openeo-argoworkflows:executor-2024.7.1"

diff --git a/templates/openeo.yaml b/templates/openeo.yaml
@@ -21,7 +21,22 @@ topology_template:
     openeo_stac_url:
       type: string
       description: OpenEO STAC Catalogue URL
-      default: "https://stac.eodc.eu/api/v1'"
+      default: "https://stac.eodc.eu/api/v1"
+    openeo_oidc_url:
+      type: string
+      description: OpenEO OIDC URL
+      default: "https://aai.egi.eu/auth/realms/egi"
+    openeo_oidc_organisation:
+      type: string
+      description: OpenEO OIDC Organisation
+      default: "egi"
+    openeo_oidc_roles:
+      type: list
+      entry_schema:
+        type: string
+      description: List of OpenEO OIDC Roles
+      default: [ developer ]
+      required: yes
 
   node_templates:
 
@@ -44,6 +59,9 @@ topology_template:
             inputs:
               openeo_stac_url: { get_input: openeo_stac_url }
               public_ip_address: { get_attribute: [ front, public_address, 0 ] }
+              openeo_oidc_url: { get_input: openeo_oidc_url }
+              openeo_oidc_organisation: { get_input: openeo_oidc_organisation }
+              openeo_oidc_roles: { get_input: openeo_oidc_roles }
       requirements:
         - host: front
         - dependency: lrms_front_end