internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-03-26 21:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing metrics-utility variables and conditionals (#1872)

Browse Source
This commit is contained in:
aknochow
2024-05-22 15:29:26 -04:00
committed by GitHub
parent 5d99553fa6
commit 64fb262830
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/installer/templates/cronjobs/metrics-utility-gather.yaml.j2
View File

@@ -47,9 +47,9 @@ spec:
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ _metrics_utility_configmap }} name: {{ _metrics_utility_configmap }}
{% if _metrics_utility_secret is defined %} {% if metrics_utility_secret is defined %}
- secretRef: - secretRef:
name: {{ _metrics_utility_secret }} name: {{ metrics_utility_secret }}
{% endif %} {% endif %}
volumeMounts: volumeMounts:
- name: {{ ansible_operator_meta.name }}-metrics-utility - name: {{ ansible_operator_meta.name }}-metrics-utility

4
roles/installer/templates/cronjobs/metrics-utility-report.yaml.j2
View File

@@ -44,9 +44,9 @@ spec:
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ _metrics_utility_configmap }} name: {{ _metrics_utility_configmap }}
{% if _metrics_utility_secret is defined %} {% if metrics_utility_secret is defined %}
- secretRef: - secretRef:
name: {{ _metrics_utility_secret }} name: {{ metrics_utility_secret }}
{% endif %} {% endif %}
volumeMounts: volumeMounts:
- name: {{ ansible_operator_meta.name }}-metrics-utility - name: {{ ansible_operator_meta.name }}-metrics-utility

1
roles/installer/vars/main.yml
View File

@@ -11,7 +11,6 @@ _postgres_data_path: '/var/lib/pgsql/data/userdata'
# metrics-utility (github.com/ansible/metrics-utility) # metrics-utility (github.com/ansible/metrics-utility)
_metrics_utility_enabled: "{{ metrics_utility_enabled | default(false) }}" _metrics_utility_enabled: "{{ metrics_utility_enabled | default(false) }}"
_metrics_utility_configmap: "{{ metrics_utility_configmap | default(deployment_type + '-metrics-utility-configmap') }}" _metrics_utility_configmap: "{{ metrics_utility_configmap | default(deployment_type + '-metrics-utility-configmap') }}"
_metrics_utility_secret: "{{ metrics_utility_secret | default('') }}"
_metrics_utility_console_enabled: "{{ metrics_utility_console_enabled | default(false) }}" _metrics_utility_console_enabled: "{{ metrics_utility_console_enabled | default(false) }}"
_metrics_utility_image: "{{ metrics_utility_image | default(_image) }}" _metrics_utility_image: "{{ metrics_utility_image | default(_image) }}"
_metrics_utility_image_version: "{{ metrics_utility_image_version | default(_image_version) }}" _metrics_utility_image_version: "{{ metrics_utility_image_version | default(_image_version) }}"