From fdc4b28a023022cf5150400df07dabc524489405 Mon Sep 17 00:00:00 2001 From: Richard Killen Date: Fri, 4 Nov 2022 15:55:13 -0500 Subject: [PATCH 1/4] Add information about wko4 targets --- .../2.0/content/userguide/target_env.md | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/documentation/2.0/content/userguide/target_env.md b/documentation/2.0/content/userguide/target_env.md index 7abd98b68f..1a05f02f21 100644 --- a/documentation/2.0/content/userguide/target_env.md +++ b/documentation/2.0/content/userguide/target_env.md @@ -42,9 +42,11 @@ These target environment configurations are included in the WebLogic Deploy Tool You can use these targets to customize the model and create a domain resource file for use with WebLogic Kubernetes Operator. There are three targets for specific [domain home source types](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/choosing-a-model/): -- `wko` for [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/model-in-image/) deployments -- `wko-dii` for Domain in Image deployments -- `wko-pv` for Domain in PV deployments +- `wko` and `wko4` for [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/model-in-image/) deployments +- `wko-dii` and `wko4-dii` for Domain in Image deployments +- `wko-pv`and `wko4-pv` for Domain in PV deployments + +Targets beginning with `wko4` are for use with WebLogic Kubernetes Operator versions 4.0 and later. Each of these targets provides this additional processing: @@ -130,6 +132,22 @@ kubernetes: ``` These fields will override the values in the output file, and the file would be rewritten with the revised values. List values in the model will be combined with existing values in the output file. For example, if `my-cluster` was in the original output file, the model content for `my-cluster` would be merged with it, overriding the `replicas` value. If `my-cluster` was not in the original output file, it would be added to the list of clusters. +When creating a resource file for WebLogic Kubernetes Operator 4.0, the `kubernetes` section of the model has to be structured differently. This is because there are multiple documents in the resource file for version 4.0. This example uses `domain` and `cluster` folders that will merge with the corresponding documents in the resource file: +```yaml +kubernetes: + domain: + spec: + domainHome: /etc/domainHome + image: my-image + clusters: + - spec: + clusterName: my-cluster + replicas: 4 + - spec: + clusterName: other-cluster + replicas: 6 +``` + ### Target environment configuration files A target environment is configured in a JSON file at this location: @@ -157,7 +175,6 @@ Here is an example of a target environment file: "variable_injectors" : {"PORT": {},"HOST": {},"URL": {}}, "validation_method" : "lax", "credentials_method" : "secrets", - "credentials_output_method" : "script", "exclude_domain_bin_contents": true, "wls_credentials_name" : "__weblogic-credentials__", "use_persistent_volume" : true, From 45225005acc8319ecfcca790fac3af97ff39e322 Mon Sep 17 00:00:00 2001 From: Richard Killen Date: Mon, 7 Nov 2022 10:31:50 -0600 Subject: [PATCH 2/4] Updates from reviews --- .../2.0/content/release-notes/_index.md | 2 +- .../2.0/content/userguide/target_env.md | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/documentation/2.0/content/release-notes/_index.md b/documentation/2.0/content/release-notes/_index.md index e9ef2aa870..fdb8debf87 100644 --- a/documentation/2.0/content/release-notes/_index.md +++ b/documentation/2.0/content/release-notes/_index.md @@ -32,7 +32,7 @@ This may require some changes to existing models in order to be parsed correctly - Object lists in the `kubernetes` section of the model now should be specified in a hyphenated list format, -similar to how they appear in the domain resource file produced for [WebLogic Kubernetes Operator](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/domain-resource/). +similar to how they appear in the domain resource file produced for [WebLogic Kubernetes Operator]( https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/domain-resource/). ```yaml     clusters: diff --git a/documentation/2.0/content/userguide/target_env.md b/documentation/2.0/content/userguide/target_env.md index 1a05f02f21..ada98ef181 100644 --- a/documentation/2.0/content/userguide/target_env.md +++ b/documentation/2.0/content/userguide/target_env.md @@ -40,13 +40,13 @@ These target environment configurations are included in the WebLogic Deploy Tool #### The WebLogic Kubernetes Operator targets -You can use these targets to customize the model and create a domain resource file for use with WebLogic Kubernetes Operator. There are three targets for specific [domain home source types](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/choosing-a-model/): +You can use these targets to customize the model and create a domain resource file for use with WebLogic Kubernetes Operator. There are three targets for specific [domain home source types](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/domain-resource/): -- `wko` and `wko4` for [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/model-in-image/) deployments +- `wko` and `wko4` for [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/model-in-image/) deployments - `wko-dii` and `wko4-dii` for Domain in Image deployments - `wko-pv`and `wko4-pv` for Domain in PV deployments -Targets beginning with `wko4` are for use with WebLogic Kubernetes Operator versions 4.0 and later. +Targets beginning with `wko` are for use with WebLogic Kubernetes Operator versions 3.*, and those beginning with `wko4` are for use with versions 4.0.0 and later. Each of these targets provides this additional processing: @@ -59,9 +59,9 @@ In addition, the `wko` target will replace credentials in the model with referen #### The Verrazzano targets -You can use these targets to customize the model and create a Kubernetes resource file for use with Verrazzano. There are three targets for specific [domain home source types](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/choosing-a-model/): +You can use these targets to customize the model and create a Kubernetes resource file for use with Verrazzano. There are three targets for specific [domain home source types](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/domain-resource/): -- `vz` for [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/model-in-image/) deployments +- `vz` for [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/model-in-image/) deployments - `vz-dii` for Domain in Image deployments - `vz-pv` for Domain in PV deployments @@ -103,7 +103,7 @@ WDT_MODEL_SECRETS_NAME_DIR_PAIRS=__weblogic-credentials__=/etc/my-secrets ``` For more details about using the `WDT_MODEL_SECRETS_NAME_DIR_PAIRS` environment variable, see [Model Tokens]({{< relref "/concepts/model#model-tokens" >}}) . -In WebLogic Kubernetes Operator [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/model-in-image/) environments, the environment variable `DOMAIN_UID` is automatically set from the value in the domain resource file. The variable `WDT_MODEL_SECRETS_NAME_DIR_PAIRS` is automatically set to the directory containing WebLogic admin credentials. +In WebLogic Kubernetes Operator [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/model-in-image/) environments, the environment variable `DOMAIN_UID` is automatically set from the value in the domain resource file. The variable `WDT_MODEL_SECRETS_NAME_DIR_PAIRS` is automatically set to the directory containing WebLogic admin credentials. #### The create secrets script @@ -132,7 +132,7 @@ kubernetes: ``` These fields will override the values in the output file, and the file would be rewritten with the revised values. List values in the model will be combined with existing values in the output file. For example, if `my-cluster` was in the original output file, the model content for `my-cluster` would be merged with it, overriding the `replicas` value. If `my-cluster` was not in the original output file, it would be added to the list of clusters. -When creating a resource file for WebLogic Kubernetes Operator 4.0, the `kubernetes` section of the model has to be structured differently. This is because there are multiple documents in the resource file for version 4.0. This example uses `domain` and `cluster` folders that will merge with the corresponding documents in the resource file: +When creating a resource file for WebLogic Kubernetes Operator version 4.0.0 and later, the `kubernetes` section of the model has to be structured differently. This is because there are multiple documents in the resource file for those versions. This example uses `domain` and `cluster` folders that will merge with the corresponding documents in the resource file: ```yaml kubernetes: domain: @@ -216,7 +216,7 @@ This field specifies a name for use with the WDT_MODEL_SECRETS_NAME_DIR_PAIRS en #### `use_persistent_volume` -This field specifies if the domain is to be created for the Domain in PV [domain home source type](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/choosing-a-model/). If set to `true`, volume information will be added to the Kubernetes resource file that is generated. +This field specifies if the domain is to be created for the Domain in PV [domain home source type](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/domain-resource/). If set to `true`, volume information will be added to the Kubernetes resource file that is generated. #### `additional_secrets` From c390a64fce7b7f6d2c6f770741bfcdc39e5b2188 Mon Sep 17 00:00:00 2001 From: Richard Killen Date: Mon, 7 Nov 2022 10:35:33 -0600 Subject: [PATCH 3/4] Remove extra space --- documentation/2.0/content/release-notes/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/2.0/content/release-notes/_index.md b/documentation/2.0/content/release-notes/_index.md index fdb8debf87..03889c4db5 100644 --- a/documentation/2.0/content/release-notes/_index.md +++ b/documentation/2.0/content/release-notes/_index.md @@ -32,7 +32,7 @@ This may require some changes to existing models in order to be parsed correctly - Object lists in the `kubernetes` section of the model now should be specified in a hyphenated list format, -similar to how they appear in the domain resource file produced for [WebLogic Kubernetes Operator]( https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/domain-resource/). +similar to how they appear in the domain resource file produced for [WebLogic Kubernetes Operator](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/domain-resource/). ```yaml     clusters: From 0191a70598796c749adfc77aae423a9002ccee0f Mon Sep 17 00:00:00 2001 From: Richard Killen Date: Mon, 7 Nov 2022 10:53:06 -0600 Subject: [PATCH 4/4] Corrected domain source type links --- documentation/2.0/content/userguide/target_env.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/2.0/content/userguide/target_env.md b/documentation/2.0/content/userguide/target_env.md index ada98ef181..77cf60a217 100644 --- a/documentation/2.0/content/userguide/target_env.md +++ b/documentation/2.0/content/userguide/target_env.md @@ -40,7 +40,7 @@ These target environment configurations are included in the WebLogic Deploy Tool #### The WebLogic Kubernetes Operator targets -You can use these targets to customize the model and create a domain resource file for use with WebLogic Kubernetes Operator. There are three targets for specific [domain home source types](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/domain-resource/): +You can use these targets to customize the model and create a domain resource file for use with WebLogic Kubernetes Operator. There are three targets for specific [domain home source types](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/choosing-a-model/): - `wko` and `wko4` for [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/model-in-image/) deployments - `wko-dii` and `wko4-dii` for Domain in Image deployments @@ -59,7 +59,7 @@ In addition, the `wko` target will replace credentials in the model with referen #### The Verrazzano targets -You can use these targets to customize the model and create a Kubernetes resource file for use with Verrazzano. There are three targets for specific [domain home source types](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/domain-resource/): +You can use these targets to customize the model and create a Kubernetes resource file for use with Verrazzano. There are three targets for specific [domain home source types](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/choosing-a-model/): - `vz` for [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/model-in-image/) deployments - `vz-dii` for Domain in Image deployments @@ -216,7 +216,7 @@ This field specifies a name for use with the WDT_MODEL_SECRETS_NAME_DIR_PAIRS en #### `use_persistent_volume` -This field specifies if the domain is to be created for the Domain in PV [domain home source type](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/domain-resource/). If set to `true`, volume information will be added to the Kubernetes resource file that is generated. +This field specifies if the domain is to be created for the Domain in PV [domain home source type](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/choosing-a-model/). If set to `true`, volume information will be added to the Kubernetes resource file that is generated. #### `additional_secrets`