Skip to content

Commit cc9b565

Browse files
doxiaodoxiao
committed
Merge branch 'master' into startup-control
2 parents 5b49fb0 + 96e9656 commit cc9b565

File tree

333 files changed

+6083
-4545
lines changed

Some content is hidden

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

333 files changed

+6083
-4545
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN mkdir /operator
77
ENV PATH=$PATH:/operator
88

99
COPY src/main/scripts/* /operator/
10-
COPY target/weblogic-kubernetes-operator-0.1.0-alpha-SNAPSHOT.jar /operator/weblogic-kubernetes-operator.jar
10+
COPY target/weblogic-kubernetes-operator-0.1.0.jar /operator/weblogic-kubernetes-operator.jar
1111

1212
HEALTHCHECK --interval=1m --timeout=10s \
1313
CMD /operator/livenessProbe.sh

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ The Oracle WebLogic Server Kubernetes Operator has the following requirements:
6969

7070
# Restrictions
7171

72-
The following features are not certified or supported in the Technology Preview release at the time of writing:
72+
The following features are not certified or supported in the technology preview release at the time of writing:
7373

7474
* Whole Server Migration
7575
* Consensus Leasing

‎docs/apidocs/allclasses-frame.html

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (9.0.4) on Thu Mar 01 06:15:24 EST 2018 -->
6-
<title>All Classes (weblogic-kubernetes-operator 0.1.0-alpha-SNAPSHOT API)</title>
5+
<!-- Generated by javadoc (9.0.4) on Mon Mar 05 17:06:03 EST 2018 -->
6+
<title>All Classes (weblogic-kubernetes-operator 0.1.0 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
8-
<meta name="date" content="2018-03-01">
8+
<meta name="date" content="2018-03-05">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1010
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
1111
<script type="text/javascript" src="script.js"></script>
@@ -34,6 +34,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
3434
<li><a href="oracle/kubernetes/operator/rest/resource/BaseResource.html" title="class in oracle.kubernetes.operator.rest.resource" target="classFrame">BaseResource</a></li>
3535
<li><a href="oracle/kubernetes/operator/helpers/CallBuilder.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">CallBuilder</a></li>
3636
<li><a href="oracle/kubernetes/operator/helpers/CallBuilder.RetryStrategy.html" title="interface in oracle.kubernetes.operator.helpers" target="classFrame"><span class="interfaceName">CallBuilder.RetryStrategy</span></a></li>
37+
<li><a href="oracle/kubernetes/operator/builders/CallParams.html" title="interface in oracle.kubernetes.operator.builders" target="classFrame"><span class="interfaceName">CallParams</span></a></li>
3738
<li><a href="oracle/kubernetes/operator/helpers/ClientHelper.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">ClientHelper</a></li>
3839
<li><a href="oracle/kubernetes/operator/helpers/ClientHolder.html" title="class in oracle.kubernetes.operator.helpers" target="classFrame">ClientHolder</a></li>
3940
<li><a href="oracle/kubernetes/operator/rest/model/ClusterModel.html" title="class in oracle.kubernetes.operator.rest.model" target="classFrame">ClusterModel</a></li>
@@ -122,7 +123,11 @@ <h1 class="bar">All&nbsp;Classes</h1>
122123
<li><a href="oracle/kubernetes/operator/rest/resource/VersionResource.html" title="class in oracle.kubernetes.operator.rest.resource" target="classFrame">VersionResource</a></li>
123124
<li><a href="oracle/kubernetes/operator/rest/resource/VersionsResource.html" title="class in oracle.kubernetes.operator.rest.resource" target="classFrame">VersionsResource</a></li>
124125
<li><a href="oracle/kubernetes/operator/rest/backend/VersionUtils.html" title="class in oracle.kubernetes.operator.rest.backend" target="classFrame">VersionUtils</a></li>
126+
<li><a href="oracle/kubernetes/operator/builders/WatchBuilder.html" title="class in oracle.kubernetes.operator.builders" target="classFrame">WatchBuilder</a></li>
127+
<li><a href="oracle/kubernetes/operator/builders/WatchBuilder.WatchFactory.html" title="interface in oracle.kubernetes.operator.builders" target="classFrame"><span class="interfaceName">WatchBuilder.WatchFactory</span></a></li>
125128
<li><a href="oracle/kubernetes/operator/watcher/Watcher.html" title="class in oracle.kubernetes.operator.watcher" target="classFrame">Watcher</a></li>
129+
<li><a href="oracle/kubernetes/operator/builders/WatchI.html" title="interface in oracle.kubernetes.operator.builders" target="classFrame"><span class="interfaceName">WatchI</span></a></li>
130+
<li><a href="oracle/kubernetes/operator/builders/WatchImpl.html" title="class in oracle.kubernetes.operator.builders" target="classFrame">WatchImpl</a></li>
126131
<li><a href="oracle/kubernetes/operator/watcher/Watching.html" title="interface in oracle.kubernetes.operator.watcher" target="classFrame"><span class="interfaceName">Watching</span></a></li>
127132
<li><a href="oracle/kubernetes/operator/watcher/WatchingEventDestination.html" title="interface in oracle.kubernetes.operator.watcher" target="classFrame"><span class="interfaceName">WatchingEventDestination</span></a></li>
128133
<li><a href="oracle/kubernetes/operator/domain/api/v1/WeblogicApi.html" title="class in oracle.kubernetes.operator.domain.api.v1" target="classFrame">WeblogicApi</a></li>

‎docs/apidocs/allclasses-noframe.html

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (9.0.4) on Thu Mar 01 06:15:24 EST 2018 -->
6-
<title>All Classes (weblogic-kubernetes-operator 0.1.0-alpha-SNAPSHOT API)</title>
5+
<!-- Generated by javadoc (9.0.4) on Mon Mar 05 17:06:03 EST 2018 -->
6+
<title>All Classes (weblogic-kubernetes-operator 0.1.0 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
8-
<meta name="date" content="2018-03-01">
8+
<meta name="date" content="2018-03-05">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1010
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
1111
<script type="text/javascript" src="script.js"></script>
@@ -34,6 +34,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
3434
<li><a href="oracle/kubernetes/operator/rest/resource/BaseResource.html" title="class in oracle.kubernetes.operator.rest.resource">BaseResource</a></li>
3535
<li><a href="oracle/kubernetes/operator/helpers/CallBuilder.html" title="class in oracle.kubernetes.operator.helpers">CallBuilder</a></li>
3636
<li><a href="oracle/kubernetes/operator/helpers/CallBuilder.RetryStrategy.html" title="interface in oracle.kubernetes.operator.helpers"><span class="interfaceName">CallBuilder.RetryStrategy</span></a></li>
37+
<li><a href="oracle/kubernetes/operator/builders/CallParams.html" title="interface in oracle.kubernetes.operator.builders"><span class="interfaceName">CallParams</span></a></li>
3738
<li><a href="oracle/kubernetes/operator/helpers/ClientHelper.html" title="class in oracle.kubernetes.operator.helpers">ClientHelper</a></li>
3839
<li><a href="oracle/kubernetes/operator/helpers/ClientHolder.html" title="class in oracle.kubernetes.operator.helpers">ClientHolder</a></li>
3940
<li><a href="oracle/kubernetes/operator/rest/model/ClusterModel.html" title="class in oracle.kubernetes.operator.rest.model">ClusterModel</a></li>
@@ -122,7 +123,11 @@ <h1 class="bar">All&nbsp;Classes</h1>
122123
<li><a href="oracle/kubernetes/operator/rest/resource/VersionResource.html" title="class in oracle.kubernetes.operator.rest.resource">VersionResource</a></li>
123124
<li><a href="oracle/kubernetes/operator/rest/resource/VersionsResource.html" title="class in oracle.kubernetes.operator.rest.resource">VersionsResource</a></li>
124125
<li><a href="oracle/kubernetes/operator/rest/backend/VersionUtils.html" title="class in oracle.kubernetes.operator.rest.backend">VersionUtils</a></li>
126+
<li><a href="oracle/kubernetes/operator/builders/WatchBuilder.html" title="class in oracle.kubernetes.operator.builders">WatchBuilder</a></li>
127+
<li><a href="oracle/kubernetes/operator/builders/WatchBuilder.WatchFactory.html" title="interface in oracle.kubernetes.operator.builders"><span class="interfaceName">WatchBuilder.WatchFactory</span></a></li>
125128
<li><a href="oracle/kubernetes/operator/watcher/Watcher.html" title="class in oracle.kubernetes.operator.watcher">Watcher</a></li>
129+
<li><a href="oracle/kubernetes/operator/builders/WatchI.html" title="interface in oracle.kubernetes.operator.builders"><span class="interfaceName">WatchI</span></a></li>
130+
<li><a href="oracle/kubernetes/operator/builders/WatchImpl.html" title="class in oracle.kubernetes.operator.builders">WatchImpl</a></li>
126131
<li><a href="oracle/kubernetes/operator/watcher/Watching.html" title="interface in oracle.kubernetes.operator.watcher"><span class="interfaceName">Watching</span></a></li>
127132
<li><a href="oracle/kubernetes/operator/watcher/WatchingEventDestination.html" title="interface in oracle.kubernetes.operator.watcher"><span class="interfaceName">WatchingEventDestination</span></a></li>
128133
<li><a href="oracle/kubernetes/operator/domain/api/v1/WeblogicApi.html" title="class in oracle.kubernetes.operator.domain.api.v1">WeblogicApi</a></li>

‎docs/apidocs/constant-values.html

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (9.0.4) on Thu Mar 01 06:15:23 EST 2018 -->
6-
<title>Constant Field Values (weblogic-kubernetes-operator 0.1.0-alpha-SNAPSHOT API)</title>
5+
<!-- Generated by javadoc (9.0.4) on Mon Mar 05 17:06:01 EST 2018 -->
6+
<title>Constant Field Values (weblogic-kubernetes-operator 0.1.0 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
8-
<meta name="date" content="2018-03-01">
8+
<meta name="date" content="2018-03-05">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1010
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
1111
<script type="text/javascript" src="script.js"></script>
@@ -21,7 +21,7 @@
2121
<script type="text/javascript"><!--
2222
try {
2323
if (location.href.indexOf('is-external=true') == -1) {
24-
parent.document.title="Constant Field Values (weblogic-kubernetes-operator 0.1.0-alpha-SNAPSHOT API)";
24+
parent.document.title="Constant Field Values (weblogic-kubernetes-operator 0.1.0 API)";
2525
}
2626
}
2727
catch(err) {
@@ -1431,32 +1431,6 @@ <h2 title="oracle.kubernetes">oracle.kubernetes.*</h2>
14311431
</li>
14321432
<li class="blockList">
14331433
<table class="constantsSummary" summary="Constant Field Values table, listing constant fields, and values">
1434-
<caption><span>oracle.kubernetes.operator.rest.<a href="oracle/kubernetes/operator/rest/BaseDebugLoggingFilter.html" title="class in oracle.kubernetes.operator.rest">BaseDebugLoggingFilter</a></span><span class="tabEnd">&nbsp;</span></caption>
1435-
<tr>
1436-
<th class="colFirst" scope="col">Modifier and Type</th>
1437-
<th class="colSecond" scope="col">Constant Field</th>
1438-
<th class="colLast" scope="col">Value</th>
1439-
</tr>
1440-
<tbody>
1441-
<tr class="altColor">
1442-
<td class="colFirst"><a name="oracle.kubernetes.operator.rest.BaseDebugLoggingFilter.FILTER_REQUEST_ENTITY">
1443-
<!-- -->
1444-
</a><code>protected&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/9/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
1445-
<th class="colSecond" scope="row"><code><a href="oracle/kubernetes/operator/rest/BaseDebugLoggingFilter.html#FILTER_REQUEST_ENTITY">FILTER_REQUEST_ENTITY</a></code></th>
1446-
<td class="colLast"><code>"FILTER_REQUEST_ENTITY"</code></td>
1447-
</tr>
1448-
<tr class="rowColor">
1449-
<td class="colFirst"><a name="oracle.kubernetes.operator.rest.BaseDebugLoggingFilter.FILTER_REQUEST_START_TIME">
1450-
<!-- -->
1451-
</a><code>protected&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/9/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
1452-
<th class="colSecond" scope="row"><code><a href="oracle/kubernetes/operator/rest/BaseDebugLoggingFilter.html#FILTER_REQUEST_START_TIME">FILTER_REQUEST_START_TIME</a></code></th>
1453-
<td class="colLast"><code>"FILTER_REQUEST_START_TIME"</code></td>
1454-
</tr>
1455-
</tbody>
1456-
</table>
1457-
</li>
1458-
<li class="blockList">
1459-
<table class="constantsSummary" summary="Constant Field Values table, listing constant fields, and values">
14601434
<caption><span>oracle.kubernetes.operator.rest.<a href="oracle/kubernetes/operator/rest/FilterPriorities.html" title="class in oracle.kubernetes.operator.rest">FilterPriorities</a></span><span class="tabEnd">&nbsp;</span></caption>
14611435
<tr>
14621436
<th class="colFirst" scope="col">Modifier and Type</th>
@@ -1594,6 +1568,6 @@ <h2 title="oracle.kubernetes">oracle.kubernetes.*</h2>
15941568
<!-- -->
15951569
</a></div>
15961570
<!-- ======== END OF BOTTOM NAVBAR ======= -->
1597-
<p class="legalCopy"><small>Copyright &#169; 2017&#x2013;2018. All rights reserved.</small></p>
1571+
<p class="legalCopy"><small><p>Copyright 2018, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. All rights reserved. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="http://oss.oracle.com/licenses/upl">http://oss.oracle.com/licenses/upl</a>.<p></small></p>
15981572
</body>
15991573
</html>

‎docs/apidocs/deprecated-list.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (9.0.4) on Thu Mar 01 06:15:24 EST 2018 -->
6-
<title>Deprecated List (weblogic-kubernetes-operator 0.1.0-alpha-SNAPSHOT API)</title>
5+
<!-- Generated by javadoc (9.0.4) on Mon Mar 05 17:06:03 EST 2018 -->
6+
<title>Deprecated List (weblogic-kubernetes-operator 0.1.0 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
8-
<meta name="date" content="2018-03-01">
8+
<meta name="date" content="2018-03-05">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1010
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
1111
<script type="text/javascript" src="script.js"></script>
@@ -21,7 +21,7 @@
2121
<script type="text/javascript"><!--
2222
try {
2323
if (location.href.indexOf('is-external=true') == -1) {
24-
parent.document.title="Deprecated List (weblogic-kubernetes-operator 0.1.0-alpha-SNAPSHOT API)";
24+
parent.document.title="Deprecated List (weblogic-kubernetes-operator 0.1.0 API)";
2525
}
2626
}
2727
catch(err) {
@@ -148,6 +148,6 @@ <h2 title="Contents">Contents</h2>
148148
<!-- -->
149149
</a></div>
150150
<!-- ======== END OF BOTTOM NAVBAR ======= -->
151-
<p class="legalCopy"><small>Copyright &#169; 2017&#x2013;2018. All rights reserved.</small></p>
151+
<p class="legalCopy"><small><p>Copyright 2018, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. All rights reserved. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="http://oss.oracle.com/licenses/upl">http://oss.oracle.com/licenses/upl</a>.<p></small></p>
152152
</body>
153153
</html>

‎docs/apidocs/help-doc.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (9.0.4) on Thu Mar 01 06:15:24 EST 2018 -->
6-
<title>API Help (weblogic-kubernetes-operator 0.1.0-alpha-SNAPSHOT API)</title>
5+
<!-- Generated by javadoc (9.0.4) on Mon Mar 05 17:06:03 EST 2018 -->
6+
<title>API Help (weblogic-kubernetes-operator 0.1.0 API)</title>
77
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
8-
<meta name="date" content="2018-03-01">
8+
<meta name="date" content="2018-03-05">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1010
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
1111
<script type="text/javascript" src="script.js"></script>
@@ -21,7 +21,7 @@
2121
<script type="text/javascript"><!--
2222
try {
2323
if (location.href.indexOf('is-external=true') == -1) {
24-
parent.document.title="API Help (weblogic-kubernetes-operator 0.1.0-alpha-SNAPSHOT API)";
24+
parent.document.title="API Help (weblogic-kubernetes-operator 0.1.0 API)";
2525
}
2626
}
2727
catch(err) {
@@ -253,6 +253,6 @@ <h2>Constant Field Values</h2>
253253
<!-- -->
254254
</a></div>
255255
<!-- ======== END OF BOTTOM NAVBAR ======= -->
256-
<p class="legalCopy"><small>Copyright &#169; 2017&#x2013;2018. All rights reserved.</small></p>
256+
<p class="legalCopy"><small><p>Copyright 2018, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. All rights reserved. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="http://oss.oracle.com/licenses/upl">http://oss.oracle.com/licenses/upl</a>.<p></small></p>
257257
</body>
258258
</html>

0 commit comments

Comments
 (0)