Skip to content

Commit 8cf8ec9

Browse files
authored
Domain name and prefix should follow DNS-1123 (#761)
* Issue #760 - Domain prefix should follow DNS-1123 * Issue #760 - Domain name should follow DNS-1123
1 parent d8e5c04 commit 8cf8ec9

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

core/src/main/python/wlsdeploy/tool/util/targets/additional_output_helper.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,18 @@ def _build_template_hash(model, model_context, aliases):
9494
"""
9595
template_hash = dict()
9696

97-
# domain name and prefix
97+
# actual domain name
9898

9999
domain_name = dictionary_utils.get_element(model.get_model_topology(), NAME)
100100
if domain_name is None:
101101
domain_name = DEFAULT_WLS_DOMAIN_NAME
102102

103-
template_hash[DOMAIN_NAME] = domain_name
104-
105-
# should change spaces to hyphens?
106-
template_hash[DOMAIN_PREFIX] = domain_name.lower()
107-
108-
# domain UID
103+
# domain UID, name and prefix must follow DNS-1123
109104

110105
domain_uid = k8s_helper.get_domain_uid(domain_name)
111106
template_hash[DOMAIN_UID] = domain_uid
107+
template_hash[DOMAIN_NAME] = domain_uid
108+
template_hash[DOMAIN_PREFIX] = domain_uid
112109

113110
# admin credential
114111

0 commit comments

Comments
 (0)