Merge pull request #186 from grycap/devel

Add dns name
grycap · Sep 10, 2024 · e8ee348 · e8ee348
2 parents 2f159da + 3a7675b
commit e8ee348
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/artifacts/openeo_k8s.yml b/artifacts/openeo_k8s.yml
@@ -7,6 +7,14 @@
     oidc_organisation: "{{ openeo_oidc_organisation | default('egi') }}"
     oidc_roles: "{{ openeo_oidc_roles | default(['developer']) }}"
   tasks:
+    - name: Set default DNS name (nip.io)
+      set_fact:
+        dns_name: "openeo.{{ public_ip_address }}.nip.io"
+      when: openeo_dns_name is not defined or openeo_dns_name == ""
+    - name: Set custom DNS name
+      set_fact:
+        dns_name: "{{ openeo_dns_name }}"
+      when: openeo_dns_name is defined and openeo_dns_name != ""
     - name: Create OpenEO Helm values file
       copy:
         dest: /tmp/openeo_config.yaml
@@ -35,7 +43,7 @@
             enabled: true
             className: "nginx"
             hosts:
-              - host: openeo.{{ public_ip_address }}.nip.io
+              - host: {{ dns_name }}
                 paths:
                   - path: /
                     pathType: ImplementationSpecific

diff --git a/templates/openeo.yaml b/templates/openeo.yaml
@@ -37,6 +37,10 @@ topology_template:
       description: List of OpenEO OIDC Roles
       default: [ developer ]
       required: yes
+    openeo_dns_name:
+      type: string
+      description: OpenEO DNS name (leave empty to use openeo.<node_ip>.nip.io)
+      default: ""
 
   node_templates:
 
@@ -62,6 +66,7 @@ topology_template:
               openeo_oidc_url: { get_input: openeo_oidc_url }
               openeo_oidc_organisation: { get_input: openeo_oidc_organisation }
               openeo_oidc_roles: { get_input: openeo_oidc_roles }
+              openeo_dns_name: { get_input: openeo_dns_name }
       requirements:
         - host: front
         - dependency: lrms_front_end