From b4fb9059ea52a32828f1ac217c5a9f2f20544f12 Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Thu, 28 Mar 2024 17:34:09 +0100 Subject: [PATCH 1/2] Use GitOps operator with version 1.11.2 Signed-off-by: Jakub Stejskal --- install/roles/automation-hub/defaults/main.yml | 7 ++++++- .../roles/automation-hub/templates/argo/install/sub.yaml | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/install/roles/automation-hub/defaults/main.yml b/install/roles/automation-hub/defaults/main.yml index eac24a20..e304c12a 100644 --- a/install/roles/automation-hub/defaults/main.yml +++ b/install/roles/automation-hub/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for tealc +# defaults file infra_monitoring_namespace: tealc-monitoring infra_ci_namespace: tealc-pipelines infra_workflow_namespace: skodjob-ci @@ -12,3 +12,8 @@ route: empty access_token: empty htpasswd_file: /tmp/htpasswd + +# GitOps +gitops_channel_version: 1.11 +gitops_version: 1.11.2 + diff --git a/install/roles/automation-hub/templates/argo/install/sub.yaml b/install/roles/automation-hub/templates/argo/install/sub.yaml index dec10e8e..746e3a14 100644 --- a/install/roles/automation-hub/templates/argo/install/sub.yaml +++ b/install/roles/automation-hub/templates/argo/install/sub.yaml @@ -6,8 +6,9 @@ metadata: labels: project: tealc spec: - channel: latest - installPlanApproval: Automatic + channel: gitops-{{ gitops_channel_version }} + installPlanApproval: Manual name: openshift-gitops-operator source: redhat-operators sourceNamespace: openshift-marketplace + startingCSV: openshift-gitops-operator.v{{ gitops_version }} From 81a61d5dcb2aa3378ee28e95c18b97a5b6dd2c44 Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Thu, 28 Mar 2024 17:35:55 +0100 Subject: [PATCH 2/2] Fix yamllint Signed-off-by: Jakub Stejskal --- install/roles/automation-hub/defaults/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/install/roles/automation-hub/defaults/main.yml b/install/roles/automation-hub/defaults/main.yml index e304c12a..b12b9c43 100644 --- a/install/roles/automation-hub/defaults/main.yml +++ b/install/roles/automation-hub/defaults/main.yml @@ -16,4 +16,3 @@ htpasswd_file: /tmp/htpasswd # GitOps gitops_channel_version: 1.11 gitops_version: 1.11.2 -