From 55ae4e0918a256496ff4cc2d5550f931343908df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Hern=C3=A1ndez?= <juan.hernandez@redhat.com>
Date: Fri, 21 Apr 2023 20:32:54 +0200
Subject: [PATCH] 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: https://github.com/rh-ecosystem-edge/ztp-pipeline-relocatable/pull/162

Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com>
---
 .../deploy-ztp-edgeclusters-connected.yaml    | 23 ++++++++++++++++++-
 .../resources/deploy-ztp-edgeclusters.yaml    | 23 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/pipelines/resources/deploy-ztp-edgeclusters-connected.yaml b/pipelines/resources/deploy-ztp-edgeclusters-connected.yaml
index 8552d07b7..5c932bcc1 100644
--- 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
index d747ff36f..91ec81c40 100644
--- 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