Skip to content

Commit bf297e7

Browse files
doxiaodoxiao
authored
OWLS-84881 better handle long domainUID (#1979)
* add limits to generated resource names * work in progress * get server and cluster info from introspector's results * new configuration, validation, and unit tests * minor change * fix operator chart validation * fix chart validation * fix hard-coded external service name suffix in integration tests * fix more integration test failures * clean up * minor doc fixwq * Revert "minor doc fixwq" This reverts commit 56b5656. * minor doc fix * minor fix to test * clean up test constants * minor doc edits based on review comments * improve error msg and remove hard-coded suffixes from doc and samples * cleanup * change the legal checks based on Ryan's suggestion * add cluster size padding validation * minor changes to helm validation * only reserve spaces for cluster size wqsmaller than 100 * one more unit test case * minor changes * minor doc change * change a method name
1 parent 820350b commit bf297e7

File tree

54 files changed

+998
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+998
-149
lines changed

‎docs-source/content/faq/namespace-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Note that `domain1` is the name of the domain in the following example output.
161161
Events:
162162
Type Reason Age From Message
163163
---- ------ ---- ---- -------
164-
Normal Scheduled 1m default-scheduler Successfully assigned domain1-introspect-domain-job-bz6rw to slc16ffk
164+
Normal Scheduled 1m default-scheduler Successfully assigned domain1-introspector-bz6rw to slc16ffk
165165
166166
Normal SuccessfulMountVolume 1m kubelet, slc16ffk MountVolume.SetUp succeeded for volume "weblogic-credentials-volume"
167167

‎docs-source/content/faq/oci-lb.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ but initially the external IP is shown as `<pending>`.
7979
$ kubectl -n bob get svc
8080
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
8181
bobs-bookstore-admin-server ClusterIP None <none> 8888/TCP,7001/TCP,30101/TCP 9d
82-
bobs-bookstore-admin-server-external NodePort 10.96.224.13 <none> 7001:32401/TCP 9d
82+
bobs-bookstore-admin-server-ext NodePort 10.96.224.13 <none> 7001:32401/TCP 9d
8383
bobs-bookstore-cluster-cluster-1 ClusterIP 10.96.86.113 <none> 8888/TCP,8001/TCP,31111/TCP 9d
8484
bobs-bookstore-managed-server1 ClusterIP None <none> 8888/TCP,8001/TCP,31111/TCP 9d
8585
bobs-bookstore-managed-server2 ClusterIP None <none> 8888/TCP,8001/TCP,31111/TCP 9d
@@ -93,7 +93,7 @@ external IP address will be displayed:
9393
$ kubectl -n bob get svc
9494
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
9595
bobs-bookstore-admin-server ClusterIP None <none> 8888/TCP,7001/TCP,30101/TCP 9d
96-
bobs-bookstore-admin-server-external NodePort 10.96.224.13 <none> 7001:32401/TCP 9d
96+
bobs-bookstore-admin-server-ext NodePort 10.96.224.13 <none> 7001:32401/TCP 9d
9797
bobs-bookstore-cluster-cluster-1 ClusterIP 10.96.86.113 <none> 8888/TCP,8001/TCP,31111/TCP 9d
9898
bobs-bookstore-managed-server1 ClusterIP None <none> 8888/TCP,8001/TCP,31111/TCP 9d
9999
bobs-bookstore-managed-server2 ClusterIP None <none> 8888/TCP,8001/TCP,31111/TCP 9d

‎docs-source/content/samples/simple/azure-kubernetes-service/_index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -729,13 +729,13 @@ Now that we have created the AKS cluster, installed the operator, and verified t
729729
$ kubectl get svc --watch
730730
```
731731
732-
The final example of servcie output is as following:
732+
The final example of service output is as following:
733733
734734
```bash
735735
$ kubectl get svc --watch
736736
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
737737
domain1-admin-server ClusterIP None <none> 30012/TCP,7001/TCP 2d20h
738-
domain1-admin-server-external NodePort 10.0.182.50 <none> 7001:30701/TCP 2d20h
738+
domain1-admin-server-ext NodePort 10.0.182.50 <none> 7001:30701/TCP 2d20h
739739
domain1-admin-server-external-lb LoadBalancer 10.0.67.79 52.188.176.103 7001:32227/TCP 2d20h
740740
domain1-cluster-1-lb LoadBalancer 10.0.112.43 104.45.176.215 8001:30874/TCP 2d17h
741741
domain1-cluster-cluster-1 ClusterIP 10.0.162.19 <none> 8001/TCP 2d20h
@@ -933,7 +933,7 @@ The logs are stored in the Azure file share. Follow these steps to access the lo
933933
$ kubectl get svc
934934
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
935935
domain1-admin-server ClusterIP None <none> 30012/TCP,7001/TCP 7m3s
936-
domain1-admin-server-external NodePort 10.0.78.211 <none> 7001:30701/TCP 7m3s
936+
domain1-admin-server-ext NodePort 10.0.78.211 <none> 7001:30701/TCP 7m3s
937937
domain1-admin-server-external-lb LoadBalancer 10.0.6.144 40.71.233.81 7001:32758/TCP 7m32s
938938
domain1-cluster-1-lb LoadBalancer 10.0.29.231 52.142.39.152 8001:31022/TCP 7m30s
939939
domain1-cluster-cluster-1 ClusterIP 10.0.80.134 <none> 8001/TCP 1s

‎docs-source/content/samples/simple/domains/domain-home-on-pv/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ Here is an example of the output of this command:
397397
$ kubectl get services
398398
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
399399
domain1-admin-server ClusterIP 10.96.206.134 <none> 7001/TCP 23m
400-
domain1-admin-server-external NodePort 10.107.164.241 <none> 30012:30012/TCP 22m
400+
domain1-admin-server-ext NodePort 10.107.164.241 <none> 30012:30012/TCP 22m
401401
domain1-cluster-cluster-1 ClusterIP 10.109.133.168 <none> 8001/TCP 22m
402402
domain1-managed-server1 ClusterIP None <none> 8001/TCP 22m
403403
domain1-managed-server2 ClusterIP None <none> 8001/TCP 22m

‎docs-source/content/samples/simple/domains/fmw-domain/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ Here is an example of the output of this command:
450450
$ kubectl get services
451451
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
452452
fmw-domain-admin-server ClusterIP None <none> 7001/TCP 15h
453-
fmw-domain-admin-server-external NodePort 10.101.26.42 <none> 7001:30731/TCP 15h
453+
fmw-domain-admin-server-ext NodePort 10.101.26.42 <none> 7001:30731/TCP 15h
454454
fmw-domain-cluster-cluster-1 ClusterIP 10.107.55.188 <none> 8001/TCP 15h
455455
fmw-domain-managed-server1 ClusterIP None <none> 8001/TCP 15h
456456
fmw-domain-managed-server2 ClusterIP None <none> 8001/TCP 15h

‎docs-source/content/samples/simple/domains/model-in-image/initial.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -658,11 +658,11 @@ Copy the following to a file called `/tmp/mii-sample/mii-initial.yaml` or simila
658658
```
659659
$ kubectl get pods -n sample-domain1-ns --watch
660660
NAME READY STATUS RESTARTS AGE
661-
sample-domain1-introspect-domain-job-lqqj9 0/1 Pending 0 0s
662-
sample-domain1-introspect-domain-job-lqqj9 0/1 ContainerCreating 0 0s
663-
sample-domain1-introspect-domain-job-lqqj9 1/1 Running 0 1s
664-
sample-domain1-introspect-domain-job-lqqj9 0/1 Completed 0 65s
665-
sample-domain1-introspect-domain-job-lqqj9 0/1 Terminating 0 65s
661+
sample-domain1-introspector-lqqj9 0/1 Pending 0 0s
662+
sample-domain1-introspector-lqqj9 0/1 ContainerCreating 0 0s
663+
sample-domain1-introspector-lqqj9 1/1 Running 0 1s
664+
sample-domain1-introspector-lqqj9 0/1 Completed 0 65s
665+
sample-domain1-introspector-lqqj9 0/1 Terminating 0 65s
666666
sample-domain1-admin-server 0/1 Pending 0 0s
667667
sample-domain1-admin-server 0/1 ContainerCreating 0 0s
668668
sample-domain1-admin-server 0/1 Running 0 1s
@@ -732,14 +732,14 @@ Alternatively, you can run `/tmp/mii-sample/utils/wl-pod-wait.sh -p 3`. This is
732732
733733
NAME VERSION IMAGE READY PHASE
734734
-------------------------------------------- ------- ----- ----- ---------
735-
'sample-domain1-introspect-domain-job-rkdkg' '' '' '' 'Pending'
735+
'sample-domain1-introspector-rkdkg' '' '' '' 'Pending'
736736
737737
@@ [2020-04-30T13:50:45][seconds=3] Info: '0' WebLogic Server pods currently match all criteria, expecting '3'.
738738
@@ [2020-04-30T13:50:45][seconds=3] Info: Introspector and WebLogic Server pods with same namespace and domain-uid:
739739
740740
NAME VERSION IMAGE READY PHASE
741741
-------------------------------------------- ------- ----- ----- ---------
742-
'sample-domain1-introspect-domain-job-rkdkg' '' '' '' 'Running'
742+
'sample-domain1-introspector-rkdkg' '' '' '' 'Running'
743743
744744
745745
@@ [2020-04-30T13:51:50][seconds=68] Info: '0' WebLogic Server pods currently match all criteria, expecting '3'.

‎docs-source/content/samples/simple/domains/model-in-image/update1.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ Here are the steps:
242242
NAME VERSION IMAGE READY PHASE
243243
-------------------------------------------- ------- ----------------------- ------ ---------
244244
'sample-domain1-admin-server' '1' 'model-in-image:WLS-v1' 'true' 'Running'
245-
'sample-domain1-introspect-domain-job-wlkpr' '' '' '' 'Pending'
245+
'sample-domain1-introspector-wlkpr' '' '' '' 'Pending'
246246
'sample-domain1-managed-server1' '1' 'model-in-image:WLS-v1' 'true' 'Running'
247247
'sample-domain1-managed-server2' '1' 'model-in-image:WLS-v1' 'true' 'Running'
248248

@@ -252,7 +252,7 @@ Here are the steps:
252252
NAME VERSION IMAGE READY PHASE
253253
-------------------------------------------- ------- ----------------------- ------ ---------
254254
'sample-domain1-admin-server' '1' 'model-in-image:WLS-v1' 'true' 'Running'
255-
'sample-domain1-introspect-domain-job-wlkpr' '' '' '' 'Running'
255+
'sample-domain1-introspector-wlkpr' '' '' '' 'Running'
256256
'sample-domain1-managed-server1' '1' 'model-in-image:WLS-v1' 'true' 'Running'
257257
'sample-domain1-managed-server2' '1' 'model-in-image:WLS-v1' 'true' 'Running'
258258

@@ -262,7 +262,7 @@ Here are the steps:
262262
NAME VERSION IMAGE READY PHASE
263263
-------------------------------------------- ------- ----------------------- ------ -----------
264264
'sample-domain1-admin-server' '1' 'model-in-image:WLS-v1' 'true' 'Running'
265-
'sample-domain1-introspect-domain-job-wlkpr' '' '' '' 'Succeeded'
265+
'sample-domain1-introspector-wlkpr' '' '' '' 'Succeeded'
266266
'sample-domain1-managed-server1' '1' 'model-in-image:WLS-v1' 'true' 'Running'
267267
'sample-domain1-managed-server2' '1' 'model-in-image:WLS-v1' 'true' 'Running'
268268

‎docs-source/content/samples/simple/domains/model-in-image/update2.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,13 @@ Here are the steps for this use case:
309309
sample-domain1-admin-server 1/1 Running 0 5d2h
310310
sample-domain1-managed-server1 1/1 Running 1 5d2h
311311
sample-domain1-managed-server2 1/1 Running 2 5d2h
312-
sample-domain2-introspect-domain-job-plssr 0/1 Pending 0 0s
313-
sample-domain2-introspect-domain-job-plssr 0/1 Pending 0 0s
314-
sample-domain2-introspect-domain-job-plssr 0/1 ContainerCreating 0 0s
315-
sample-domain2-introspect-domain-job-plssr 1/1 Running 0 2s
316-
sample-domain2-introspect-domain-job-plssr 0/1 Completed 0 69s
317-
sample-domain2-introspect-domain-job-plssr 0/1 Terminating 0 71s
318-
sample-domain2-introspect-domain-job-plssr 0/1 Terminating 0 71s
312+
sample-domain2-introspector-plssr 0/1 Pending 0 0s
313+
sample-domain2-introspector-plssr 0/1 Pending 0 0s
314+
sample-domain2-introspector-plssr 0/1 ContainerCreating 0 0s
315+
sample-domain2-introspector-plssr 1/1 Running 0 2s
316+
sample-domain2-introspector-plssr 0/1 Completed 0 69s
317+
sample-domain2-introspector-plssr 0/1 Terminating 0 71s
318+
sample-domain2-introspector-plssr 0/1 Terminating 0 71s
319319
sample-domain2-admin-server 0/1 Pending 0 0s
320320
sample-domain2-admin-server 0/1 Pending 0 0s
321321
sample-domain2-admin-server 0/1 ContainerCreating 0 0s
@@ -352,14 +352,14 @@ Here are the steps for this use case:
352352

353353
NAME VERSION IMAGE READY PHASE
354354
-------------------------------------------- ------- ----- ----- ---------
355-
'sample-domain2-introspect-domain-job-plssr' '' '' '' 'Running'
355+
'sample-domain2-introspector-plssr' '' '' '' 'Running'
356356

357357
@@ [2020-05-13T17:07:03][seconds=64] Info: '0' WebLogic Server pods currently match all criteria, expecting '3'.
358358
@@ [2020-05-13T17:07:03][seconds=64] Info: Introspector and WebLogic Server pods with same namespace and domain-uid:
359359

360360
NAME VERSION IMAGE READY PHASE
361361
-------------------------------------------- ------- ----- ----- -----------
362-
'sample-domain2-introspect-domain-job-plssr' '' '' '' 'Succeeded'
362+
'sample-domain2-introspector-plssr' '' '' '' 'Succeeded'
363363

364364
@@ [2020-05-13T17:07:06][seconds=67] Info: '0' WebLogic Server pods currently match all criteria, expecting '3'.
365365
@@ [2020-05-13T17:07:06][seconds=67] Info: Introspector and WebLogic Server pods with same namespace and domain-uid:

‎docs-source/content/samples/simple/domains/model-in-image/update3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ Here are the steps for this use case:
235235
NAME VERSION IMAGE READY PHASE
236236
-------------------------------------------- ------- ----------------------- ------ ---------
237237
'sample-domain1-admin-server' '2' 'model-in-image:WLS-v1' 'true' 'Running'
238-
'sample-domain1-introspect-domain-job-g5kzn' '' '' '' 'Running'
238+
'sample-domain1-introspector-g5kzn' '' '' '' 'Running'
239239
'sample-domain1-managed-server1' '2' 'model-in-image:WLS-v1' 'true' 'Running'
240240
'sample-domain1-managed-server2' '2' 'model-in-image:WLS-v1' 'true' 'Running'
241241

‎docs-source/content/userguide/managing-domains/accessing-the-domain/wlst.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ description: "You can use the WebLogic Scripting Tool (WLST) to manage a domain
1010
You can use the WebLogic Scripting Tool (WLST) to manage a domain running in Kubernetes. If the Administration Server was configured to expose a T3 channel using the `exposeAdminT3Channel` setting when creating the domain, then the matching T3 service can be used to connect. For example, if the `domainUID` is `domain1`, and the Administration Server name is `admin-server`, then the service would be called:
1111

1212
```
13-
domain1-admin-server-external
13+
domain1-admin-server-ext
1414
```
1515

1616
This service will be in the same namespace as the domain. The external port number can be obtained by checking this service’s `nodePort`:
1717

1818
```
19-
$ kubectl get service domain1-admin-server-external -n domain1 -o jsonpath='{.spec.ports[0].nodePort}'
19+
$ kubectl get service domain1-admin-server-ext -n domain1 -o jsonpath='{.spec.ports[0].nodePort}'
2020
30012
2121
```
2222

0 commit comments

Comments
 (0)