Skip to content

Commit 996c49d

Browse files
rjeberhardrjeberhard
committed
Merge branch 'v1.1'
2 parents 8f90f53 + c541045 commit 996c49d

File tree

965 files changed

+93985
-78766
lines changed

Some content is hidden

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

965 files changed

+93985
-78766
lines changed

‎Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#
44
# HOW TO BUILD THIS IMAGE
55
# -----------------------
6-
# Run:
7-
# $ docker build -t weblogic-kubernetes-operator:latest .
6+
# Run:
7+
# $ docker build -t weblogic-kubernetes-operator:latest .
88
#
99
# Pull base image
1010
# From the Docker store
@@ -19,8 +19,9 @@ RUN mkdir /operator
1919
RUN mkdir /operator/lib
2020
ENV PATH=$PATH:/operator
2121

22+
ARG VERSION
2223
COPY src/scripts/* /operator/
23-
COPY operator/target/weblogic-kubernetes-operator-1.0.jar /operator/weblogic-kubernetes-operator.jar
24+
COPY operator/target/weblogic-kubernetes-operator-$VERSION.jar /operator/weblogic-kubernetes-operator.jar
2425
COPY operator/target/lib/*.jar /operator/lib/
2526

2627
HEALTHCHECK --interval=1m --timeout=10s \

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,10 @@ For more information, see [Scaling a WebLogic cluster](site/scaling.md).
148148

149149
## Load balancing with an Ingress controller or a web server
150150

151-
You can choose a load balancer provider for your WebLogic domains running in a Kubernetes cluster. Please refer to [Load balancing with Voyager/HAProxy](site/voyager.md), [Load balancing with Traefik](site/traefik.md), and [Load balancing with the Apache HTTP Server](site/apache.md) for information about the current capabilities and setup instructions for each of the supported load balancers.
152-
151+
You can choose a load balancer provider for your WebLogic domains running in a Kubernetes cluster. Please refer to the following sections for information about the current capabilities and setup instructions for each of the supported load balancers.
152+
* [Load balancing with Voyager/HAProxy](site/voyager.md)
153+
* [Load balancing with Traefik](site/traefik.md)
154+
* [Load balancing with the Apache HTTP Server](site/apache.md)
153155

154156
[comment]: # (Exporting operator logs to ELK. The operator provides an option to export its log files to the ELK stack. Please refer to [ELK integration]site/elk.md for information about this capability.)
155157

‎docs/apidocs/allclasses-frame.html‎

Lines changed: 38 additions & 15 deletions
Large diffs are not rendered by default.

‎docs/apidocs/allclasses-noframe.html‎

Lines changed: 38 additions & 15 deletions
Large diffs are not rendered by default.

‎docs/apidocs/constant-values.html‎

Lines changed: 591 additions & 493 deletions
Large diffs are not rendered by default.

‎docs/apidocs/deprecated-list.html‎

Lines changed: 146 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,27 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (9.0.4) on Mon May 07 06:59:10 EDT 2018 -->
6-
<title>Deprecated List (operator-runtime 1.0 API)</title>
5+
<!-- Generated by javadoc (1.8.0_162) on Thu Aug 16 16:56:15 EDT 2018 -->
76
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
8-
<meta name="date" content="2018-05-07">
7+
<title>Deprecated List (weblogic-kubernetes-operator 1.1 API)</title>
8+
<meta name="date" content="2018-08-16">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
10-
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
1110
<script type="text/javascript" src="script.js"></script>
12-
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
13-
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
14-
<!--[if IE]>
15-
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
16-
<![endif]-->
17-
<script type="text/javascript" src="jquery/jquery-1.10.2.js"></script>
18-
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
1911
</head>
2012
<body>
2113
<script type="text/javascript"><!--
2214
try {
2315
if (location.href.indexOf('is-external=true') == -1) {
24-
parent.document.title="Deprecated List (operator-runtime 1.0 API)";
16+
parent.document.title="Deprecated List (weblogic-kubernetes-operator 1.1 API)";
2517
}
2618
}
2719
catch(err) {
2820
}
2921
//-->
30-
var pathtoroot = "./";loadScripts(document, 'script');</script>
22+
</script>
3123
<noscript>
3224
<div>JavaScript is disabled on your browser.</div>
3325
</noscript>
34-
<div class="fixedNav">
3526
<!-- ========= START OF TOP NAVBAR ======= -->
3627
<div class="topNav"><a name="navbar.top">
3728
<!-- -->
@@ -63,12 +54,6 @@
6354
<ul class="navList" id="allclasses_navbar_top">
6455
<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
6556
</ul>
66-
<ul class="navListSearch">
67-
<li><span>SEARCH:&nbsp;</span>
68-
<input type="text" id="search" value=" " disabled="disabled">
69-
<input type="reset" id="reset" value=" " disabled="disabled">
70-
</li>
71-
</ul>
7257
<div>
7358
<script type="text/javascript"><!--
7459
allClassesLink = document.getElementById("allclasses_navbar_top");
@@ -80,23 +65,155 @@
8065
}
8166
//-->
8267
</script>
83-
<noscript>
84-
<div>JavaScript is disabled on your browser.</div>
85-
</noscript>
8668
</div>
8769
<a name="skip.navbar.top">
8870
<!-- -->
8971
</a></div>
9072
<!-- ========= END OF TOP NAVBAR ========= -->
91-
</div>
92-
<div class="navPadding">&nbsp;</div>
93-
<script type="text/javascript"><!--
94-
$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
95-
//-->
96-
</script>
9773
<div class="header">
9874
<h1 title="Deprecated API" class="title">Deprecated API</h1>
9975
<h2 title="Contents">Contents</h2>
76+
<ul>
77+
<li><a href="#class">Deprecated Classes</a></li>
78+
<li><a href="#method">Deprecated Methods</a></li>
79+
</ul>
80+
</div>
81+
<div class="contentContainer"><a name="class">
82+
<!-- -->
83+
</a>
84+
<ul class="blockList">
85+
<li class="blockList">
86+
<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Classes table, listing deprecated classes, and an explanation">
87+
<caption><span>Deprecated Classes</span><span class="tabEnd">&nbsp;</span></caption>
88+
<tr>
89+
<th class="colOne" scope="col">Class and Description</th>
90+
</tr>
91+
<tbody>
92+
<tr class="altColor">
93+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/ClusterStartup.html" title="class in oracle.kubernetes.weblogic.domain.v1">oracle.kubernetes.weblogic.domain.v1.ClusterStartup</a>
94+
<div class="block"><span class="deprecationComment">Use the DomainSpec's clusters and clusterDefaults properties.</span></div>
95+
</td>
96+
</tr>
97+
<tr class="rowColor">
98+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/ServerStartup.html" title="class in oracle.kubernetes.weblogic.domain.v1">oracle.kubernetes.weblogic.domain.v1.ServerStartup</a>
99+
<div class="block"><span class="deprecationComment">Use the DomainSpec's servers, clusters, clusterDefaults, nonClusteredServerDefaults
100+
and serverDefaults properties.</span></div>
101+
</td>
102+
</tr>
103+
</tbody>
104+
</table>
105+
</li>
106+
</ul>
107+
<a name="method">
108+
<!-- -->
109+
</a>
110+
<ul class="blockList">
111+
<li class="blockList">
112+
<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Methods table, listing deprecated methods, and an explanation">
113+
<caption><span>Deprecated Methods</span><span class="tabEnd">&nbsp;</span></caption>
114+
<tr>
115+
<th class="colOne" scope="col">Method and Description</th>
116+
</tr>
117+
<tbody>
118+
<tr class="altColor">
119+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#getClusterStartup--">oracle.kubernetes.weblogic.domain.v1.DomainSpec.getClusterStartup()</a>
120+
<div class="block"><span class="deprecationComment">Use the clusters and clusterDefaults properties.</span></div>
121+
</td>
122+
</tr>
123+
<tr class="rowColor">
124+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#getImage--">oracle.kubernetes.weblogic.domain.v1.DomainSpec.getImage()</a></td>
125+
</tr>
126+
<tr class="altColor">
127+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#getImagePullPolicy--">oracle.kubernetes.weblogic.domain.v1.DomainSpec.getImagePullPolicy()</a>
128+
<div class="block"><span class="deprecationComment">Use the Server imagePullPolicy property.</span></div>
129+
</td>
130+
</tr>
131+
<tr class="rowColor">
132+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#getReplicas--">oracle.kubernetes.weblogic.domain.v1.DomainSpec.getReplicas()</a>
133+
<div class="block"><span class="deprecationComment">Use the clusterDefaults property's replicas property.</span></div>
134+
</td>
135+
</tr>
136+
<tr class="altColor">
137+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#getServerStartup--">oracle.kubernetes.weblogic.domain.v1.DomainSpec.getServerStartup()</a>
138+
<div class="block"><span class="deprecationComment">Use the servers, clusters, clusterDefaults, nonClusteredServerDefaults and
139+
serverDefaults properties.</span></div>
140+
</td>
141+
</tr>
142+
<tr class="rowColor">
143+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#getStartupControl--">oracle.kubernetes.weblogic.domain.v1.DomainSpec.getStartupControl()</a>
144+
<div class="block"><span class="deprecationComment">Use the servers, clusters, clusterDefaults, nonClusteredServerDefaults and
145+
serverDefaults properties.</span></div>
146+
</td>
147+
</tr>
148+
<tr class="altColor">
149+
<td class="colOne"><a href="oracle/kubernetes/operator/helpers/ResponseStep.html#onSuccess-oracle.kubernetes.operator.work.Packet-T-int-java.util.Map-">oracle.kubernetes.operator.helpers.ResponseStep.onSuccess(Packet, T, int, Map&lt;String, List&lt;String&gt;&gt;)</a>
150+
<div class="block"><span class="deprecationComment">use <a href="oracle/kubernetes/operator/helpers/ResponseStep.html#onSuccess-oracle.kubernetes.operator.work.Packet-oracle.kubernetes.operator.calls.CallResponse-"><code>ResponseStep.onSuccess(Packet, CallResponse)</code></a> instead</span></div>
151+
</td>
152+
</tr>
153+
<tr class="rowColor">
154+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#setClusterStartup-java.util.List-">oracle.kubernetes.weblogic.domain.v1.DomainSpec.setClusterStartup(List&lt;ClusterStartup&gt;)</a>
155+
<div class="block"><span class="deprecationComment">Use the clusters and clusterDefaults properties.</span></div>
156+
</td>
157+
</tr>
158+
<tr class="altColor">
159+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#setImage-java.lang.String-">oracle.kubernetes.weblogic.domain.v1.DomainSpec.setImage(String)</a></td>
160+
</tr>
161+
<tr class="rowColor">
162+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#setImagePullPolicy-java.lang.String-">oracle.kubernetes.weblogic.domain.v1.DomainSpec.setImagePullPolicy(String)</a>
163+
<div class="block"><span class="deprecationComment">Use the Server imagePullPolicy property.</span></div>
164+
</td>
165+
</tr>
166+
<tr class="altColor">
167+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#setReplicas-java.lang.Integer-">oracle.kubernetes.weblogic.domain.v1.DomainSpec.setReplicas(Integer)</a>
168+
<div class="block"><span class="deprecationComment">Use the clusterDefaults property's replicas property.</span></div>
169+
</td>
170+
</tr>
171+
<tr class="rowColor">
172+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#setServerStartup-java.util.List-">oracle.kubernetes.weblogic.domain.v1.DomainSpec.setServerStartup(List&lt;ServerStartup&gt;)</a>
173+
<div class="block"><span class="deprecationComment">Use the servers, clusters, clusterDefaults, nonClusteredServerDefaults and
174+
serverDefaults properties.</span></div>
175+
</td>
176+
</tr>
177+
<tr class="altColor">
178+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#setStartupControl-java.lang.String-">oracle.kubernetes.weblogic.domain.v1.DomainSpec.setStartupControl(String)</a>
179+
<div class="block"><span class="deprecationComment">Use the servers, clusters, clusterDefaults, nonClusteredServerDefaults and
180+
serverDefaults properties.</span></div>
181+
</td>
182+
</tr>
183+
<tr class="rowColor">
184+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#withClusterStartup-java.util.List-">oracle.kubernetes.weblogic.domain.v1.DomainSpec.withClusterStartup(List&lt;ClusterStartup&gt;)</a>
185+
<div class="block"><span class="deprecationComment">Use the clusters and clusterDefaults properties.</span></div>
186+
</td>
187+
</tr>
188+
<tr class="altColor">
189+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#withImage-java.lang.String-">oracle.kubernetes.weblogic.domain.v1.DomainSpec.withImage(String)</a></td>
190+
</tr>
191+
<tr class="rowColor">
192+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#withImagePullPolicy-java.lang.String-">oracle.kubernetes.weblogic.domain.v1.DomainSpec.withImagePullPolicy(String)</a>
193+
<div class="block"><span class="deprecationComment">Use the Server imagePullPolicy property.</span></div>
194+
</td>
195+
</tr>
196+
<tr class="altColor">
197+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#withReplicas-java.lang.Integer-">oracle.kubernetes.weblogic.domain.v1.DomainSpec.withReplicas(Integer)</a>
198+
<div class="block"><span class="deprecationComment">Use the clusterDefaults property's replicas property.</span></div>
199+
</td>
200+
</tr>
201+
<tr class="rowColor">
202+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#withServerStartup-java.util.List-">oracle.kubernetes.weblogic.domain.v1.DomainSpec.withServerStartup(List&lt;ServerStartup&gt;)</a>
203+
<div class="block"><span class="deprecationComment">Use the servers, clusters, clusterDefaults, nonClusteredServerDefaults and
204+
serverDefaults properties.</span></div>
205+
</td>
206+
</tr>
207+
<tr class="altColor">
208+
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#withStartupControl-java.lang.String-">oracle.kubernetes.weblogic.domain.v1.DomainSpec.withStartupControl(String)</a>
209+
<div class="block"><span class="deprecationComment">Use the servers, clusters, clusterDefaults, nonClusteredServerDefaults and
210+
serverDefaults properties.</span></div>
211+
</td>
212+
</tr>
213+
</tbody>
214+
</table>
215+
</li>
216+
</ul>
100217
</div>
101218
<!-- ======= START OF BOTTOM NAVBAR ====== -->
102219
<div class="bottomNav"><a name="navbar.bottom">
@@ -140,9 +257,6 @@ <h2 title="Contents">Contents</h2>
140257
}
141258
//-->
142259
</script>
143-
<noscript>
144-
<div>JavaScript is disabled on your browser.</div>
145-
</noscript>
146260
</div>
147261
<a name="skip.navbar.bottom">
148262
<!-- -->

‎docs/apidocs/help-doc.html‎

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,27 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (9.0.4) on Mon May 07 06:59:10 EDT 2018 -->
6-
<title>API Help (operator-runtime 1.0 API)</title>
5+
<!-- Generated by javadoc (1.8.0_162) on Thu Aug 16 16:56:15 EDT 2018 -->
76
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
8-
<meta name="date" content="2018-05-07">
7+
<title>API Help (weblogic-kubernetes-operator 1.1 API)</title>
8+
<meta name="date" content="2018-08-16">
99
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
10-
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
1110
<script type="text/javascript" src="script.js"></script>
12-
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
13-
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
14-
<!--[if IE]>
15-
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
16-
<![endif]-->
17-
<script type="text/javascript" src="jquery/jquery-1.10.2.js"></script>
18-
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
1911
</head>
2012
<body>
2113
<script type="text/javascript"><!--
2214
try {
2315
if (location.href.indexOf('is-external=true') == -1) {
24-
parent.document.title="API Help (operator-runtime 1.0 API)";
16+
parent.document.title="API Help (weblogic-kubernetes-operator 1.1 API)";
2517
}
2618
}
2719
catch(err) {
2820
}
2921
//-->
30-
var pathtoroot = "./";loadScripts(document, 'script');</script>
22+
</script>
3123
<noscript>
3224
<div>JavaScript is disabled on your browser.</div>
3325
</noscript>
34-
<div class="fixedNav">
3526
<!-- ========= START OF TOP NAVBAR ======= -->
3627
<div class="topNav"><a name="navbar.top">
3728
<!-- -->
@@ -63,12 +54,6 @@
6354
<ul class="navList" id="allclasses_navbar_top">
6455
<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
6556
</ul>
66-
<ul class="navListSearch">
67-
<li><span>SEARCH:&nbsp;</span>
68-
<input type="text" id="search" value=" " disabled="disabled">
69-
<input type="reset" id="reset" value=" " disabled="disabled">
70-
</li>
71-
</ul>
7257
<div>
7358
<script type="text/javascript"><!--
7459
allClassesLink = document.getElementById("allclasses_navbar_top");
@@ -80,20 +65,11 @@
8065
}
8166
//-->
8267
</script>
83-
<noscript>
84-
<div>JavaScript is disabled on your browser.</div>
85-
</noscript>
8668
</div>
8769
<a name="skip.navbar.top">
8870
<!-- -->
8971
</a></div>
9072
<!-- ========= END OF TOP NAVBAR ========= -->
91-
</div>
92-
<div class="navPadding">&nbsp;</div>
93-
<script type="text/javascript"><!--
94-
$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
95-
//-->
96-
</script>
9773
<div class="header">
9874
<h1 class="title">How This API Document Is Organized</h1>
9975
<div class="subTitle">This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.</div>
@@ -190,7 +166,7 @@ <h2>Frames/No Frames</h2>
190166
<p>These links show and hide the HTML frames. All pages are available with or without frames.</p>
191167
</li>
192168
<li class="blockList">
193-
<h2>All&nbsp;Classes</h2>
169+
<h2>All Classes</h2>
194170
<p>The <a href="allclasses-noframe.html">All Classes</a> link shows all classes and interfaces except non-static nested types.</p>
195171
</li>
196172
<li class="blockList">
@@ -245,9 +221,6 @@ <h2>Constant Field Values</h2>
245221
}
246222
//-->
247223
</script>
248-
<noscript>
249-
<div>JavaScript is disabled on your browser.</div>
250-
</noscript>
251224
</div>
252225
<a name="skip.navbar.bottom">
253226
<!-- -->

0 commit comments

Comments
 (0)