Deploy tekton pipelines and argocd apps after clusters format changes

Signed-off-by: Jakub Stejskal <[email protected]>
skodjob · Oct 27, 2023 · 2687336 · 2687336
1 parent 4b8690d
commit 2687336
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/install/roles/tealc/tasks/main.yml b/install/roles/tealc/tasks/main.yml
@@ -81,21 +81,21 @@
 - import_tasks: infra-setup/install/install_kubed.yaml
   tags: [kubed, infra, never]
 
-## Scenarios - Has to be migrated to the new format!!!
-# - import_tasks: scenario-deployment/infra/argo-deploy-strimzi-infra.yaml
-#  tags: [argo-apps, argo-strimzi-infra, strimzi-infra, never]
-#
-# - import_tasks: scenario-deployment/infra/argo-deploy-amq-streams-infra.yaml
-#  tags: [argo-apps, argo-strimzi-infra, strimzi-infra, never]
-#
-# - import_tasks: scenario-deployment/debezium/argo-deploy-debezium.yaml
-#  tags: [argo-apps, argo-strimzi-infra, strimzi-infra, never]
-#
-# - import_tasks: scenario-deployment/monitoring/argo-deploy-strimzi-monitoring.yaml
-#  tags: [argo-apps, argo-strimzi-monitoring, strimzi-infra, never]
-#
-# - import_tasks: scenario-deployment/tekton/strimzi-infra-tkn-pipelines.yaml
-#  tags: [tekton-pipelines, strimzi-infra, never]
+# Scenarios - Has to be migrated to the new format!!!
+- import_tasks: scenario-deployment/infra/argo-deploy-strimzi-infra.yaml
+  tags: [argo-apps, argo-strimzi-infra, strimzi-infra, never]
+
+- import_tasks: scenario-deployment/infra/argo-deploy-amq-streams-infra.yaml
+  tags: [argo-apps, argo-strimzi-infra, strimzi-infra, never]
+
+- import_tasks: scenario-deployment/debezium/argo-deploy-debezium.yaml
+  tags: [argo-apps, argo-strimzi-infra, strimzi-infra, never]
+
+- import_tasks: scenario-deployment/monitoring/argo-deploy-strimzi-monitoring.yaml
+  tags: [argo-apps, argo-strimzi-monitoring, strimzi-infra, never]
+
+- import_tasks: scenario-deployment/tekton/strimzi-infra-tkn-pipelines.yaml
+  tags: [tekton-pipelines, strimzi-infra, never]
 
 # Teardown
 - import_tasks: infra-setup/delete/delete_argo.yaml

diff --git a/install/roles/tealc/tasks/scenario-deployment/monitoring/argo-deploy-strimzi-monitoring.yaml b/install/roles/tealc/tasks/scenario-deployment/monitoring/argo-deploy-strimzi-monitoring.yaml
@@ -1,5 +1,5 @@
 ---
-- name: "Create Argo applications for Strimzi alerts on {{ workers.main_cluster.name }} cluster"
+- name: "Create Argo applications for Strimzi alerts on {{ cluster }} cluster"
   kubernetes.core.k8s:
     kubeconfig: "{{ kubeconfig_path }}/{{ infra_context_name }}"
     namespace: "{{ infra_argo_namespace }}"
@@ -8,9 +8,9 @@
     template: "{{ item }}"
     verify_ssl: no
   vars:
-    cluster: "{{ workers.main_cluster.name }}"
-    namespace: "{{ workers.main_cluster.monitoring_namespace }}"
-  with_fileglob: "templates/argo/applications/monitoring/alerts/{{ workers.main_cluster.name }}/*.j2"
+    cluster: "worker-01"
+    namespace: "{{ clusters_dict[cluster].monitoring_namespace }}"
+  with_fileglob: "templates/argo/applications/monitoring/alerts/{{ cluster }}/*.j2"
 
 - name: "Create Argo applications for Strimzi alerts on {{ workers.downstream_cluster.name }} cluster"
   kubernetes.core.k8s:
@@ -21,9 +21,9 @@
     apply: true
     template: "{{ item }}"
   vars:
-    cluster: "{{ workers.downstream_cluster.name }}"
-    namespace: "{{ workers.downstream_cluster.monitoring_namespace }}"
-  with_fileglob: "templates/argo/applications/monitoring/alerts/{{ workers.downstream_cluster.name }}/*.j2"
+    cluster: "worker-02"
+    namespace: "{{ clusters_dict[cluster].monitoring_namespace }}"
+  with_fileglob: "templates/argo/applications/monitoring/alerts/{{ cluster }}/*.j2"
 
 - name: Create Argo applications for dashboards on infra cluster
   kubernetes.core.k8s:

diff --git a/install/roles/tealc/tasks/scenario-deployment/tekton/strimzi-infra-tkn-pipelines.yaml b/install/roles/tealc/tasks/scenario-deployment/tekton/strimzi-infra-tkn-pipelines.yaml
@@ -42,7 +42,7 @@
     template: "{{ item }}"
   with_fileglob: 'templates/tekton/pipelines/*.j2'
   vars:
-    name: "{{ workers.main_cluster.name }}"
+    name: "worker-01"
 
 - name: Create Tekton pipelines for test suites
   kubernetes.core.k8s:
@@ -54,7 +54,7 @@
     template: "{{ item }}"
   with_fileglob: 'templates/tekton/pipelines/test-suite/*.j2'
   vars:
-    name: "{{ workers.main_cluster.name }}"
+    name: "worker-01"
 
 - name: Create collector metrics for test suites
   kubernetes.core.k8s:
@@ -78,6 +78,6 @@
     verify_ssl: no
     apply: true
     template: "templates/tekton/pipelines/infra/upgrade-worker-cluster.yaml.j2"
-  loop: "{{ workers | dict2items }}"
+  loop: "{{ clusters_dict.values() }}"
   loop_control:
-    loop_var: worker
+    loop_var: cluster
diff --git a/install/roles/tealc/templates/tekton/pipelines/infra/upgrade-worker-cluster.yaml.j2 b/install/roles/tealc/templates/tekton/pipelines/infra/upgrade-worker-cluster.yaml.j2
@@ -1,5 +1,5 @@
-{% if worker is defined %}
-{% set name = worker.value.name %}
+{% if cluster is defined %}
+{% set name = cluster.name %}
 {% endif %}
 apiVersion: tekton.dev/v1beta1
 kind: Pipeline