Skip to content

Commit a55a2e2

Browse files
authored
Add information about wko4 targets (#1246)
* Add information about wko4 targets * Updates from reviews * Remove extra space * Corrected domain source type links
1 parent aded627 commit a55a2e2

File tree

2 files changed

+27
-10
lines changed

2 files changed

+27
-10
lines changed

documentation/2.0/content/release-notes/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This may require some changes to existing models in order to be parsed correctly
3232
3333
3434
- Object lists in the `kubernetes` section of the model now should be specified in a hyphenated list format,
35-
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/).
35+
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/).
3636

3737
```yaml
3838
    clusters:

documentation/2.0/content/userguide/target_env.md

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ These target environment configurations are included in the WebLogic Deploy Tool
4040

4141
#### The WebLogic Kubernetes Operator targets
4242

43-
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/):
43+
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/):
4444

45-
- `wko` for [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/model-in-image/) deployments
46-
- `wko-dii` for Domain in Image deployments
47-
- `wko-pv` for Domain in PV deployments
45+
- `wko` and `wko4` for [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/model-in-image/) deployments
46+
- `wko-dii` and `wko4-dii` for Domain in Image deployments
47+
- `wko-pv`and `wko4-pv` for Domain in PV deployments
48+
49+
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.
4850

4951
Each of these targets provides this additional processing:
5052

@@ -57,9 +59,9 @@ In addition, the `wko` target will replace credentials in the model with referen
5759

5860
#### The Verrazzano targets
5961

60-
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/):
62+
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/):
6163

62-
- `vz` for [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/model-in-image/) deployments
64+
- `vz` for [Model in Image](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/model-in-image/) deployments
6365
- `vz-dii` for Domain in Image deployments
6466
- `vz-pv` for Domain in PV deployments
6567

@@ -101,7 +103,7 @@ WDT_MODEL_SECRETS_NAME_DIR_PAIRS=__weblogic-credentials__=/etc/my-secrets
101103
```
102104
For more details about using the `WDT_MODEL_SECRETS_NAME_DIR_PAIRS` environment variable, see [Model Tokens]({{< relref "/concepts/model#model-tokens" >}}) .
103105

104-
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.
106+
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.
105107

106108
#### The create secrets script
107109

@@ -130,6 +132,22 @@ kubernetes:
130132
```
131133
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.
132134

135+
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:
136+
```yaml
137+
kubernetes:
138+
domain:
139+
spec:
140+
domainHome: /etc/domainHome
141+
image: my-image
142+
clusters:
143+
- spec:
144+
clusterName: my-cluster
145+
replicas: 4
146+
- spec:
147+
clusterName: other-cluster
148+
replicas: 6
149+
```
150+
133151
### Target environment configuration files
134152

135153
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:
157175
"variable_injectors" : {"PORT": {},"HOST": {},"URL": {}},
158176
"validation_method" : "lax",
159177
"credentials_method" : "secrets",
160-
"credentials_output_method" : "script",
161178
"exclude_domain_bin_contents": true,
162179
"wls_credentials_name" : "__weblogic-credentials__",
163180
"use_persistent_volume" : true,
@@ -199,7 +216,7 @@ This field specifies a name for use with the WDT_MODEL_SECRETS_NAME_DIR_PAIRS en
199216

200217
#### `use_persistent_volume`
201218

202-
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.
219+
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.
203220

204221
#### `additional_secrets`
205222

0 commit comments

Comments
 (0)