diff --git a/roles/installer/templates/cronjobs/metrics-utility-gather.yaml.j2 b/roles/installer/templates/cronjobs/metrics-utility-gather.yaml.j2 index 25fbd30d5..3867ae942 100644 --- a/roles/installer/templates/cronjobs/metrics-utility-gather.yaml.j2 +++ b/roles/installer/templates/cronjobs/metrics-utility-gather.yaml.j2 @@ -47,9 +47,9 @@ spec: envFrom: - configMapRef: name: {{ _metrics_utility_configmap }} -{% if _metrics_utility_secret is defined %} +{% if metrics_utility_secret is defined %} - secretRef: - name: {{ _metrics_utility_secret }} + name: {{ metrics_utility_secret }} {% endif %} volumeMounts: - name: {{ ansible_operator_meta.name }}-metrics-utility diff --git a/roles/installer/templates/cronjobs/metrics-utility-report.yaml.j2 b/roles/installer/templates/cronjobs/metrics-utility-report.yaml.j2 index c373e10f1..abfd0f33e 100644 --- a/roles/installer/templates/cronjobs/metrics-utility-report.yaml.j2 +++ b/roles/installer/templates/cronjobs/metrics-utility-report.yaml.j2 @@ -44,9 +44,9 @@ spec: envFrom: - configMapRef: name: {{ _metrics_utility_configmap }} -{% if _metrics_utility_secret is defined %} +{% if metrics_utility_secret is defined %} - secretRef: - name: {{ _metrics_utility_secret }} + name: {{ metrics_utility_secret }} {% endif %} volumeMounts: - name: {{ ansible_operator_meta.name }}-metrics-utility diff --git a/roles/installer/vars/main.yml b/roles/installer/vars/main.yml index fc4cde3af..69b6b5c8e 100644 --- a/roles/installer/vars/main.yml +++ b/roles/installer/vars/main.yml @@ -11,7 +11,6 @@ _postgres_data_path: '/var/lib/pgsql/data/userdata' # metrics-utility (github.com/ansible/metrics-utility) _metrics_utility_enabled: "{{ metrics_utility_enabled | default(false) }}" _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_image: "{{ metrics_utility_image | default(_image) }}" _metrics_utility_image_version: "{{ metrics_utility_image_version | default(_image_version) }}"