Skip to content

Commit aa55a0b

Browse files
committed
Merge branch 'edburns-msft-em-4986-apply-reza-feedback' into 'main'
Edburns msft em 4986 apply reza feedback See merge request weblogic-cloud/weblogic-kubernetes-operator!4576
2 parents 86f33c2 + 13e42ba commit aa55a0b

File tree

8 files changed

+169
-159
lines changed

8 files changed

+169
-159
lines changed

documentation/site/content/samples/azure-kubernetes-service/domain-on-pv.md

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -88,24 +88,9 @@ export ACR_ACCOUNT_NAME="${NAME_PREFIX}acr${TIMESTAMP}"
8888

8989
```
9090

91-
#### Clone WKO repository
92-
93-
If you have not already done so, clone the [WebLogic Kubernetes Operator repository](https://github.com/oracle/weblogic-kubernetes-operator) to your machine. You will use several scripts in this repository to create a WebLogic domain. This sample was tested with v4.1.1, but should work later releases.
94-
95-
```shell
96-
$ cd $BASE_DIR
97-
$ git clone https://github.com/oracle/weblogic-kubernetes-operator.git
98-
99-
```
100-
101-
#### Create Resource Group
102-
103-
```shell
104-
$ cd $BASE_DIR/weblogic-kubernetes-operator
105-
$ az extension add --name resource-graph
106-
$ az group create --name $AKS_PERS_RESOURCE_GROUP --location $AKS_PERS_LOCATION
107-
```
91+
{{< readfile file="/samples/azure-kubernetes-service/includes/download-samples-zip.txt" >}}
10892

93+
{{< readfile file="/samples/azure-kubernetes-service/includes/create-resource-group.txt" >}}
10994

11095
{{< readfile file="/samples/azure-kubernetes-service/includes/create-aks-cluster-body-02.txt" >}}
11196

@@ -175,6 +160,7 @@ Kubernetes Operators use [Helm](https://helm.sh/) to manage Kubernetes applicati
175160

176161
```shell
177162
$ helm repo add weblogic-operator https://oracle.github.io/weblogic-kubernetes-operator/charts --force-update
163+
$ helm repo update
178164
$ helm install weblogic-operator weblogic-operator/weblogic-operator
179165
```
180166

@@ -214,10 +200,10 @@ Now that you have created the AKS cluster, installed the operator, and verified
214200

215201
##### Create secrets
216202

217-
You will use the `kubernetes/samples/scripts/create-weblogic-domain-credentials/create-weblogic-credentials.sh` script to create the domain WebLogic administrator credentials as a Kubernetes secret. Please run:
203+
You will use the `$BASE_DIR/sample-scripts/create-weblogic-domain-credentials/create-weblogic-credentials.sh` script to create the domain WebLogic administrator credentials as a Kubernetes secret. Please run:
218204

219205
```
220-
cd $BASE_DIR/weblogic-kubernetes-operator/kubernetes/samples/scripts/create-weblogic-domain-credentials
206+
cd $BASE_DIR/sample-scripts/create-weblogic-domain-credentials
221207
```
222208
```shell
223209
$ ./create-weblogic-credentials.sh -u ${WEBLOGIC_USERNAME} -p ${WEBLOGIC_PASSWORD} -d domain1
@@ -232,7 +218,7 @@ The secret domain1-weblogic-credentials has been successfully created in the def
232218
You will use the `kubernetes/samples/scripts/create-kubernetes-secrets/create-docker-credentials-secret.sh` script to create the Docker credentials as a Kubernetes secret. Please run:
233219

234220
``` shell
235-
$ cd $BASE_DIR/weblogic-kubernetes-operator/kubernetes/samples/scripts/create-kubernetes-secrets
221+
$ cd $BASE_DIR/sample-scripts/create-kubernetes-secrets
236222
$ ./create-docker-credentials-secret.sh -s ${SECRET_NAME_DOCKER} -e ${ORACLE_SSO_EMAIL} -p ${ORACLE_SSO_PASSWORD} -u ${ORACLE_SSO_EMAIL}
237223
```
238224
```
@@ -270,7 +256,7 @@ Now, you deploy a `sample-domain1` domain resource and an associated `sample-dom
270256
- Run the following command to generate resource files.
271257

272258
```shell
273-
cd $BASE_DIR/weblogic-kubernetes-operator/kubernetes/samples/scripts/create-weblogic-domain-on-azure-kubernetes-service
259+
cd $BASE_DIR/sample-scripts/create-weblogic-domain-on-azure-kubernetes-service
274260

275261
bash create-domain-on-aks-generate-yaml.sh
276262
```
@@ -406,9 +392,11 @@ Now that you have WLS running in AKS, you can test the cluster by deploying the
406392

407393
First, package the application with the following command:
408394

409-
```bash
410-
cd $BASE_DIR/weblogic-kubernetes-operator/integration-tests/src/test/resources/bash-scripts
411-
bash build-war-app.sh -s ../apps/testwebapp/ -d /tmp/testwebapp
395+
```shell
396+
$ curl -m 120 -fL https://github.com/oracle/weblogic-kubernetes-operator/archive/refs/tags/v4.1.7.zip -o ${BASE_DIR}/v4.1.7.zip
397+
$ unzip v4.1.7.zip "weblogic-kubernetes-operator-4.1.7/integration-tests/src/test/resources/bash-scripts/build-war-app.sh" "weblogic-kubernetes-operator-4.1.7/integration-tests/src/test/resources/apps/testwebapp/*"
398+
$ cd $BASE_DIR/weblogic-kubernetes-operator-4.1.7/integration-tests/src/test/resources/bash-scripts
399+
$ bash build-war-app.sh -s ../apps/testwebapp/ -d /tmp/testwebapp
412400
```
413401

414402
Successful output will look similar to the following:

documentation/site/content/samples/azure-kubernetes-service/includes/create-aks-cluster-body-01.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ You will need an Oracle account. The following steps will direct you to accept t
1313
in _Securing a Production Environment for Oracle WebLogic Server_.
1414
- Ensure that Docker is running. Find and then pull the WebLogic 12.2.1.4 installation image:
1515
```shell
16+
$ docker login container-registry.oracle.com -u ${ORACLE_SSO_EMAIL} -p ${ORACLE_SSO_PASSWORD}
1617
$ docker pull container-registry.oracle.com/middleware/weblogic:12.2.1.4
1718
```
1819

documentation/site/content/samples/azure-kubernetes-service/includes/create-aks-cluster-body-02.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11

22
#### Create the AKS cluster
33

4-
This sample requires that you disable the AKS addon `http_application_routing` by default. If you want to enable `http_application_routing`, then follow [HTTP application routing](https://docs.microsoft.com/azure/aks/http-application-routing).
4+
This sample doesn't enable application routing. If you want to enable application routing, follow [Managed nginx Ingress with the application routing add-on in AKS](https://learn.microsoft.com/azure/aks/app-routing?tabs=default%2Cdeploy-app-default).
55

66
Run the following commands to create the AKS cluster instance.
77

88
```shell
9-
109
$ az aks create \
1110
--resource-group $AKS_PERS_RESOURCE_GROUP \
1211
--name $AKS_CLUSTER_NAME \
@@ -36,6 +35,11 @@ After your Kubernetes cluster is up and running, run the following commands to m
3635

3736
```shell
3837
$ kubectl get nodes -o wide
38+
```
39+
40+
Successful output will look like the following.
41+
42+
```shell
3943
NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME
4044
aks-nodepool1-15679926-vmss000000 Ready agent 118s v1.25.6 10.224.0.4 <none> Ubuntu 22.04.2 LTS 5.15.0-1041-azure containerd://1.7.1+azure-1
4145
aks-nodepool1-15679926-vmss000001 Ready agent 2m8s v1.25.6 10.224.0.5 <none> Ubuntu 22.04.2 LTS 5.15.0-1041-azure containerd://1.7.1+azure-1
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
#### Create Resource Group
3+
4+
```shell
5+
$ az extension add --name resource-graph
6+
$ az group create --name $AKS_PERS_RESOURCE_GROUP --location $AKS_PERS_LOCATION
7+
```
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
##### Download the WebLogic Kubernetes Operator sample.
2+
3+
Download the WebLogic Kubernetes Operator sample ZIP file. We will use several scripts in this zip file to create a WebLogic domain. This sample was tested with v4.1.7, but should work with the latest release.
4+
5+
```shell
6+
$ cd $BASE_DIR
7+
$ mkdir sample-scripts
8+
$ curl -m 120 -fL https://github.com/oracle/weblogic-kubernetes-operator/releases/download/v4.1.7/sample-scripts.zip \
9+
-o ${BASE_DIR}/sample-scripts/sample-scripts.zip
10+
$ unzip ${BASE_DIR}/sample-scripts/sample-scripts.zip -d ${BASE_DIR}/sample-scripts
11+
```

documentation/site/content/samples/azure-kubernetes-service/includes/prerequisites-02.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This sample assumes the following prerequisite environment.
55
* If you don't have an [Azure subscription](https://learn.microsoft.com/en-us/azure/guides/developer/azure-developer-guide#understanding-accounts-subscriptions-and-billing), create a [free account](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio) before you begin.
66
* It's recommended that the Azure identity you use to sign in and complete this article has either the [Owner](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#owner) role in the current subscription or the [Contributor](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#contributor) and [User Access Administrator](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#user-access-administrator) roles in the current subscription.
77
* If your identity has very limited role assignments, ensure you have [Contributor](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#contributor) role and [User Access Administrator](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#user-access-administrator) role in the resource group that runs the AKS cluster. This requires asking a privileged user to assign the roles before creating resources in the resource group.
8-
* Operating System: GNU/Linux, macOS or [WSL2 for Windows 10](https://docs.microsoft.com/windows/wsl/install-win10).
8+
* Operating System: GNU/Linux, macOS (Intel only, Apple Silicon not supported) [WSL2 for Windows 10](https://docs.microsoft.com/windows/wsl/install-win10).
99
* [Git](https://git-scm.com/downloads); use `git --version` to test if `git` works. This document was tested with version 2.25.1.
1010
* [Azure CLI](https://docs.microsoft.com/cli/azure); use `az --version` to test if `az` works. This document was tested with version 2.48.1.
1111
* [Docker for Desktop](https://www.docker.com/products/docker-desktop). This document was tested with `Docker version 20.10.7`

0 commit comments

Comments
 (0)