Skip to content

Commit 5d0f91e

Browse files
aknochowdsavineau
authored andcommitted
adding conditional to checksum template and removing default for public_base_url to fix undefined variable
1 parent 6ab32a4 commit 5d0f91e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

config/crd/bases/awx.ansible.com_awxs.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -2012,7 +2012,6 @@ spec:
20122012
public_base_url:
20132013
description: Public base URL
20142014
type: string
2015-
default: ''
20162015
type: object
20172016
status:
20182017
properties:

roles/installer/templates/deployments/web.yaml.j2

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@ spec:
2929
kubectl.kubernetes.io/default-container: '{{ ansible_operator_meta.name }}-web'
3030
{% for template in [
3131
"configmaps/config.yaml",
32-
"configmaps/redirect-page.configmap.html",
3332
"secrets/app_credentials.yaml",
3433
"storage/persistent.yaml",
3534
] %}
3635
checksum-{{ template | replace('/', '-') }}: "{{ lookup('template', template + '.j2') | sha1 }}"
3736
{% endfor %}
37+
{% if public_base_url is defined %}
38+
checksum-configmaps-redirect-page.configmap.html: "{{ lookup('template', 'configmaps/redirect-page.configmap.html.j2') | sha1 }}"
39+
{% endif %}
3840
{% for secret in [
3941
"bundle_cacert",
4042
"route_tls",

0 commit comments

Comments
 (0)