Skip to content

Commit 9a26190

Browse files
ddsharpeddsharpe
authored
Merge branch 'master' into allow-emptystring-key
2 parents a02b757 + c873913 commit 9a26190

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

‎README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Many organizations are using WebLogic Server, with or without other Oracle Fusio
1010
- [Discover Domain Tool](site/discover.md)
1111
- [Encrypt Model Tool](site/encrypt.md)
1212
- [Validate Model Tool](site/validate.md)
13+
- [Extract Domain Resource Tool](site/kubernetes.md)
1314
- [The Model](#the-metadata-model)
1415
- [Top-Level Sections](#top-level-model-sections)
1516
- [Simple Example](#simple-example)
@@ -53,6 +54,7 @@ Currently, the project provides five single-purpose tools, all exposed as shell
5354
- The [Discover Domain Tool](site/discover.md) (`discoverDomain`) introspects an existing domain and creates a model file describing the domain and an archive file of the binaries deployed to the domain.
5455
- The [Encrypt Model Tool](site/encrypt.md) (`encryptModel`) encrypts the passwords in a model (or its variable file) using a user-provided passphrase.
5556
- The [Validate Model Tool](site/validate.md) (`validateModel`) provides both standalone validation of a model as well as model usage information to help users write or edit their models.
57+
- The [Extract Domain Resource Tool](site/kubernetes.md) (`extractDomainResource`) generates a domain resource YAML for use with the Oracle WebLogic Server Kubernetes Operator.
5658

5759
As new use cases are discovered, new tools will likely be added to cover those operations but all will use the metadata model to describe what needs to be done.
5860

@@ -90,6 +92,7 @@ The tooling has four top-level model sections:
9092
- `topology` - The location where servers, clusters, machines, server templates, and other domain-level configuration is specified.
9193
- `resources` - The location where resources and services are specified (for example, data sources, JMS, WLDF).
9294
- `appDeployments` - The location where shared libraries and applications are specified.
95+
- `kubernetes` - The location where the WLS Kubernetes Operator domain configuration is specified.
9396

9497
##### Simple Example
9598
Here is a simple example of a model to deploy an application and its data source:

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/NMProperties.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.",
2+
"copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.",
33
"license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
44
"wlst_type": "NMProperties",
55
"wlst_mode": "offline",
@@ -15,17 +15,17 @@
1515
"CrashRecoveryEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CrashRecoveryEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
1616
"CustomIdentityAlias": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CustomIdentityAlias", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
1717
"CustomIdentityKeyStoreFileName": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CustomIdentityKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
18-
"CustomIdentityKeyStorePassPhrase": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CustomIdentityKeyStorePassPhrase", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "LSA" } ],
18+
"CustomIdentityKeyStorePassPhrase": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CustomIdentityKeyStorePassPhrase", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "GET" } ],
1919
"CustomIdentityKeyStoreType": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CustomIdentityKeyStoreType", "wlst_path": "WP001", "value": {"default": "java.security" }, "wlst_type": "string" } ],
20-
"CustomIdentityPrivateKeyPassPhrase": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CustomIdentityPrivateKeyPassPhrase", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "LSA" } ],
20+
"CustomIdentityPrivateKeyPassPhrase": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CustomIdentityPrivateKeyPassPhrase", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "GET" } ],
2121
"DomainRegistrationEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "DomainRegistrationEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
2222
"DomainsDirRemoteSharingEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "DomainsDirRemoteSharingEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
2323
"DomainsFile": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "DomainsFile", "wlst_path": "WP001", "value": {"default": "@@DOMAIN_HOME@@/nodemanager/nodemanager.domains" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
2424
"DomainsFileEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "DomainsFileEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
2525
"Interface": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "Interface", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
2626
"InterfaceName": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "InterfaceName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
2727
"JavaHome": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "JavaHome", "wlst_path": "WP001", "value": {"default": "@@JAVA_HOME@@" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
28-
"JavaStandardTrustKeyStorePassPhrase": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "JavaStandardTrustKeyStorePassPhrase", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "LSA" } ],
28+
"JavaStandardTrustKeyStorePassPhrase": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "JavaStandardTrustKeyStorePassPhrase", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "GET" } ],
2929
"KeyFile": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "KeyFile", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
3030
"KeyPassword": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "KeyPassword", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "LSA" } ],
3131
"KeyStores": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "KeyStores", "wlst_path": "WP001", "value": {"default": "DemoIdentityAndDemoTrust" }, "wlst_type": "string" } ],

0 commit comments

Comments
 (0)