Commit 0a65c34
Refactor WLS on AKS to cover two domain home source type scenarios. (#2219)
* Refactor WLS on AKS to cover two domain home source type scenarios.
* Model in Image
* Domain on PV
This refactoring uses hugo shortcodes, like so:
```
{{< readfile file="/samples/simple/azure-kubernetes-service/includes/prerequisites-01.txt" >}}
```
This shortcode is defined in `docs-source/layouts/shortcodes/readfile.html`, which is simply:
```
{{ $toRead := .Get "file" }}
{{ readFile $toRead | markdownify }}
```
By using hugo shortcodes, we can keep the text DRY, but maintain readability.
Before this change, the WLS on AKS arrangement looks like:
```
3. Samples
Simple samples
Credentials
...
Azure Kubernetes Service
Tanzu Kubernetes Service
```
After this change, the WLS on AKS arrangement looks like:
```
3. Samples
Simple samples
Credentials
...
Azure Kubernetes Service
Domain home on a PV
Model in image
Troubleshooting
Tanzu Kubernetes Service
```
Naturally, the steps in the two domain home source types have significant overlap. Hugho shortcode readfile allows us to account for that overlap while maintaining DRY.
Running WLS on AKS via "Model in image"
On branch wls-on-aks-model-in-image
modified: docs-source/content/samples/simple/azure-kubernetes-service/_index.md
- Use "Domain home source type" instead of "Domain home source scenario" for consistency with other parts of the documentation.
- Update into to account for other values of Domain home source type.
- Use "Domain in PV" instead of "Domain on a PV" for consistency with other parts of the docs.
modified: docs-source/content/userguide/managing-domains/_index.md
- Add "Azure Container Registry".
modified: docs-source/content/userguide/managing-domains/domain-resource.md
- Use the term `domainUID` consistently.
modified: docs-source/content/userguide/managing-domains/prepare.md
- Briefly define the term `domainUID` in place.
modified: docs-source/content/userguide/overview/k8s-setup.md
modified: docs-source/content/samples/simple/azure-kubernetes-service/domain-on-pv.md
- Add automation step for domain-on-pv.
- Validate service account
- Complete PENDING activities.
- Additional TOC entry
Remove steps to build image.
Use readfile with shortcode to allow content reuse
On branch wls-on-aks-model-in-image Completed refactoring to verify domain-on-pv is correct. Next step is to revisit model-in-image.
* Moved info block "The following sections of the" to the top, to get it out of the include.
* Section *Prerequisites*.
* Add dependency on Docker for Desktop.
* Section *Oracle Container Registry*.
* Simplified steps.
* 12.2.1.4 pull.
* Moved section *Clone WebLogic Server Kubernetes Operator repository* lower, to get it out of the include.
* Added correctness check at end of section on setting up AKS. Starts with "After your Kubernetes cluster is up and running".
* See above about info block.
* Section *Generate configuration files* has been renamed *Create PV and PVC* The table in this section has been greatly simplified.
* Things start to diverge greatly when the upstream says "Now let’s
ask the operator to create a WebLogic Server domain within the AKS
cluster." and the fork says "Follow Domain home on a PV - Use the
script to create a domain to create the WebLogic domain home within
the AKS cluster."
We get back on track with the text "You may observe error-related
output during the creation of the domain."
* In the fork, in the section that starts with the text "You must create
LoadBalancer services" the YAML snippets for the admin and managed
servers are adjacent, and the apply commands are in the same execute block.
* Troubleshooting is a separate section.
modified: docs-source/content/samples/simple/azure-kubernetes-service/_index.md
- Remove TOC entries to non-existent content.
- Capitalize D in domain when appropriate.
- Make it clear the two sub-sections are independent.
deleted: docs-source/content/samples/simple/azure-kubernetes-service/create-aks-cluster.md
- Content absorbed into files included with `readFile` shortcode.
modified: docs-source/content/samples/simple/azure-kubernetes-service/domain-on-pv.md
- See above.
new file: docs-source/content/samples/simple/azure-kubernetes-service/includes/clean-up-resources.md
modified: docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-body.md
modified: docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-storage.md
- Extractions.
modified: docs-source/content/samples/simple/azure-kubernetes-service/model-in-image.md
- Start first validation work.
On branch wls-on-aks-model-in-image Complete refactoring.
modified: docs-source/content/samples/simple/azure-kubernetes-service/domain-on-pv.md
- Use 3.1.1 instead of 3.0.3.
- Move prerequisites into include.
new file: docs-source/content/samples/simple/azure-kubernetes-service/includes/prerequisites.md
- Move prerequisites into include.
modified: docs-source/content/samples/simple/azure-kubernetes-service/model-in-image.md
- Move prerequisites into include.
- Remove OCR. It is in a file that is included.
- Move clone steps up.
- Apply lessons from Jianguo from Azure/AKS#1517 (comment)
modified: docs-source/content/samples/simple/azure-kubernetes-service/model-in-image.md
- Add JDK to prereqs.
- Add "--admin-enabled".
- Fix typos in table.
On branch wls-on-aks-model-in-image
modified: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/model-in-image/mii-initial.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/JRF/mii-initial-d1-JRF-v1.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/WLS/mii-initial-d1-WLS-v1.yaml
- Correct admin/managed.
On branch wls-on-aks-model-in-image
modified: docs-source/content/samples/simple/azure-kubernetes-service/domain-on-pv.md
- Move notice to correct place.
- Make headings be same as in live docs.
new file: docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-body-01.md
new file: docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-body-02.md
- Break up files to separate parts.
deleted: docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-body.md
modified: docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-storage.md
- Re-add rows removed from table.
modified: docs-source/content/samples/simple/azure-kubernetes-service/model-in-image.md
- Use two parts.
- Remove unnecessary heading.
modified: docs-source/content/samples/simple/azure-kubernetes-service/domain-on-pv.md
new file: docs-source/content/samples/simple/azure-kubernetes-service/includes/clean-up-resources-body-01.md
new file: docs-source/content/samples/simple/azure-kubernetes-service/includes/clean-up-resources-body-02.md
deleted: docs-source/content/samples/simple/azure-kubernetes-service/includes/clean-up-resources.md
modified: docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-storage.md
modified: docs-source/content/samples/simple/azure-kubernetes-service/model-in-image.md
modified: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/azure-file-pv-template.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/azure-file-pvc-template.yaml
renamed: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/create-aks-cluster-inputs.yaml -> kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/create-domain-on-aks-inputs.yaml
renamed: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/create-aks-cluster.sh -> kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/create-domain-on-aks.sh
deleted: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/domain-on-pv/admin-lb.yaml
deleted: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/domain-on-pv/cluster-lb.yaml
deleted: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/domain-on-pv/create-domain-inputs.yaml
new file: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/loadbalancer-template.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/model-in-image/admin-lb.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/model-in-image/cluster-lb.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/model-in-image/helm-sa-cluster-admin-role.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/model-in-image/mii-initial.yaml
Fix the menu issue.
The live page will show included files in the menu.
Change the included files as txt can solve this problem.
Changes to be committed:
modified: ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/domain-on-pv.md
renamed: ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/clean-up-resources-body-01.md -> ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/clean-up-resources-body-01.txt
renamed: ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/clean-up-resources-body-02.md -> ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/clean-up-resources-body-02.txt
renamed: ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-body-01.md -> ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-body-01.txt
renamed: ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-body-02.md -> ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-body-02.txt
renamed: ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-storage.md -> ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-storage.txt
renamed: ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/prerequisites.md -> ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/prerequisites-01.txt
new file: ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/includes/prerequisites-02.txt
modified: ../../../../../docs-source/content/samples/simple/azure-kubernetes-service/model-in-image.md
- Validate model-in-image
On branch wls-on-aks-model-in-image
modified: docs-source/content/samples/simple/azure-kubernetes-service/domain-on-pv.md
- Added note to skip to sample deployment.
- Use 1. for numbered lists.
modified: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/create-domain-on-aks-inputs.yaml
- Update weblogic version number in image to 12.2.1.4.
Add troubeshooting for WebLogic Kubernetes Operator ErrImagePull
Troubleshooting for VM size error
Update troubleshooting.md
Update domain-on-pv.md
Remove diff markers
Thanks @tbarnes-us.
On branch wls-on-aks-model-in-image Apply suggestions from @rosemarymarano and @tbarnes-us.
modified: docs-source/content/samples/simple/azure-kubernetes-service/_index.md
modified: docs-source/content/samples/simple/azure-kubernetes-service/domain-on-pv.md
modified: docs-source/content/samples/simple/azure-kubernetes-service/includes/create-aks-cluster-storage.txt
modified: docs-source/content/samples/simple/azure-kubernetes-service/includes/prerequisites-02.txt
modified: docs-source/content/samples/simple/azure-kubernetes-service/model-in-image.md
modified: docs-source/content/samples/simple/azure-kubernetes-service/troubleshooting.md
modified: docs-source/content/userguide/managing-domains/prepare.md
modified: kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/JRF/mii-initial-d1-JRF-v1.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/WLS/mii-initial-d1-WLS-v1.yaml
modified: operator/integration-tests/model-in-image/mii-sample-wrapper/mii-domain.yaml.template-JRF
modified: operator/integration-tests/model-in-image/mii-sample-wrapper/mii-domain.yaml.template-WLS
deleted: kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service/model-in-image/mii-initial.yaml
* On branch wls-on-aks-model-in-image-from-master
modified: docs-source/content/samples/simple/azure-kubernetes-service/troubleshooting.md
- Address @ddsharpe's comment: @rjeberhard Image Tool 1.9.8 (latest release) no longer has this issue. The user can use Docker with or without buildkit enabled.
modified: docs-source/content/samples/simple/azure-kubernetes-service/model-in-image.md
- Address @rjeberhard's comments
- This is obsoleted. Helm needed it's own service account only for Helm 2.x. With Helm 3.x the service account of the customer running the helm install is used.
- My preference, though, would be to go further and find a way to do periodic integration testing so that we can just tell customers to use the latest version of the operator. We've had very few upgrade bugs (although, we did just fix one) and we are making it a priority to keep upgrading simple. Therefore, I believe that it will be safe to tell customers to use the latest as long as we do periodic tests (e.g. once per quarter).
- @edburns: Yes, let's just go with master.
* On branch wls-on-aks-model-in-image-from-master Address comment from @tbarnes-us
modified: kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/JRF/mii-update1-d1-JRF-v1-ds.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/JRF/mii-update2-d2-JRF-v1-ds.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/JRF/mii-update3-d1-JRF-v2-ds.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/WLS/mii-update1-d1-WLS-v1-ds.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/WLS/mii-update2-d2-WLS-v1-ds.yaml
modified: kubernetes/samples/scripts/create-weblogic-domain/model-in-image/domain-resources/WLS/mii-update3-d1-WLS-v2-ds.yaml
modified: src/integration-tests/model-in-image/mii-sample-wrapper/mii-domain.yaml.template-JRF
modified: src/integration-tests/model-in-image/mii-sample-wrapper/mii-domain.yaml.template-WLS
Address comment from @tbarnes-us:
- Note that 8 files will change in total, and all of them must be checked-in so that the integration test will pass...
* On branch wls-on-aks-model-in-image-from-master Address comment from @tbarnes-us
modified: docs-source/content/samples/simple/azure-kubernetes-service/_index.md
- Please append "/_index.md" to the reference.
* Append _index.md to relref
Co-authored-by: haixia <[email protected]>1 parent f76ab45 commit 0a65c34
File tree
34 files changed
+2174
-1024
lines changed- docs-source
- content
- samples/simple
- azure-kubernetes-service
- includes
- tanzu-kubernetes-service
- userguide
- managing-domains
- overview
- layouts/shortcodes
- kubernetes/samples/scripts
- create-weblogic-domain-on-azure-kubernetes-service
- model-in-image
- create-weblogic-domain/model-in-image/domain-resources
- JRF
- WLS
- src/integration-tests/model-in-image/mii-sample-wrapper
34 files changed
+2174
-1024
lines changedLines changed: 26 additions & 998 deletions
Large diffs are not rendered by default.
Lines changed: 549 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 13 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
Lines changed: 82 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
Lines changed: 54 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
Lines changed: 182 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
Lines changed: 12 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
0 commit comments