fixing modify alertmanager yaml (#44)

* fixing modify alertmanager yaml * fixing lint errors * fixing lint errors * fixing lint errors * fixing lint errors * fixing lint errors * fixing lint errors * fixing lint errors * Revert "fixing lint errors" This reverts commit 04e8315. * fixing lint errors * fixing lint errors * fixing lint errors * fixing lint errors * fixing lint errors * fixing lint errors * fixing lint errors * fixing lint errors * removing debug mssg
stakater · Jan 19, 2024 · 34e4ae9 · 34e4ae9
1 parent 96ffcd1
commit 34e4ae9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/roles/grafana_cloud_operator/tasks/grafana_oncall_hub_spoke.yml b/roles/grafana_cloud_operator/tasks/grafana_oncall_hub_spoke.yml
@@ -113,6 +113,7 @@
         receiver_url: "{{ item.grafana_details.link }}"
         namespace: "{{ item.cluster.namespace }}"
         cluster_name: "{{ item.cluster.name }}"
+        provision_mode: "hubAndSpoke"
       loop: "{{ mapped_integrations }}"
 
 - name: Update CR status for SyncSet creation

diff --git a/roles/grafana_cloud_operator/tasks/grafana_oncall_standalone.yml b/roles/grafana_cloud_operator/tasks/grafana_oncall_standalone.yml
@@ -83,6 +83,7 @@
   vars:
     receiver_name: "{{ cluster_name }}"
     receiver_url: "{{ grafana_integration_response.json.link }}"
+    provision_mode: "standalone"
 
 - name: Re-encode modified alertmanager content for cluster
   ansible.builtin.set_fact:

diff --git a/roles/grafana_cloud_operator/tasks/modify_alertmanager_secret.yml b/roles/grafana_cloud_operator/tasks/modify_alertmanager_secret.yml
@@ -41,7 +41,9 @@
 - name: Re-encode modified alertmanager content for cluster
   ansible.builtin.set_fact:
     encoded_alertmanager_secret_content: "{{ modified_alertmanager_secret_content | to_nice_yaml | b64encode }}"
-  when: gco_cr.spec.provisionMode == 'hubAndSpoke'
+  vars:
+    provision_mode_check: "{{ provision_mode }}"
+  when: provision_mode_check == "hubAndSpoke"
 
 - name: Create a new SyncSet for each cluster to patch alertmanager-main secret
   kubernetes.core.k8s:
@@ -65,7 +67,9 @@
             patch: |
               data:
                 alertmanager.yaml: "{{ encoded_alertmanager_secret_content }}"
+  vars:
+    provision_mode_check: "{{ provision_mode }}"
   when:
+    - provision_mode_check == "hubAndSpoke"
     - create_integration_for | length > 0
-    - gco_cr.spec.provisionMode == 'hubAndSpoke'
   register: syncset_creation_results
diff --git a/vocabulary b/vocabulary