Skip to content

Commit 667bd1a

Browse files
committed
Merge branch 'develop' into sitConfigMS
2 parents 247c893 + 655f8f7 commit 667bd1a

File tree

57 files changed

+2482
-849
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2482
-849
lines changed

docs-source/content/release-notes.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ draft: false
1212
| March 4, 2019 | v2.0.1 | no | OpenShift support is now certified. Many bug fixes, including fixes for configuration overrides, cluster services, and domain status processing.
1313
| January 24, 2019 | v2.0 | yes; not compatible with 1.x releases, but is compatible with 2.0-rc2. | Final version numbers and documentation updates.
1414
| January 16, 2019 | v2.0-rc2 | yes | Schema updates are completed, and various bugs fixed.
15-
| December 20, 2018 | v2.0-rc1 | yes | Operator is now installed via Helm charts, replacing the earlier scripts. The operator now supports the domain home on persistent volume or in Docker image use cases, which required a redesign of the domain schema. You can override the domain configuration using configuration override templates. Now load balancers and Ingresses can be independently configured. You can direct WebLogic logs to a persistent volume or to the pod's log. Added lifecycle support for servers and significantly enhanced configurability for generated pods. The final v2.0 release will be the initial release where the operator team intends to provide backward compatibility as part of future releases.
16-
| March 20, 2018 | v1.1 | yes | Several files and input parameters have been renamed. This affects how operators and domains are created. It also changes generated Kubernetes artifacts, therefore customers must recreate their operators and domains.
17-
| April 4, 2018 | v1.0 | yes | Many Kubernetes artifact names and labels have changed. Also, the names of generated YAML files for creating a domain's PV and PVC have changed. Because of these changes, customers must recreate their operators and domains.
18-
| May 7, 2018 | | no | Added support for dynamic clusters, the Apache HTTP Server, the Voyager Ingress Controller, and for PV in NFS storage for multi-node environments.
15+
| December 20, 2018 | v2.0-rc1 | yes | Operator is now installed via Helm charts, replacing the earlier scripts. The operator now supports the domain home on persistent volume or in Docker image use cases, which required a redesign of the domain schema. You can override the domain configuration using configuration override templates. Now load balancers and Ingresses can be independently configured. You can direct WebLogic logs to a persistent volume or to the pod's log. Added life cycle support for servers and significantly enhanced configurability for generated pods. The final v2.0 release will be the initial release where the operator team intends to provide backward compatibility as part of future releases.
16+
| September 11, 2018 | v1.1 | no | Enhanced the documentation and fixed various bugs.
17+
| May 7, 2018 | v1.0 | no | Added support for dynamic clusters, the Apache HTTP Server, the Voyager Ingress Controller, and for PV in NFS storage for multi-node environments.
18+
| April 4, 2018 | 0.2 | yes | Many Kubernetes artifact names and labels have changed. Also, the names of generated YAML files for creating a domain's PV and PVC have changed. Because of these changes, customers must recreate their operators and domains.
19+
| March 20, 2018 | | yes | Several files and input parameters have been renamed. This affects how operators and domains are created. It also changes generated Kubernetes artifacts, therefore customers must recreate their operators and domains.
1920

2021
### Known issues
2122

docs-source/content/security/secrets.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ description: "Kubernetes secrets for the WebLogic operator"
88
#### Contents
99
* [WebLogic domain credentials secret](#weblogic-domain-credentials-secret)
1010
* [WebLogic domain image pull secret](#weblogic-domain-image-pull-secret)
11+
* [WebLogic operator image pull secret](#weblogic-operator-image-pull-secret)
1112
* [WebLogic operator configuration override secrets](#weblogic-operator-configuration-override-secrets)
1213
* [WebLogic operator external REST interface secret](#weblogic-operator-external-rest-interface-secret)
1314
* [WebLogic operator internal REST interface secret](#weblogic-operator-internal-rest-interface-secret)
@@ -71,14 +72,36 @@ username: 8 bytes
7172
#### WebLogic domain image pull secret
7273

7374
The WebLogic domain that the operator manages can have images that are protected
74-
in the registry. The `imagePullSecrets` setting can be used to specify the
75+
in the registry. The `imagePullSecrets` setting on the `Domain` can be used to specify the
7576
Kubernetes `Secret` that holds the registry credentials.
7677

7778
{{% notice info %}}
7879
For more information, see [Docker Image Protection]({{<relref "/security/domain-security/image-protection.md#weblogic-domain-in-docker-image-protection">}})
7980
under **Domain security**.
8081
{{% /notice %}}
8182

83+
#### WebLogic operator image pull secret
84+
85+
The Helm chart for installing the operator has an option to specify the
86+
image pull secret used for the operator's image when using a private registry.
87+
The Kubernetes `Secret` of type `docker-registry` should be created in the namespace
88+
where the operator is deployed.
89+
90+
Here is an example of using the `helm install` command to set the image name and image pull secret:
91+
```bash
92+
$ helm install kubernetes/charts/weblogic-operator \
93+
--set "image=my.io/my-operator-image:1.0" \
94+
--set "imagePullSecrets[0].name=my-operator-image-pull-secret" \
95+
--name my-weblogic-operator --namespace weblogic-operator-ns \
96+
--wait
97+
```
98+
99+
{{% notice info %}}
100+
For more information, see
101+
[Install the operator Helm chart]({{<relref "/userguide/managing-operators/installation/_index.md#install-the-operator-helm-chart">}})
102+
under **User Guide**.
103+
{{% /notice %}}
104+
82105
#### WebLogic operator configuration override secrets
83106

84107
The WebLogic operator supports embedding macros within configuration override templates

docs-source/content/userguide/managing-operators/installation/_index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ If `weblogic-operator-namespace` exists, then it will be used. If it does not e
4040

4141
You can verify the operator installation by examining the output from the `helm install` command.
4242

43+
{{% notice note %}}
44+
When the operator image is stored in a private registry, see
45+
[WebLogic operator image pull secret]({{<relref "/security/secrets.md#weblogic-operator-image-pull-secret">}})
46+
for more information on specifying the registry credentials.
47+
{{% /notice %}}
48+
4349
#### Alternatively, install the operator Helm chart from GitHub chart repository
4450

4551
Add this repository to the Helm installation:

integration-tests/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ Configuration Overrides Usecases
9797
| JMS Resource Override | Override UniformDistributedTopic Delivery Failure Parameters, `redelivery-limit` and `expiration-policy`. The JMX test client verifies the serverConfig MBean tree for the expected delivery failure parameters, `redelivery-limit` and `expiration-policy`. |
9898
| WLDF Resource Override | Override `wldf-instrumentation-monitor` and `harvester` in a diagnostics module. The test client verifies the new instrumentation monitors/harvesters set by getting the WLDF resource from serverConfig tree with expected values. |
9999

100+
| Session Migration | Use Case |
101+
| --- | --- |
102+
| Primary Server Repick | A backup server becomes the primary server when a primary server fails|
103+
| HTTP Session Migration | Verify in-memory HTTP session State replication |
100104

101105
# Directory Configuration and Structure
102106

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public class BaseTest {
6363
private static String leaseId = "";
6464
private static String branchName = "";
6565
private static String appLocationInPod = "/u01/oracle/apps";
66+
private static String appLocationOnHost;
6667
private static Properties appProps;
6768

6869
// Set QUICKTEST env var to true to run a small subset of tests.
@@ -183,6 +184,8 @@ public static void initialize(String appPropsFile) throws Exception {
183184
}
184185
}
185186

187+
appLocationOnHost = getProjectRoot() + "/integration-tests/src/test/resources/apps";
188+
186189
logger.info("appProps = " + appProps);
187190
logger.info("maxIterationPod = " + appProps.getProperty("maxIterationsPod"));
188191
logger.info(
@@ -545,6 +548,14 @@ public static String getBranchName() {
545548
return branchName;
546549
}
547550

551+
public static String getAppLocationInPod() {
552+
return appLocationInPod;
553+
}
554+
555+
public static String getAppLocationOnHost() {
556+
return appLocationOnHost;
557+
}
558+
548559
private void copyScalingScriptToPod(
549560
String dirPathToCreate, String domainUID, String podName, String domainNS) throws Exception {
550561

0 commit comments

Comments
 (0)