Merge pull request #29 from cloud-native-toolkit/dam-5.0.1

update for 5.0.1
cloud-native-toolkit · Aug 14, 2024 · d5dca6e · d5dca6e
2 parents 24fbd1a + 648dd94
commit d5dca6e
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 57 deletions.
diff --git a/cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline-run.yaml b/cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline-run.yaml
@@ -20,8 +20,10 @@ spec:
       value: "false"
     - name: cpd-use-fs-iam
       value: "False"
+    - name: cpd-sequential-install
+      value: "True"
     - name: cloud-pak-deployer-version
-      value: "v2.8.1"
+      value: "v2.9.4"
     # - name: analyticsengine-state
     #   value: "installed"
     # - name: spss-state

diff --git a/cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline.yaml b/cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline.yaml
@@ -45,7 +45,6 @@ spec:
     - name: ocp-client-version
       type: string
       description: Openshift client version
-      default: "4.14"
     - name: cp4d-version
       type: string
       description: Cloud Pak for Data version
@@ -57,6 +56,17 @@ spec:
       type: string
       description: Should the cloud pak deployer delete components that already exist in the cluster if you don't define them? True to delete components, False to not delete components.
       default: "True"
+    - name: cpd-sequential-install
+      type: string
+      description: |
+        Do you want to install components sequentially?
+        {
+          "options": [
+            {"text": "No","value": "False"},
+            {"text": "Yes","value": "True", "default": "true"}
+          ]
+        }
+      default: "True"
     - name: cpd-use-fs-iam
       type: string
       description: |
@@ -675,49 +685,47 @@ spec:
           ]
         }
       default: "removed"
-    - name: llm-granite-13b-chat-v1-state
+    - name: llm-granite-13b-chat-v2-state
       type: string
       description: |
-        Do you want to install ibm-granite-13b-chat-v1 llm?
+        Do you want to install ibm-granite-13b-chat-v2 llm?
         {
           "options": [
             {"text": "No","value": "removed", "default": "true"},
             {"text": "Yes","value": "installed"}
           ]
         }
       default: "removed"
-    - name: llm-granite-13b-chat-v2-state
+    - name: llm-ibm-granite-13b-instruct-v2-state
       type: string
       description: |
-        Do you want to install ibm-granite-13b-chat-v2 llm?
+        Do you want to install ibm-granite-13b-instruct-v2 llm?
         {
           "options": [
             {"text": "No","value": "removed", "default": "true"},
             {"text": "Yes","value": "installed"}
           ]
         }
       default: "removed"
-    - name: llm-ibm-granite-13b-instruct-v1-state
+    - name: llm-ibm-granite-3b-code-instruct-state
       type: string
       description: |
-        Do you want to install ibm-granite-13b-instruct-v1 llm?
-        {
-          "options": [
-            {"text": "No","value": "removed", "default": "true"},
-            {"text": "Yes","value": "installed"}
-          ]
-        }
+        Do you want to install ibm-granite-3b-code-instruct llm? If yes then make this parameter "installed" and if no then make this parameter "removed"
       default: "removed"
-    - name: llm-ibm-granite-13b-instruct-v2-state
+    - name: llm-ibm-granite-8b-code-instruct-state
       type: string
       description: |
-        Do you want to install ibm-granite-13b-instruct-v2 llm?
-        {
-          "options": [
-            {"text": "No","value": "removed", "default": "true"},
-            {"text": "Yes","value": "installed"}
-          ]
-        }
+        Do you want to install ibm-granite-8b-code-instruct llm? If yes then make this parameter "installed" and if no then make this parameter "removed"
+      default: "removed"
+    - name: llm-ibm-granite-20b-code-instruct-state
+      type: string
+      description: |
+        Do you want to install ibm-granite-20b-code-instruct llm? If yes then make this parameter "installed" and if no then make this parameter "removed"
+      default: "removed"
+    - name: llm-ibm-granite-34b-code-instruct-state
+      type: string
+      description: |
+        Do you want to install ibm-granite-34b-code-instruct llm? If yes then make this parameter "installed" and if no then make this parameter "removed"
       default: "removed"
     - name: llm-meta-llama-llama-2-70b-chat-state
       type: string
@@ -1522,7 +1530,7 @@ spec:
                 - project: cpd
                   cp4d_version: $(params.cp4d-version)
                   use_fs_iam: $(params.cpd-use-fs-iam)
-                  sequential_install: False
+                  sequential_install: $(params.cpd-sequential-install)
                   accept_licenses: True
                   cartridges:
                   - name: cp-foundation
@@ -1753,14 +1761,18 @@ spec:
                       state: $(params.llm-eleutherai-gpt-neox-20b-state)
                     - model_id: ibm-granite-8b-japanese
                       state: $(params.llm-ibm-granite-8b-japanese-state)
-                    - model_id: ibm-granite-13b-chat-v1
-                      state: $(params.llm-granite-13b-chat-v1-state)
                     - model_id: ibm-granite-13b-chat-v2
                       state: $(params.llm-granite-13b-chat-v2-state)
-                    - model_id: ibm-granite-13b-instruct-v1
-                      state: $(params.llm-ibm-granite-13b-instruct-v1-state)
                     - model_id: ibm-granite-13b-instruct-v2
                       state: $(params.llm-ibm-granite-13b-instruct-v2-state)
+                    - model_id: ibm-granite-3b-code-instruct
+                      state: $(params.llm-ibm-granite-3b-code-instruct-state)
+                    - model_id: ibm-granite-8b-code-instruct
+                      state: $(params.llm-ibm-granite-8b-code-instruct-state)
+                    - model_id: ibm-granite-20b-code-instruct
+                      state: $(params.llm-ibm-granite-20b-code-instruct-state)
+                    - model_id: ibm-granite-34b-code-instruct
+                      state: $(params.llm-ibm-granite-34b-code-instruct-state)
                     - model_id: ibm-granite-20b-multilingual
                       state: $(params.llm-ibm-granite-20b-multilingual-state)
                     - model_id: core42-jais-13b-chat
@@ -1972,6 +1984,10 @@ spec:
       params:
         - name: SCRIPT
           value: |
+            oc delete job cloud-pak-deployer-debug -n $(params.namespace) --ignore-not-found
+
+            sleep 20
+
             oc apply -f - <<EOF
             apiVersion: batch/v1
             kind: Job

diff --git a/cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline-run.yaml b/cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline-run.yaml
@@ -19,11 +19,11 @@ spec:
     - name: ibm-entitlement-key
       value: "false"
     - name: cpd-sequential-install
-      value: "False"
+      value: "True"
     - name: cpd-use-fs-iam
       value: "True"
     - name: cloud-pak-deployer-version
-      value: "v2.8.1"
+      value: "v2.9.4"
     # - name: analyticsengine-state
     #   value: "installed"
     # - name: spss-state

diff --git a/cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline.yaml b/cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline.yaml
@@ -45,7 +45,6 @@ spec:
     - name: ocp-client-version
       type: string
       description: Openshift client version
-      default: "4.14"
     - name: cp4d-version
       type: string
       description: Cloud Pak for Data version
@@ -63,11 +62,11 @@ spec:
         Do you want to install components sequentially?
         {
           "options": [
-            {"text": "No","value": "False", "default": "true"},
-            {"text": "Yes","value": "True"}
+            {"text": "No","value": "False"},
+            {"text": "Yes","value": "True", "default": "true"}
           ]
         }
-      default: "False"
+      default: "True"
     - name: cpd-use-fs-iam
       type: string
       description: |
@@ -694,49 +693,47 @@ spec:
           ]
         }
       default: "removed"
-    - name: llm-granite-13b-chat-v1-state
+    - name: llm-granite-13b-chat-v2-state
       type: string
       description: |
-        Do you want to install ibm-granite-13b-chat-v1 llm?
+        Do you want to install ibm-granite-13b-chat-v2 llm?
         {
           "options": [
             {"text": "No","value": "removed", "default": "true"},
             {"text": "Yes","value": "installed"}
           ]
         }
       default: "removed"
-    - name: llm-granite-13b-chat-v2-state
+    - name: llm-ibm-granite-13b-instruct-v2-state
       type: string
       description: |
-        Do you want to install ibm-granite-13b-chat-v2 llm?
+        Do you want to install ibm-granite-13b-instruct-v2 llm?
         {
           "options": [
             {"text": "No","value": "removed", "default": "true"},
             {"text": "Yes","value": "installed"}
           ]
         }
       default: "removed"
-    - name: llm-ibm-granite-13b-instruct-v1-state
+    - name: llm-ibm-granite-3b-code-instruct-state
       type: string
       description: |
-        Do you want to install ibm-granite-13b-instruct-v1 llm?
-        {
-          "options": [
-            {"text": "No","value": "removed", "default": "true"},
-            {"text": "Yes","value": "installed"}
-          ]
-        }
+        Do you want to install ibm-granite-3b-code-instruct llm? If yes then make this parameter "installed" and if no then make this parameter "removed"
       default: "removed"
-    - name: llm-ibm-granite-13b-instruct-v2-state
+    - name: llm-ibm-granite-8b-code-instruct-state
       type: string
       description: |
-        Do you want to install ibm-granite-13b-instruct-v2 llm?
-        {
-          "options": [
-            {"text": "No","value": "removed", "default": "true"},
-            {"text": "Yes","value": "installed"}
-          ]
-        }
+        Do you want to install ibm-granite-8b-code-instruct llm? If yes then make this parameter "installed" and if no then make this parameter "removed"
+      default: "removed"
+    - name: llm-ibm-granite-20b-code-instruct-state
+      type: string
+      description: |
+        Do you want to install ibm-granite-20b-code-instruct llm? If yes then make this parameter "installed" and if no then make this parameter "removed"
+      default: "removed"
+    - name: llm-ibm-granite-34b-code-instruct-state
+      type: string
+      description: |
+        Do you want to install ibm-granite-34b-code-instruct llm? If yes then make this parameter "installed" and if no then make this parameter "removed"
       default: "removed"
     - name: llm-meta-llama-llama-2-70b-chat-state
       type: string
@@ -1780,14 +1777,18 @@ spec:
                       state: $(params.llm-eleutherai-gpt-neox-20b-state)
                     - model_id: ibm-granite-8b-japanese
                       state: $(params.llm-ibm-granite-8b-japanese-state)
-                    - model_id: ibm-granite-13b-chat-v1
-                      state: $(params.llm-granite-13b-chat-v1-state)
                     - model_id: ibm-granite-13b-chat-v2
                       state: $(params.llm-granite-13b-chat-v2-state)
-                    - model_id: ibm-granite-13b-instruct-v1
-                      state: $(params.llm-ibm-granite-13b-instruct-v1-state)
                     - model_id: ibm-granite-13b-instruct-v2
                       state: $(params.llm-ibm-granite-13b-instruct-v2-state)
+                    - model_id: ibm-granite-3b-code-instruct
+                      state: $(params.llm-ibm-granite-3b-code-instruct-state)
+                    - model_id: ibm-granite-8b-code-instruct
+                      state: $(params.llm-ibm-granite-8b-code-instruct-state)
+                    - model_id: ibm-granite-20b-code-instruct
+                      state: $(params.llm-ibm-granite-20b-code-instruct-state)
+                    - model_id: ibm-granite-34b-code-instruct
+                      state: $(params.llm-ibm-granite-34b-code-instruct-state)
                     - model_id: ibm-granite-20b-multilingual
                       state: $(params.llm-ibm-granite-20b-multilingual-state)
                     - model_id: core42-jais-13b-chat
@@ -1999,6 +2000,10 @@ spec:
       params:
         - name: SCRIPT
           value: |
+            oc delete job cloud-pak-deployer-debug -n $(params.namespace) --ignore-not-found
+
+            sleep 20
+
             oc apply -f - <<EOF
             apiVersion: batch/v1
             kind: Job