From ce7b669eab599bd33453a3c74380c2dd45985342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20=C3=81lvarez=20Terribas?= Date: Tue, 3 Dec 2024 09:58:53 +0100 Subject: [PATCH 1/3] removed workflows values file --- .../MASTER_START_SCRIPT.sh | 23 ++++++++++++++----- workflow/workflow.yaml | 14 ----------- 2 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 workflow/workflow.yaml diff --git a/installation-scripts-onm/MASTER_START_SCRIPT.sh b/installation-scripts-onm/MASTER_START_SCRIPT.sh index 3be134e..4e3a7e0 100644 --- a/installation-scripts-onm/MASTER_START_SCRIPT.sh +++ b/installation-scripts-onm/MASTER_START_SCRIPT.sh @@ -103,13 +103,24 @@ fi if [ "$WORKFLOW_ENABLED" == "yes" ]; then echo "Workflow installation."; - wget https://raw.githubusercontent.com/eu-nebulous/sal-scripts/main/workflow/workflow.yaml - - helm install argo-workflows argo-workflows --repo https://argoproj.github.io/argo-helm --namespace argo --create-namespace --values workflow.yaml; + sudo -H -E -u ubuntu bash -c 'helm install argo-workflows argo-workflows \ + --repo https://argoproj.github.io/argo-helm \ + --namespace argo \ + --create-namespace \ + --set crds.install=true \ + --set crds.keep=false \ + --set workflow.serviceAccount.create=true \ + --set workflow.serviceAccount.name="argo" \ + --set workflow.rbac.create=true \ + --set "controller.workflowNamespaces={argo}" \ + --set controller.metricsConfig.enabled=true \ + --set controller.telemetryConfig.enabled=true \ + --set controller.serviceMonitor.enabled=true \ + --set "server.authModes={server}"' - kubectl -n argo create rolebinding argo-workflows-server --role=argo-workflows-workflow --serviceaccount=argo:argo-workflows-server; - kubectl -n argo create rolebinding argo-workflows-workflow-controller --role=argo-workflows-workflow --serviceaccount=argo:argo-workflows-workflow-controller; - kubectl -n argo create rolebinding default --role=argo-workflows-workflow --serviceaccount=argo:default; + sudo -H -E -u ubuntu bash -c 'kubectl -n argo create rolebinding argo-workflows-server --role=argo-workflows-workflow --serviceaccount=argo:argo-workflows-server' + sudo -H -E -u ubuntu bash -c 'kubectl -n argo create rolebinding argo-workflows-workflow-controller --role=argo-workflows-workflow --serviceaccount=argo:argo-workflows-workflow-controller' + sudo -H -E -u ubuntu bash -c 'kubectl -n argo create rolebinding default --role=argo-workflows-workflow --serviceaccount=argo:default' echo "Workflow installation completed."; fi diff --git a/workflow/workflow.yaml b/workflow/workflow.yaml deleted file mode 100644 index b3f7595..0000000 --- a/workflow/workflow.yaml +++ /dev/null @@ -1,14 +0,0 @@ -crds: - install: true - keep: false -workflow: - serviceAccount: - create: true - name: "argo" - rbac: - create: true -controller: - workflowNamespaces: - - argo -server: - authModes: ['server'] \ No newline at end of file From 075833664d671ced29804aec00fa484e050d59bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20=C3=81lvarez=20Terribas?= Date: Tue, 3 Dec 2024 10:00:58 +0100 Subject: [PATCH 2/3] Removed COPY of workflow directory --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ceaab77..5ebd1a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,5 +2,4 @@ FROM busybox:1.36.1-musl COPY installation-scripts-onm /sal-scripts/installation-scripts-onm COPY k8s /sal-scripts/k8s -COPY serverless /sal-scripts/serverless -COPY workflow /sal-scripts/workflow \ No newline at end of file +COPY serverless /sal-scripts/serverless \ No newline at end of file From 31ba97fcd9936e14f25649cd2df2d73e20e91d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20=C3=81lvarez=20Terribas?= Date: Tue, 3 Dec 2024 14:49:29 +0100 Subject: [PATCH 3/3] Added dau alias in workflow installation --- installation-scripts-onm/MASTER_START_SCRIPT.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/installation-scripts-onm/MASTER_START_SCRIPT.sh b/installation-scripts-onm/MASTER_START_SCRIPT.sh index 4e3a7e0..1870837 100644 --- a/installation-scripts-onm/MASTER_START_SCRIPT.sh +++ b/installation-scripts-onm/MASTER_START_SCRIPT.sh @@ -103,7 +103,7 @@ fi if [ "$WORKFLOW_ENABLED" == "yes" ]; then echo "Workflow installation."; - sudo -H -E -u ubuntu bash -c 'helm install argo-workflows argo-workflows \ + $dau bash -c 'helm install argo-workflows argo-workflows \ --repo https://argoproj.github.io/argo-helm \ --namespace argo \ --create-namespace \ @@ -118,9 +118,9 @@ if [ "$WORKFLOW_ENABLED" == "yes" ]; then --set controller.serviceMonitor.enabled=true \ --set "server.authModes={server}"' - sudo -H -E -u ubuntu bash -c 'kubectl -n argo create rolebinding argo-workflows-server --role=argo-workflows-workflow --serviceaccount=argo:argo-workflows-server' - sudo -H -E -u ubuntu bash -c 'kubectl -n argo create rolebinding argo-workflows-workflow-controller --role=argo-workflows-workflow --serviceaccount=argo:argo-workflows-workflow-controller' - sudo -H -E -u ubuntu bash -c 'kubectl -n argo create rolebinding default --role=argo-workflows-workflow --serviceaccount=argo:default' + $dau bash -c 'kubectl -n argo create rolebinding argo-workflows-server --role=argo-workflows-workflow --serviceaccount=argo:argo-workflows-server' + $dau bash -c 'kubectl -n argo create rolebinding argo-workflows-workflow-controller --role=argo-workflows-workflow --serviceaccount=argo:argo-workflows-workflow-controller' + $dau bash -c 'kubectl -n argo create rolebinding default --role=argo-workflows-workflow --serviceaccount=argo:default' echo "Workflow installation completed."; fi