[pull] master from oracle:master #3
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Update for 3.1.3 * keep namespaces processed in batches (#2189) * OWLS-87753 - Fix to start all managed server pods when watch event notifications not received in jumbo k8s cluster (#2188) * Fix for OWLS_87753 to start managed server waiters in case watch event notifications are not received * Check for null initialResource * PR review comment - added null check for resourceName * Address PR review comment. * Release note update * Spelling and grammar updates Co-authored-by: Dongbo Xiao <dongbo.xiao@oracle.com> Co-authored-by: Anil Kedia <37935279+ankedia@users.noreply.github.com>
…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 <haixia.cheng@microsoft.com>
* edit sample docs * remove x-refs
Release operator 3.1.4 Co-authored-by: Anil Kedia <37935279+ankedia@users.noreply.github.com> Co-authored-by: Anthony Lai <anthony.lai@oracle.com>
* add Oracle support * edit support
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )