Skip to content

Commit 7ca79ef

Browse files
committed
apply toDNS1123Legal to network public addresses under istio.
1 parent 32e370f commit 7ca79ef

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wlst/istio-fix-domain.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ def getEnvVar(var):
88
sys.exit(1)
99
return val
1010

11+
def toDNS1123Legal(address):
12+
return address.lower().replace('_','-')
13+
1114
domain_uid = getEnvVar("DOMAIN_UID")
1215
server_port = int(getEnvVar("MANAGED_SERVER_PORT"))
1316
domain_path = getEnvVar("DOMAIN_HOME")
@@ -36,7 +39,7 @@ def getEnvVar(var):
3639
cd('/Servers/%s/NetworkAccessPoints/istio-probe' % admin_server_name)
3740
set('Protocol', 'http')
3841
set('ListenAddress', '127.0.0.1')
39-
set('PublicAddress', domain_uid + '-' + admin_server_name)
42+
set('PublicAddress', toDNS1123Legal(domain_uid + '-' + admin_server_name))
4043
set('ListenPort', istio_readiness_port)
4144
set('HttpEnabledForThisProtocol', true)
4245
set('TunnelingEnabled', false)
@@ -49,7 +52,7 @@ def getEnvVar(var):
4952
create('istio-t3', 'NetworkAccessPoint')
5053
cd('/Servers/%s/NetworkAccessPoints/istio-t3' % admin_server_name)
5154
set('ListenAddress', '127.0.0.1')
52-
set('PublicAddress', domain_uid + '-' + admin_server_name)
55+
set('PublicAddress', toDNS1123Legal(domain_uid + '-' + admin_server_name))
5356
set('ListenPort', admin_port)
5457
set('TunnelingEnabled', false)
5558
set('OutboundEnabled', false)
@@ -62,7 +65,7 @@ def getEnvVar(var):
6265
cd('/Servers/%s/NetworkAccessPoints/istio-ldap' % admin_server_name)
6366
set('Protocol', "ldap")
6467
set('ListenAddress', '127.0.0.1')
65-
set('PublicAddress', domain_uid + '-' + admin_server_name)
68+
set('PublicAddress', toDNS1123Legal(domain_uid + '-' + admin_server_name))
6669
set('ListenPort', admin_port)
6770
set('HttpEnabledForThisProtocol', true)
6871
set('TunnelingEnabled', false)
@@ -76,7 +79,7 @@ def getEnvVar(var):
7679
create('istio-T3Channel', 'NetworkAccessPoint')
7780
cd('/Servers/%s/NetworkAccessPoints/istio-T3Channel' % admin_server_name)
7881
set('PublicPort', t3_channel_port)
79-
set('PublicAddress', domain_uid + '-' + admin_server_name)
82+
set('PublicAddress', toDNS1123Legal(domain_uid + '-' + admin_server_name))
8083
set('ListenAddress', '127.0.0.1')
8184
set('ListenPort', t3_channel_port)
8285

@@ -88,7 +91,7 @@ def getEnvVar(var):
8891
cd('/ServerTemplates/%s/NetworkAccessPoints/istio-probe' % templateName)
8992
set('Protocol', 'http')
9093
set('ListenAddress', '127.0.0.1')
91-
set('PublicAddress', domain_uid + '-' + managed_server_name_base + '${id}')
94+
set('PublicAddress', toDNS1123Legal(domain_uid + '-' + managed_server_name_base + '${id}'))
9295
set('ListenPort', istio_readiness_port)
9396
set('HttpEnabledForThisProtocol', true)
9497
set('TunnelingEnabled', false)
@@ -101,7 +104,7 @@ def getEnvVar(var):
101104
create('istio-t3', 'NetworkAccessPoint')
102105
cd('/ServerTemplates/%s/NetworkAccessPoints/istio-t3' % templateName)
103106
set('ListenAddress', '127.0.0.1')
104-
set('PublicAddress', domain_uid + '-' + managed_server_name_base + '${id}')
107+
set('PublicAddress', toDNS1123Legal(domain_uid + '-' + managed_server_name_base + '${id}'))
105108
set('ListenPort', server_port)
106109
set('TunnelingEnabled', false)
107110
set('OutboundEnabled', false)
@@ -114,7 +117,7 @@ def getEnvVar(var):
114117
cd('/ServerTemplates/%s/NetworkAccessPoints/istio-cluster' % templateName)
115118
set('Protocol', "CLUSTER-BROADCAST")
116119
set('ListenAddress', '127.0.0.1')
117-
set('PublicAddress', domain_uid + '-' + managed_server_name_base + '${id}')
120+
set('PublicAddress', toDNS1123Legal(domain_uid + '-' + managed_server_name_base + '${id}'))
118121
set('ListenPort', server_port)
119122
set('TunnelingEnabled', false)
120123
set('OutboundEnabled', false)
@@ -127,7 +130,7 @@ def getEnvVar(var):
127130
cd('/ServerTemplates/%s/NetworkAccessPoints/istio-http' % templateName)
128131
set('Protocol', 'http')
129132
set('ListenAddress', '127.0.0.1')
130-
set('PublicAddress', domain_uid + '-' + managed_server_name_base + '${id}')
133+
set('PublicAddress', toDNS1123Legal(domain_uid + '-' + managed_server_name_base + '${id}'))
131134
set('ListenPort', 31111)
132135
set('TunnelingEnabled', false)
133136
set('OutboundEnabled', false)

0 commit comments

Comments
 (0)