NO-ISSUE: Revert remove deploy workers (#841)

In pull request #162 we removed the step to deploy worker nodes from the pipeline because with OpenShift 4.12 it is no longer necessary: the worker nodes can be created from the beginning. But the fixes needed to support that were done only to the CLI, which was since then removed from the pipeline. This patch reverts those changes to the pipeline. Related: #162 Signed-off-by: Juan Hernandez <[email protected]>
rh-ecosystem-edge · Apr 21, 2023 · 55ae4e0 · 55ae4e0
1 parent dab0ea6
commit 55ae4e0
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/pipelines/resources/deploy-ztp-edgeclusters-connected.yaml b/pipelines/resources/deploy-ztp-edgeclusters-connected.yaml
@@ -102,6 +102,27 @@ spec:
       - name: ztp
         workspace: ztp
 
+  # Deploy Workers
+  - name: deploy-workers
+    taskRef:
+      name: edgecluster-deploy-workers
+    params:
+      - name: edgeclusters-config
+        value: $(params.edgeclusters-config)
+      - name: kubeconfig
+        value: $(params.kubeconfig)
+      - name: ztp-container-image
+        value: $(params.ztp-container-image)
+      - name: mock
+        value: $(params.mock)
+      - name: pipeline-name
+        value: $(context.pipelineRun.name)
+    runAfter:
+      - deploy-metallb
+    workspaces:
+      - name: ztp
+        workspace: ztp
+
   # Deploy ZTPFWUI
   - name: deploy-ui
     taskRef:
@@ -138,7 +159,7 @@ spec:
       - name: pipeline-name
         value: $(context.pipelineRun.name)
     runAfter:
-      - deploy-metallb
+      - deploy-workers
     workspaces:
       - name: ztp
         workspace: ztp

diff --git a/pipelines/resources/deploy-ztp-edgeclusters.yaml b/pipelines/resources/deploy-ztp-edgeclusters.yaml
@@ -103,6 +103,27 @@ spec:
       - name: ztp
         workspace: ztp
 
+  # Deploy Workers
+  - name: deploy-workers
+    taskRef:
+      name: edgecluster-deploy-workers
+    params:
+      - name: edgeclusters-config
+        value: $(params.edgeclusters-config)
+      - name: kubeconfig
+        value: $(params.kubeconfig)
+      - name: ztp-container-image
+        value: $(params.ztp-container-image)
+      - name: mock
+        value: $(params.mock)
+      - name: pipeline-name
+        value: $(context.pipelineRun.name)
+    runAfter:
+      - deploy-metallb
+    workspaces:
+      - name: ztp
+        workspace: ztp
+
   # Deploy ZTPFWUI
   - name: deploy-ui
     taskRef:
@@ -139,7 +160,7 @@ spec:
       - name: pipeline-name
         value: $(context.pipelineRun.name)
     runAfter:
-      - deploy-metallb
+      - deploy-workers
     workspaces:
       - name: ztp
         workspace: ztp