Devel

artifacts/ai4eosc.yml

@@ -2,7 +2,7 @@
 - hosts: localhost
   connection: local
   vars:
-    image: "{{ ai4eosc_model_image | default('deephdc/deep-oc-plants-classification-tf') }}"
+    image: "{{ ai4eosc_model_image | default('plants-classification') }}"
     traefik_host: "{{ ansible_default_ipv4.address }}"
     cert_email: "{{ ai4eosc_cert_email | default('[email protected]') }}"
   roles:
@@ -32,7 +32,7 @@
           version: "3.9"
           services:
             app:
-              image: {{ image }}
+              image: ai4oshub/{{ image }}
               labels:
                 - "traefik.enable=true"
                 - "traefik.http.routers.app.service=app"

artifacts/openeo_k8s.yml

@@ -10,6 +10,8 @@
     api_version: "{{ openeo_api_version | default('2024.10.2') }}"
     dask_worker_cores: "{{ openeo_dask_worker_cores | default(1) }}"
     dask_worker_memory: "{{ openeo_dask_worker_memory | default(2) }}"
+    cors_origin: "{{ openeo_cors_origin | default('') }}"
+    cors_enabled: "false"
   tasks:
     - name: Set default DNS name (nip.io)
       set_fact:
@@ -19,6 +21,10 @@
       set_fact:
         dns_name: "{{ openeo_dns_name }}"
       when: openeo_dns_name is defined and openeo_dns_name != ""
+    - name: Enable CORS
+      set_fact:
+        cors_enabled: "true"
+      when: cors_origin != ""
     - name: Create OpenEO Helm values file
       copy:
         dest: /tmp/openeo_config.yaml
@@ -61,6 +67,8 @@
               nginx.ingress.kubernetes.io/proxy-read-timeout: '1800'
               nginx.ingress.kubernetes.io/client-body-buffer-size: "64k"
               nginx.ingress.kubernetes.io/proxy-body-size: "20m"
+              nginx.ingress.kubernetes.io/cors-allow-origin: "{{ cors_origin }}"
+              nginx.ingress.kubernetes.io/enable-cors: "{{ cors_enabled }}"
             hosts:
               - host: {{ dns_name }}
                 paths:

templates/ai4eoscvm.yaml

@@ -4,7 +4,7 @@ imports:
   - grycap_custom_types: https://raw.githubusercontent.com/grycap/tosca/main/custom_types.yaml
 
 metadata:
-  template_version: "1.1.0"
+  template_version: "1.2.0"
   template_name: AI4EOSC DEEPaaS
   display_name: Deploy a DEEPaaS AI model
   icon: images/ai4eosc.png
@@ -21,7 +21,7 @@ topology_template:
     ai4eosc_model_image:
       type: string
       description: Docker image of the model to be deployed
-      default: deephdc/deep-oc-plants-classification-tf
+      default: plants-classification
       required: yes
     ai4eosc_gpu_support:
       type: boolean

templates/kubernetes.yaml

@@ -143,9 +143,9 @@ topology_template:
     kube_version:
       type: string
       description: Version of Kubernetes to install
-      default: "1.29.7"
+      default: "1.30.6"
       constraints:
-        - valid_values: [ "1.29.7", "1.30.3", "1.28.12", "1.27.16", "1.26.15", "1.25.15", "1.24.17" ]
+        - valid_values: [ "1.30.6", "1.31.2", "1.29.10", "1.28.15", "1.27.16", "1.26.15", "1.25.15", "1.24.17" ]
     kube_cri_runtime:
       type: string
       description: CRI Runtime to use with Kubernetes

templates/openeo.yaml

@@ -50,6 +50,10 @@ topology_template:
       default: 4
       constraints:
         - greater_than: 1
+    openeo_cors_origin:
+      type: string
+      description: CORS origin
+      default: ""
 
     # Restrict some K8s input values
 
@@ -87,6 +91,7 @@ topology_template:
               openeo_dns_name: { get_input: openeo_dns_name }
               openeo_dask_worker_cores: { get_input: openeo_dask_worker_cores }
               openeo_dask_worker_memory: { get_input: openeo_dask_worker_memory }
+              openeo_cors_origin: { get_input: openeo_cors_origin }
       requirements:
         - host: front
         - dependency: lrms_front_end