Update var names
diff --git a/roles/prometheus_pushgateway/defaults/main.yml b/roles/prometheus_pushgateway/defaults/main.yml
index 6e09ae1..ef340ce 100644
--- a/roles/prometheus_pushgateway/defaults/main.yml
+++ b/roles/prometheus_pushgateway/defaults/main.yml
@@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
-pushgateway_helm_release_name: prometheus-pushgateway
-pushgateway_helm_chart_path: "{{ role_path }}/../../charts/prometheus-pushgateway/"
-pushgateway_helm_chart_ref: /usr/local/src/prometheus-pushgateway
+prometheus_pushgateway_helm_release_name: prometheus-pushgateway
+prometheus_pushgateway_helm_chart_path: "{{ role_path }}/../../charts/prometheus-pushgateway/"
+prometheus_pushgateway_helm_chart_ref: /usr/local/src/prometheus-pushgateway
-pushgateway_helm_release_namespace: monitoring
-pushgateway_helm_values: {}
+prometheus_pushgateway_helm_release_namespace: monitoring
+prometheus_pushgateway_helm_values: {}
diff --git a/roles/prometheus_pushgateway/meta/main.yml b/roles/prometheus_pushgateway/meta/main.yml
index 4d1e042..37a68ad 100644
--- a/roles/prometheus_pushgateway/meta/main.yml
+++ b/roles/prometheus_pushgateway/meta/main.yml
@@ -27,5 +27,5 @@
- role: defaults
- role: upload_helm_chart
vars:
- upload_helm_chart_src: "{{ pushgateway_helm_chart_path }}"
- upload_helm_chart_dest: "{{ pushgateway_helm_chart_ref }}"
+ upload_helm_chart_src: "{{ prometheus_pushgateway_helm_chart_path }}"
+ upload_helm_chart_dest: "{{ prometheus_pushgateway_helm_chart_ref }}"
diff --git a/roles/prometheus_pushgateway/tasks/main.yml b/roles/prometheus_pushgateway/tasks/main.yml
index 790de9d..f617f14 100644
--- a/roles/prometheus_pushgateway/tasks/main.yml
+++ b/roles/prometheus_pushgateway/tasks/main.yml
@@ -20,8 +20,8 @@
state: patched
api_version: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
- name: "{{ pushgateway_helm_release_name }}"
- namespace: "{{ pushgateway_helm_release_namespace }}"
+ name: "{{ prometheus_pushgateway_helm_release_name }}"
+ namespace: "{{ prometheus_pushgateway_helm_release_namespace }}"
definition:
spec:
suspend: true
@@ -31,15 +31,15 @@
state: absent
api_version: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
- name: "{{ pushgateway_helm_release_name }}"
- namespace: "{{ pushgateway_helm_release_namespace }}"
+ name: "{{ prometheus_pushgateway_helm_release_name }}"
+ namespace: "{{ prometheus_pushgateway_helm_release_namespace }}"
- name: Deploy Helm chart
run_once: true
kubernetes.core.helm:
- name: "{{ pushgateway_helm_release_name }}"
- chart_ref: "{{ pushgateway_helm_chart_ref }}"
- release_namespace: "{{ pushgateway_helm_release_namespace }}"
+ name: "{{ prometheus_pushgateway_helm_release_name }}"
+ chart_ref: "{{ prometheus_pushgateway_helm_chart_ref }}"
+ release_namespace: "{{ prometheus_pushgateway_helm_release_namespace }}"
create_namespace: true
kubeconfig: /etc/kubernetes/admin.conf
- values: "{{ _pushgateway_helm_values | combine(pushgateway_helm_values, recursive=True) }}"
+ values: "{{ _prometheus_pushgateway_helm_values | combine(prometheus_pushgateway_helm_values, recursive=True) }}"
diff --git a/roles/prometheus_pushgateway/vars/main.yml b/roles/prometheus_pushgateway/vars/main.yml
index d9c8b8a..fb0d7ec 100644
--- a/roles/prometheus_pushgateway/vars/main.yml
+++ b/roles/prometheus_pushgateway/vars/main.yml
@@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-_pushgateway_helm_values:
+_prometheus_pushgateway_helm_values:
image:
repository: "{{ atmosphere_images['prometheus_pushgateway'] | vexxhost.atmosphere.docker_image('name') }}"
nodeSelector: