Skip to content

Commit 1d22cd1

Browse files
committed
Allow using default images values for EDPM
With this patch we'll be able to allow using the default values for `registry_url`, `image_prefix` and `image_tag` when the values for their corresponding variables are empty.
1 parent 7cbb8cc commit 1d22cd1

File tree

1 file changed

+22
-7
lines changed

1 file changed

+22
-7
lines changed

scripts/gen-edpm-kustomize.sh

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,23 +103,38 @@ cat <<EOF >>kustomization.yaml
103103
EOF
104104
fi
105105

106+
if [ -n "$EDPM_REGISTRY_URL" ]; then
106107
cat <<EOF >>kustomization.yaml
107-
- op: replace
108-
path: /spec/nodeTemplate/ansible/ansibleVars/timesync_ntp_servers
109-
value:
110-
- {hostname: ${EDPM_NTP_SERVER}}
111-
- op: replace
112-
path: /spec/nodeTemplate/ansible/ansibleVars/neutron_public_interface_name
113-
value: ${EDPM_NETWORK_INTERFACE_NAME}
114108
- op: replace
115109
path: /spec/nodeTemplate/ansible/ansibleVars/registry_url
116110
value: ${EDPM_REGISTRY_URL}
111+
EOF
112+
fi
113+
114+
if [ -n "$EDPM_CONTAINER_PREFIX" ]; then
115+
cat <<EOF >>kustomization.yaml
117116
- op: replace
118117
path: /spec/nodeTemplate/ansible/ansibleVars/image_prefix
119118
value: ${EDPM_CONTAINER_PREFIX}
119+
EOF
120+
fi
121+
122+
if [ -n "$EDPM_CONTAINER_TAG" ]; then
123+
cat <<EOF >>kustomization.yaml
120124
- op: replace
121125
path: /spec/nodeTemplate/ansible/ansibleVars/image_tag
122126
value: ${EDPM_CONTAINER_TAG}
127+
EOF
128+
fi
129+
130+
cat <<EOF >>kustomization.yaml
131+
- op: replace
132+
path: /spec/nodeTemplate/ansible/ansibleVars/timesync_ntp_servers
133+
value:
134+
- {hostname: ${EDPM_NTP_SERVER}}
135+
- op: replace
136+
path: /spec/nodeTemplate/ansible/ansibleVars/neutron_public_interface_name
137+
value: ${EDPM_NETWORK_INTERFACE_NAME}
123138
- op: replace
124139
path: /spec/nodeTemplate/ansible/ansibleVars/edpm_sshd_allowed_ranges
125140
value: ${EDPM_SSHD_ALLOWED_RANGES}

0 commit comments

Comments
 (0)