From 20c18e0b02712a980c36dea349366ad34fbc7409 Mon Sep 17 00:00:00 2001 From: Elai Shalev Date: Thu, 12 Dec 2024 17:36:58 +0200 Subject: [PATCH 1/2] changing the complex workflow to be advanced + url org changes --- helm-charts/orchestrator/templates/rhdh-operator.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helm-charts/orchestrator/templates/rhdh-operator.yaml b/helm-charts/orchestrator/templates/rhdh-operator.yaml index 61942c5f..f61107a9 100644 --- a/helm-charts/orchestrator/templates/rhdh-operator.yaml +++ b/helm-charts/orchestrator/templates/rhdh-operator.yaml @@ -318,14 +318,14 @@ data: locations: {{- if .Values.rhdhOperator.enableGuestProvider }} - type: url - target: https://github.com/parodos-dev/orchestrator-helm-chart/blob/main/resources/users.yaml + target: https://github.com/rhdhorchestrator/orchestrator-helm-chart/blob/main/resources/users.yaml {{- end }} - type: url - target: https://github.com/parodos-dev/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/entities/workflow-resources.yaml + target: https://github.com/rhdhorchestrator/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/entities/workflow-resources.yaml - type: url - target: https://github.com/parodos-dev/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/scaffolder-templates/basic-workflow/template.yaml + target: https://github.com/rhdhorchestrator/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/scaffolder-templates/basic-workflow/template.yaml - type: url - target: https://github.com/parodos-dev/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/scaffolder-templates/complex-assessment-workflow/template.yaml + target: https://github.com/rhdhorchestrator/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/scaffolder-templates/advanced-workflow/template.yaml - type: url target: https://github.com/redhat-developer/rhdh-plugins/blob/main/workspaces/orchestrator/plugins/orchestrator-common/src/generated/docs/api-doc/orchestrator-api.yaml {{- end }} From a96d758813b6e3fd582ae31a6f44f676eb30c4a7 Mon Sep 17 00:00:00 2001 From: Elai Shalev Date: Thu, 12 Dec 2024 17:40:55 +0200 Subject: [PATCH 2/2] added the gitlab templates --- helm-charts/orchestrator/templates/rhdh-operator.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/helm-charts/orchestrator/templates/rhdh-operator.yaml b/helm-charts/orchestrator/templates/rhdh-operator.yaml index f61107a9..05960009 100644 --- a/helm-charts/orchestrator/templates/rhdh-operator.yaml +++ b/helm-charts/orchestrator/templates/rhdh-operator.yaml @@ -323,9 +323,13 @@ data: - type: url target: https://github.com/rhdhorchestrator/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/entities/workflow-resources.yaml - type: url - target: https://github.com/rhdhorchestrator/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/scaffolder-templates/basic-workflow/template.yaml + target: https://github.com/rhdhorchestrator/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/scaffolder-templates/github-workflows/basic-workflow/template.yaml - type: url - target: https://github.com/rhdhorchestrator/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/scaffolder-templates/advanced-workflow/template.yaml + target: https://github.com/rhdhorchestrator/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/scaffolder-templates/github-workflows/advanced-workflow/template.yaml + - type: url + target: https://github.com/rhdhorchestrator/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/scaffolder-templates/gitlab-workflows/basic-workflow/template.yaml + - type: url + target: https://github.com/rhdhorchestrator/workflow-software-templates/blob/{{ .Values.rhdhOperator.catalogBranch }}/scaffolder-templates/gitlab-workflows/advanced-workflow/template.yaml - type: url target: https://github.com/redhat-developer/rhdh-plugins/blob/main/workspaces/orchestrator/plugins/orchestrator-common/src/generated/docs/api-doc/orchestrator-api.yaml {{- end }}