Skip to content

Commit a201e19

Browse files
committed
Merge branch 'develop' into owls-72421
2 parents d9bccfa + 5778723 commit a201e19

File tree

967 files changed

+127489
-3025
lines changed

Some content is hidden

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

967 files changed

+127489
-3025
lines changed

README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,20 @@ Oracle is finding ways for organizations using WebLogic Server to run important
2020

2121
The fastest way to experience the operator is to follow the [Quick Start guide](site/quickstart.md), or you can peruse our [documentation](site), read our [blogs](https://blogs.oracle.com/fusionmiddlewaresupport/updated-weblogic-kubernetes-support-with-operator-20-v2), or try out the [samples](kubernetes/samples/README.md).
2222

23-
```diff
24-
+ The current release of the operator is 2.0-rc2, a release candidate for our 2.0 release.
25-
+ This release candidate was published on Jan. 16, 2019.
26-
+ We expect to publish the final 2.0 release later in January, 2019.
27-
+ We expect that there will be some minor changes to documentation and samples in the final 2.0 release.
28-
+ However, this release candidate is suitable for testing and early adopters.
29-
```
23+
***
24+
The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.0.1.
25+
This release was published on March 4, 2019.
26+
***
3027

3128
## Known issues
3229

3330
| Issue | Description |
3431
| --- | --- |
35-
| [#726](https://github.com/oracle/weblogic-kubernetes-operator/issues/726) | Clusters only support default channel. |
32+
| | |
33+
34+
## Operator version 2.0
35+
36+
Documentation for the 2.0 release of the operator is available [here](site/v2.0/README.md).
3637

3738
## Operator version 1.1
3839

@@ -171,5 +172,5 @@ $ helm repo update
171172
Install Operator from the repo:
172173
173174
```
174-
$ helm install helm install weblogic-operator/weblogic-operator --name weblogic-operator
175+
$ helm install weblogic-operator/weblogic-operator --name weblogic-operator
175176
```

buildtime-reports/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>operator-parent</artifactId>
77
<groupId>oracle.kubernetes</groupId>
8-
<version>2.1-SNAPSHOT</version>
8+
<version>2.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

docs/apidocs/allclasses-frame.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<!-- Generated by javadoc -->
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7-
<title>All Classes (operator-runtime 2.0-SNAPSHOT API)</title>
7+
<title>All Classes (operator-runtime 2.0.1 API)</title>
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>
@@ -46,14 +46,14 @@ <h1 class="bar">All&nbsp;Classes</h1>
4646
<li><a href="oracle/kubernetes/operator/work/Component.html" title="interface in oracle.kubernetes.operator.work" target="classFrame"><span class="interfaceName">Component</span></a></li>
4747
<li><a href="oracle/kubernetes/operator/work/ComponentEx.html" title="interface in oracle.kubernetes.operator.work" target="classFrame"><span class="interfaceName">ComponentEx</span></a></li>
4848
<li><a href="oracle/kubernetes/operator/work/ComponentRegistry.html" title="interface in oracle.kubernetes.operator.work" target="classFrame"><span class="interfaceName">ComponentRegistry</span></a></li>
49-
<li><a href="oracle/kubernetes/operator/utils/ConcurrentWeakHashMap.html" title="class in oracle.kubernetes.operator.utils" target="classFrame">ConcurrentWeakHashMap</a></li>
5049
<li><a href="oracle/kubernetes/operator/steps/ConfigMapAfterStep.html" title="class in oracle.kubernetes.operator.steps" target="classFrame">ConfigMapAfterStep</a></li>
5150
<li><a href="oracle/kubernetes/operator/helpers/ConfigMapConsumer.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">ConfigMapConsumer</a></li>
5251
<li><a href="oracle/kubernetes/operator/helpers/ConfigMapHelper.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">ConfigMapHelper</a></li>
5352
<li><a href="oracle/kubernetes/operator/helpers/ConfigMapHelper.DomainTopology.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">ConfigMapHelper.DomainTopology</a></li>
5453
<li><a href="oracle/kubernetes/operator/helpers/ConfigMapHelper.SitConfigMapContext.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">ConfigMapHelper.SitConfigMapContext</a></li>
5554
<li><a href="oracle/kubernetes/operator/ConfigMapWatcher.html" title="class in oracle.kubernetes.operator" target="classFrame">ConfigMapWatcher</a></li>
5655
<li><a href="oracle/kubernetes/operator/wlsconfig/ConfigUpdate.html" title="interface in oracle.kubernetes.operator.wlsconfig" target="classFrame"><span class="interfaceName">ConfigUpdate</span></a></li>
56+
<li><a href="oracle/kubernetes/operator/helpers/ConflictRetry.html" title="interface in oracle.kubernetes.operator.helpers" target="classFrame"><span class="interfaceName">ConflictRetry</span></a></li>
5757
<li><a href="oracle/kubernetes/operator/work/Container.html" title="class in oracle.kubernetes.operator.work" target="classFrame">Container</a></li>
5858
<li><a href="oracle/kubernetes/operator/work/ContainerResolver.html" title="class in oracle.kubernetes.operator.work" target="classFrame">ContainerResolver</a></li>
5959
<li><a href="oracle/kubernetes/operator/helpers/CRDHelper.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">CRDHelper</a></li>
@@ -91,6 +91,10 @@ <h1 class="bar">All&nbsp;Classes</h1>
9191
<li><a href="oracle/kubernetes/operator/helpers/JobHelper.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">JobHelper</a></li>
9292
<li><a href="oracle/kubernetes/operator/helpers/JobStepContext.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">JobStepContext</a></li>
9393
<li><a href="oracle/kubernetes/operator/JobWatcher.html" title="class in oracle.kubernetes.operator" target="classFrame">JobWatcher</a></li>
94+
<li><a href="oracle/kubernetes/operator/utils/KubernetesExec.html" title="class in oracle.kubernetes.operator.utils" target="classFrame">KubernetesExec</a></li>
95+
<li><a href="oracle/kubernetes/operator/utils/KubernetesExecFactory.html" title="interface in oracle.kubernetes.operator.utils" target="classFrame"><span class="interfaceName">KubernetesExecFactory</span></a></li>
96+
<li><a href="oracle/kubernetes/operator/utils/KubernetesExecFactoryImpl.html" title="class in oracle.kubernetes.operator.utils" target="classFrame">KubernetesExecFactoryImpl</a></li>
97+
<li><a href="oracle/kubernetes/operator/utils/KubernetesExecFactoryImpl.KubernetesExecImpl.html" title="class in oracle.kubernetes.operator.utils" target="classFrame">KubernetesExecFactoryImpl.KubernetesExecImpl</a></li>
9498
<li><a href="oracle/kubernetes/operator/helpers/KubernetesVersion.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">KubernetesVersion</a></li>
9599
<li><a href="oracle/kubernetes/operator/helpers/LegalNames.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">LegalNames</a></li>
96100
<li><a href="oracle/kubernetes/operator/rest/model/LinkContainerModel.html" title="class in oracle.kubernetes.operator.rest.model" target="classFrame">LinkContainerModel</a></li>
@@ -110,6 +114,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
110114
<li><a href="oracle/kubernetes/operator/helpers/NonClusteredServerConfig.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">NonClusteredServerConfig</a></li>
111115
<li><a href="oracle/kubernetes/operator/OperatorLiveness.html" title="class in oracle.kubernetes.operator" target="classFrame">OperatorLiveness</a></li>
112116
<li><a href="oracle/kubernetes/operator/work/Packet.html" title="class in oracle.kubernetes.operator.work" target="classFrame">Packet</a></li>
117+
<li><a href="oracle/kubernetes/operator/utils/PatchUtils.html" title="class in oracle.kubernetes.operator.utils" target="classFrame">PatchUtils</a></li>
113118
<li><a href="oracle/kubernetes/operator/PodAwaiterStepFactory.html" title="interface in oracle.kubernetes.operator" target="classFrame"><span class="interfaceName">PodAwaiterStepFactory</span></a></li>
114119
<li><a href="oracle/kubernetes/operator/helpers/PodHelper.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">PodHelper</a></li>
115120
<li><a href="oracle/kubernetes/operator/helpers/PodStepContext.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">PodStepContext</a></li>
@@ -146,6 +151,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
146151
<li><a href="oracle/kubernetes/operator/work/Step.html" title="class in oracle.kubernetes.operator.work" target="classFrame">Step</a></li>
147152
<li><a href="oracle/kubernetes/operator/work/Step.MultiThrowable.html" title="class in oracle.kubernetes.operator.work" target="classFrame">Step.MultiThrowable</a></li>
148153
<li><a href="oracle/kubernetes/operator/work/Step.StepAndPacket.html" title="class in oracle.kubernetes.operator.work" target="classFrame">Step.StepAndPacket</a></li>
154+
<li><a href="oracle/kubernetes/operator/helpers/StepContextBase.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">StepContextBase</a></li>
149155
<li><a href="oracle/kubernetes/operator/helpers/StepContextConstants.html" title="interface in oracle.kubernetes.operator.helpers" target="classFrame"><span class="interfaceName">StepContextConstants</span></a></li>
150156
<li><a href="oracle/kubernetes/operator/rest/resource/SwaggerResource.html" title="class in oracle.kubernetes.operator.rest.resource" target="classFrame">SwaggerResource</a></li>
151157
<li><a href="oracle/kubernetes/operator/calls/SynchronousCallDispatcher.html" title="interface in oracle.kubernetes.operator.calls" target="classFrame"><span class="interfaceName">SynchronousCallDispatcher</span></a></li>

docs/apidocs/allclasses-noframe.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<!-- Generated by javadoc -->
66
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
7-
<title>All Classes (operator-runtime 2.0-SNAPSHOT API)</title>
7+
<title>All Classes (operator-runtime 2.0.1 API)</title>
88
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
99
<script type="text/javascript" src="script.js"></script>
1010
</head>
@@ -46,14 +46,14 @@ <h1 class="bar">All&nbsp;Classes</h1>
4646
<li><a href="oracle/kubernetes/operator/work/Component.html" title="interface in oracle.kubernetes.operator.work"><span class="interfaceName">Component</span></a></li>
4747
<li><a href="oracle/kubernetes/operator/work/ComponentEx.html" title="interface in oracle.kubernetes.operator.work"><span class="interfaceName">ComponentEx</span></a></li>
4848
<li><a href="oracle/kubernetes/operator/work/ComponentRegistry.html" title="interface in oracle.kubernetes.operator.work"><span class="interfaceName">ComponentRegistry</span></a></li>
49-
<li><a href="oracle/kubernetes/operator/utils/ConcurrentWeakHashMap.html" title="class in oracle.kubernetes.operator.utils">ConcurrentWeakHashMap</a></li>
5049
<li><a href="oracle/kubernetes/operator/steps/ConfigMapAfterStep.html" title="class in oracle.kubernetes.operator.steps">ConfigMapAfterStep</a></li>
5150
<li><a href="oracle/kubernetes/operator/helpers/ConfigMapConsumer.html" title="class in oracle.kubernetes.operator.helpers">ConfigMapConsumer</a></li>
5251
<li><a href="oracle/kubernetes/operator/helpers/ConfigMapHelper.html" title="class in oracle.kubernetes.operator.helpers">ConfigMapHelper</a></li>
5352
<li><a href="oracle/kubernetes/operator/helpers/ConfigMapHelper.DomainTopology.html" title="class in oracle.kubernetes.operator.helpers">ConfigMapHelper.DomainTopology</a></li>
5453
<li><a href="oracle/kubernetes/operator/helpers/ConfigMapHelper.SitConfigMapContext.html" title="class in oracle.kubernetes.operator.helpers">ConfigMapHelper.SitConfigMapContext</a></li>
5554
<li><a href="oracle/kubernetes/operator/ConfigMapWatcher.html" title="class in oracle.kubernetes.operator">ConfigMapWatcher</a></li>
5655
<li><a href="oracle/kubernetes/operator/wlsconfig/ConfigUpdate.html" title="interface in oracle.kubernetes.operator.wlsconfig"><span class="interfaceName">ConfigUpdate</span></a></li>
56+
<li><a href="oracle/kubernetes/operator/helpers/ConflictRetry.html" title="interface in oracle.kubernetes.operator.helpers"><span class="interfaceName">ConflictRetry</span></a></li>
5757
<li><a href="oracle/kubernetes/operator/work/Container.html" title="class in oracle.kubernetes.operator.work">Container</a></li>
5858
<li><a href="oracle/kubernetes/operator/work/ContainerResolver.html" title="class in oracle.kubernetes.operator.work">ContainerResolver</a></li>
5959
<li><a href="oracle/kubernetes/operator/helpers/CRDHelper.html" title="class in oracle.kubernetes.operator.helpers">CRDHelper</a></li>
@@ -91,6 +91,10 @@ <h1 class="bar">All&nbsp;Classes</h1>
9191
<li><a href="oracle/kubernetes/operator/helpers/JobHelper.html" title="class in oracle.kubernetes.operator.helpers">JobHelper</a></li>
9292
<li><a href="oracle/kubernetes/operator/helpers/JobStepContext.html" title="class in oracle.kubernetes.operator.helpers">JobStepContext</a></li>
9393
<li><a href="oracle/kubernetes/operator/JobWatcher.html" title="class in oracle.kubernetes.operator">JobWatcher</a></li>
94+
<li><a href="oracle/kubernetes/operator/utils/KubernetesExec.html" title="class in oracle.kubernetes.operator.utils">KubernetesExec</a></li>
95+
<li><a href="oracle/kubernetes/operator/utils/KubernetesExecFactory.html" title="interface in oracle.kubernetes.operator.utils"><span class="interfaceName">KubernetesExecFactory</span></a></li>
96+
<li><a href="oracle/kubernetes/operator/utils/KubernetesExecFactoryImpl.html" title="class in oracle.kubernetes.operator.utils">KubernetesExecFactoryImpl</a></li>
97+
<li><a href="oracle/kubernetes/operator/utils/KubernetesExecFactoryImpl.KubernetesExecImpl.html" title="class in oracle.kubernetes.operator.utils">KubernetesExecFactoryImpl.KubernetesExecImpl</a></li>
9498
<li><a href="oracle/kubernetes/operator/helpers/KubernetesVersion.html" title="class in oracle.kubernetes.operator.helpers">KubernetesVersion</a></li>
9599
<li><a href="oracle/kubernetes/operator/helpers/LegalNames.html" title="class in oracle.kubernetes.operator.helpers">LegalNames</a></li>
96100
<li><a href="oracle/kubernetes/operator/rest/model/LinkContainerModel.html" title="class in oracle.kubernetes.operator.rest.model">LinkContainerModel</a></li>
@@ -110,6 +114,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
110114
<li><a href="oracle/kubernetes/operator/helpers/NonClusteredServerConfig.html" title="class in oracle.kubernetes.operator.helpers">NonClusteredServerConfig</a></li>
111115
<li><a href="oracle/kubernetes/operator/OperatorLiveness.html" title="class in oracle.kubernetes.operator">OperatorLiveness</a></li>
112116
<li><a href="oracle/kubernetes/operator/work/Packet.html" title="class in oracle.kubernetes.operator.work">Packet</a></li>
117+
<li><a href="oracle/kubernetes/operator/utils/PatchUtils.html" title="class in oracle.kubernetes.operator.utils">PatchUtils</a></li>
113118
<li><a href="oracle/kubernetes/operator/PodAwaiterStepFactory.html" title="interface in oracle.kubernetes.operator"><span class="interfaceName">PodAwaiterStepFactory</span></a></li>
114119
<li><a href="oracle/kubernetes/operator/helpers/PodHelper.html" title="class in oracle.kubernetes.operator.helpers">PodHelper</a></li>
115120
<li><a href="oracle/kubernetes/operator/helpers/PodStepContext.html" title="class in oracle.kubernetes.operator.helpers">PodStepContext</a></li>
@@ -146,6 +151,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
146151
<li><a href="oracle/kubernetes/operator/work/Step.html" title="class in oracle.kubernetes.operator.work">Step</a></li>
147152
<li><a href="oracle/kubernetes/operator/work/Step.MultiThrowable.html" title="class in oracle.kubernetes.operator.work">Step.MultiThrowable</a></li>
148153
<li><a href="oracle/kubernetes/operator/work/Step.StepAndPacket.html" title="class in oracle.kubernetes.operator.work">Step.StepAndPacket</a></li>
154+
<li><a href="oracle/kubernetes/operator/helpers/StepContextBase.html" title="class in oracle.kubernetes.operator.helpers">StepContextBase</a></li>
149155
<li><a href="oracle/kubernetes/operator/helpers/StepContextConstants.html" title="interface in oracle.kubernetes.operator.helpers"><span class="interfaceName">StepContextConstants</span></a></li>
150156
<li><a href="oracle/kubernetes/operator/rest/resource/SwaggerResource.html" title="class in oracle.kubernetes.operator.rest.resource">SwaggerResource</a></li>
151157
<li><a href="oracle/kubernetes/operator/calls/SynchronousCallDispatcher.html" title="interface in oracle.kubernetes.operator.calls"><span class="interfaceName">SynchronousCallDispatcher</span></a></li>

0 commit comments

Comments
 (0)