Merge pull request #225 from grycap/devel

Devel

artifacts/k8s_galaxy.yml

@@ -174,7 +174,7 @@
             KUBECONFIG: /etc/kubernetes/admin.conf
 
         - name: Deploy Galaxy
-          command: helm install --create-namespace -n {{ NAMESPACE }} galaxy galaxy/galaxy --timeout 10m -f /opt/galaxy_values.yaml --version 5.9.0
+          command: helm install --create-namespace -n {{ NAMESPACE }} galaxy galaxy/galaxy --timeout 10m -f /opt/galaxy_values.yaml --version 5.19.0
           environment:
             KUBECONFIG: /etc/kubernetes/admin.conf
           ignore_errors: true

artifacts/kubeflow.yml

@@ -3,7 +3,7 @@
   hosts: localhost
   connection: local
   vars:
-    VERSION: "{{ kubeflow_manifests_version | default('v1.6.1') }}"
+    VERSION: "{{ kubeflow_manifests_version | default('v1.9.1') }}"
     USER_MAIL: "{{ kubeflow_user | default('[email protected]') }}"
     USER_PASS: "{{ kubeflow_pass | default('$2y$12$4K/VkmDd1q1Orb3xAt82zu8gk7Ad6ReFR4LCP9UeYE90NLiN9Df72') }}"
     DEPLOY_MLFLOW: "{{ kubeflow_mlflow | default(false) }}"
@@ -31,33 +31,39 @@
         regexp: '      hash: '
         line: '      hash: {{ USER_PASS }}'
 
-    - name: Install kustomize 3.2.0
+    - name: Set kustomize version
+      set_fact:
+        kustomize_version: '3.2.0'
+      when: VERSION[1:] is version('1.7.0', '<')
+
+    - name: Set kustomize version
+      set_fact:
+        kustomize_version: '5.0.0'
+      when: VERSION[1:] is version('1.8.0', '<') and VERSION[1:] is version('1.7.0', '>=')
+
+    - name: Set kustomize version
+      set_fact:
+        kustomize_version: '5.0.3'
+      when: VERSION[1:] is version('1.9.0', '<') and VERSION[1:] is version('1.8.0', '>=')
+
+    - name: Set kustomize version
+      set_fact:
+        kustomize_version: '5.2.1'
+      when: VERSION[1:] is version('1.9.0', '>=')
+
+    - name: Install kustomize (old)
       get_url:
-        url: https://github.com/kubernetes-sigs/kustomize/releases/download/v3.2.0/kustomize_3.2.0_linux_amd64
+        url: https://github.com/kubernetes-sigs/kustomize/releases/download/v{{ kustomize_version }}/kustomize_{{ kustomize_version }}_linux_amd64
         dest: /opt/kustomize
         mode: '0777'
-      when: VERSION == "v1.6.1"
+      when: kustomize_version is version('3.2.0', '<=')
 
-    - name: Install kustomize 5.0.0
+    - name: Install kustomize (new)
       unarchive:
-        src: https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.0.0/kustomize_v5.0.0_linux_amd64.tar.gz
+        src: https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv{{ kustomize_version }}/kustomize_v{{ kustomize_version }}_linux_amd64.tar.gz
         dest: /opt/
         remote_src: true
-      when: VERSION == "v1.7.0"
-
-    - name: Install kustomize 5.0.3
-      unarchive:
-        src: https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.0.3/kustomize_v5.0.3_linux_amd64.tar.gz
-        dest: /opt/
-        remote_src: true
-      when: VERSION == "v1.8.0"
-
-    - name: Install kustomize 5.2.1
-      unarchive:
-        src: https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.2.1/kustomize_v5.2.1_linux_amd64.tar.gz
-        dest: /opt/
-        remote_src: true
-      when: VERSION == "v1.9.1"
+      when: kustomize_version is version('3.2.0', '>')
 
     - name: Build kubeflow yaml
       shell: /opt/kustomize build example | awk '!/well-defined/' > kubeflow.yaml
@@ -304,6 +310,13 @@
         replace: '      "externalLinks": [{"type": "item", "link": "/mlflow/", "text": "MlFlow", "icon": "icons:cached"}],'
       when: DEPLOY_MLFLOW
 
+    - name: Add MLFlow menu entry
+      replace:
+        path: /tmp/kubeflow/kubeflow.yaml
+        regexp: '        "externalLinks": \[\],'
+        replace: '        "externalLinks": [{"type": "item", "link": "/mlflow/", "text": "MlFlow", "icon": "icons:cached"}],'
+      when: DEPLOY_MLFLOW
+
     - name: Deploy kubeflow
       command: kubectl apply -f kubeflow.yaml
       args: