Skip to content

Commit 4784b32

Browse files
committed
style: become independent of objects names
Signed-off-by: Gerard Vanloo <gerard.vanloo@ibm.com>
1 parent 5e17540 commit 4784b32

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

sre/roles/recorders/tasks/install_alerts_recorders_prometheus.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,18 @@
6868
namespace: "{{ recorders_namespace.name }}"
6969
template: templates/alerts/prometheus/statefulset.j2
7070
state: present
71+
register: recorders_workload
7172
vars:
7273
container_image: "{{ recorders_statefulset.spec.template.spec.containers[0].image }}"
7374
container_environment_variables: "{{ recorders_prometheus_env_vars }}"
7475

7576
- name: Wait for workload to update
7677
kubernetes.core.k8s_info:
77-
api_version: apps/v1
78-
kind: StatefulSet
78+
api_version: "{{ recorders_workload.result.api_version }}"
79+
kind: "{{ recorders_workload.result.kind }}"
7980
kubeconfig: "{{ recorders_cluster.kubeconfig }}"
80-
name: prometheus-alert-recorder
81-
namespace: "{{ recorders_namespace.name }}"
81+
name: "{{ recorders_workload.result.metadata.name }}"
82+
namespace: "{{ recorders_workload.result.metadata.namespace }}"
8283
register: recorders_statefulset_info
8384
until:
8485
- recorders_statefulset_info.resources | length > 0
@@ -87,3 +88,5 @@
8788
- recorders_statefulset_info.resources[0].status.readyReplicas == 1
8889
retries: 8
8990
delay: 15
91+
when:
92+
- recorders_workload is defined

sre/roles/recorders/tasks/install_topology_recorders_kubernetes.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
namespace: "{{ recorders_namespace.name }}"
2929
template: templates/topology/kubernetes/statefulset.j2
3030
state: present
31+
register: recorders_workload
3132
vars:
3233
container_image: "{{ recorders_statefulset.spec.template.spec.containers[0].image }}"
3334
container_environment_variables:
@@ -36,11 +37,11 @@
3637

3738
- name: Wait for workload to update
3839
kubernetes.core.k8s_info:
39-
api_version: apps/v1
40-
kind: StatefulSet
40+
api_version: "{{ recorders_workload.result.api_version }}"
41+
kind: "{{ recorders_workload.result.kind }}"
4142
kubeconfig: "{{ recorders_cluster.kubeconfig }}"
42-
name: kubernetes-topology-recorder
43-
namespace: "{{ recorders_namespace.name }}"
43+
name: "{{ recorders_workload.result.metadata.name }}"
44+
namespace: "{{ recorders_workload.result.metadata.namespace }}"
4445
register: recorders_statefulset_info
4546
until:
4647
- recorders_statefulset_info.resources | length > 0
@@ -49,3 +50,5 @@
4950
- recorders_statefulset_info.resources[0].status.readyReplicas == 1
5051
retries: 8
5152
delay: 15
53+
when:
54+
- recorders_workload is defined

sre/roles/recorders/tasks/install_traces_recorders_jaeger.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
namespace: "{{ recorders_namespace.name }}"
2929
template: templates/traces/jaeger/statefulset.j2
3030
state: present
31+
register: recorders_workload
3132
vars:
3233
container_image: "{{ recorders_statefulset.spec.template.spec.containers[0].image }}"
3334
container_environment_variables:
@@ -36,11 +37,11 @@
3637

3738
- name: Wait for workload to update
3839
kubernetes.core.k8s_info:
39-
api_version: apps/v1
40-
kind: StatefulSet
40+
api_version: "{{ recorders_workload.result.api_version }}"
41+
kind: "{{ recorders_workload.result.kind }}"
4142
kubeconfig: "{{ recorders_cluster.kubeconfig }}"
42-
name: jaeger-traces-recorder
43-
namespace: "{{ recorders_namespace.name }}"
43+
name: "{{ recorders_workload.result.metadata.name }}"
44+
namespace: "{{ recorders_workload.result.metadata.namespace }}"
4445
register: recorders_statefulset_info
4546
until:
4647
- recorders_statefulset_info.resources | length > 0
@@ -49,3 +50,5 @@
4950
- recorders_statefulset_info.resources[0].status.readyReplicas == 1
5051
retries: 8
5152
delay: 15
53+
when:
54+
- recorders_workload is defined

0 commit comments

Comments
 (0)