Skip to content

Commit

Permalink
Merge branch 'v1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
rjeberhard committed Sep 11, 2018
2 parents 8f90f53 + c541045 commit 996c49d
Show file tree
Hide file tree
Showing 965 changed files with 93,985 additions and 78,766 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#
# HOW TO BUILD THIS IMAGE
# -----------------------
# Run:
# $ docker build -t weblogic-kubernetes-operator:latest .
# Run:
# $ docker build -t weblogic-kubernetes-operator:latest .
#
# Pull base image
# From the Docker store
Expand All @@ -19,8 +19,9 @@ RUN mkdir /operator
RUN mkdir /operator/lib
ENV PATH=$PATH:/operator

ARG VERSION
COPY src/scripts/* /operator/
COPY operator/target/weblogic-kubernetes-operator-1.0.jar /operator/weblogic-kubernetes-operator.jar
COPY operator/target/weblogic-kubernetes-operator-$VERSION.jar /operator/weblogic-kubernetes-operator.jar
COPY operator/target/lib/*.jar /operator/lib/

HEALTHCHECK --interval=1m --timeout=10s \
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,10 @@ For more information, see [Scaling a WebLogic cluster](site/scaling.md).

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

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.

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.
* [Load balancing with Voyager/HAProxy](site/voyager.md)
* [Load balancing with Traefik](site/traefik.md)
* [Load balancing with the Apache HTTP Server](site/apache.md)

[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.)

Expand Down
53 changes: 38 additions & 15 deletions docs/apidocs/allclasses-frame.html

Large diffs are not rendered by default.

53 changes: 38 additions & 15 deletions docs/apidocs/allclasses-noframe.html

Large diffs are not rendered by default.

1,084 changes: 591 additions & 493 deletions docs/apidocs/constant-values.html

Large diffs are not rendered by default.

178 changes: 146 additions & 32 deletions docs/apidocs/deprecated-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,27 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (9.0.4) on Mon May 07 06:59:10 EDT 2018 -->
<title>Deprecated List (operator-runtime 1.0 API)</title>
<!-- Generated by javadoc (1.8.0_162) on Thu Aug 16 16:56:15 EDT 2018 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="date" content="2018-05-07">
<title>Deprecated List (weblogic-kubernetes-operator 1.1 API)</title>
<meta name="date" content="2018-08-16">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-1.10.2.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
</head>
<body>
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="Deprecated List (operator-runtime 1.0 API)";
parent.document.title="Deprecated List (weblogic-kubernetes-operator 1.1 API)";
}
}
catch(err) {
}
//-->
var pathtoroot = "./";loadScripts(document, 'script');</script>
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
<div class="fixedNav">
<!-- ========= START OF TOP NAVBAR ======= -->
<div class="topNav"><a name="navbar.top">
<!-- -->
Expand Down Expand Up @@ -63,12 +54,6 @@
<ul class="navList" id="allclasses_navbar_top">
<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
</ul>
<ul class="navListSearch">
<li><span>SEARCH:&nbsp;</span>
<input type="text" id="search" value=" " disabled="disabled">
<input type="reset" id="reset" value=" " disabled="disabled">
</li>
</ul>
<div>
<script type="text/javascript"><!--
allClassesLink = document.getElementById("allclasses_navbar_top");
Expand All @@ -80,23 +65,155 @@
}
//-->
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
</div>
<a name="skip.navbar.top">
<!-- -->
</a></div>
<!-- ========= END OF TOP NAVBAR ========= -->
</div>
<div class="navPadding">&nbsp;</div>
<script type="text/javascript"><!--
$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
//-->
</script>
<div class="header">
<h1 title="Deprecated API" class="title">Deprecated API</h1>
<h2 title="Contents">Contents</h2>
<ul>
<li><a href="#class">Deprecated Classes</a></li>
<li><a href="#method">Deprecated Methods</a></li>
</ul>
</div>
<div class="contentContainer"><a name="class">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Classes table, listing deprecated classes, and an explanation">
<caption><span>Deprecated Classes</span><span class="tabEnd">&nbsp;</span></caption>
<tr>
<th class="colOne" scope="col">Class and Description</th>
</tr>
<tbody>
<tr class="altColor">
<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>
<div class="block"><span class="deprecationComment">Use the DomainSpec's clusters and clusterDefaults properties.</span></div>
</td>
</tr>
<tr class="rowColor">
<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>
<div class="block"><span class="deprecationComment">Use the DomainSpec's servers, clusters, clusterDefaults, nonClusteredServerDefaults
and serverDefaults properties.</span></div>
</td>
</tr>
</tbody>
</table>
</li>
</ul>
<a name="method">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Methods table, listing deprecated methods, and an explanation">
<caption><span>Deprecated Methods</span><span class="tabEnd">&nbsp;</span></caption>
<tr>
<th class="colOne" scope="col">Method and Description</th>
</tr>
<tbody>
<tr class="altColor">
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#getClusterStartup--">oracle.kubernetes.weblogic.domain.v1.DomainSpec.getClusterStartup()</a>
<div class="block"><span class="deprecationComment">Use the clusters and clusterDefaults properties.</span></div>
</td>
</tr>
<tr class="rowColor">
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#getImage--">oracle.kubernetes.weblogic.domain.v1.DomainSpec.getImage()</a></td>
</tr>
<tr class="altColor">
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#getImagePullPolicy--">oracle.kubernetes.weblogic.domain.v1.DomainSpec.getImagePullPolicy()</a>
<div class="block"><span class="deprecationComment">Use the Server imagePullPolicy property.</span></div>
</td>
</tr>
<tr class="rowColor">
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#getReplicas--">oracle.kubernetes.weblogic.domain.v1.DomainSpec.getReplicas()</a>
<div class="block"><span class="deprecationComment">Use the clusterDefaults property's replicas property.</span></div>
</td>
</tr>
<tr class="altColor">
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#getServerStartup--">oracle.kubernetes.weblogic.domain.v1.DomainSpec.getServerStartup()</a>
<div class="block"><span class="deprecationComment">Use the servers, clusters, clusterDefaults, nonClusteredServerDefaults and
serverDefaults properties.</span></div>
</td>
</tr>
<tr class="rowColor">
<td class="colOne"><a href="oracle/kubernetes/weblogic/domain/v1/DomainSpec.html#getStartupControl--">oracle.kubernetes.weblogic.domain.v1.DomainSpec.getStartupControl()</a>
<div class="block"><span class="deprecationComment">Use the servers, clusters, clusterDefaults, nonClusteredServerDefaults and
serverDefaults properties.</span></div>
</td>
</tr>
<tr class="altColor">
<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>
<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>
</td>
</tr>
<tr class="rowColor">
<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>
<div class="block"><span class="deprecationComment">Use the clusters and clusterDefaults properties.</span></div>
</td>
</tr>
<tr class="altColor">
<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>
</tr>
<tr class="rowColor">
<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>
<div class="block"><span class="deprecationComment">Use the Server imagePullPolicy property.</span></div>
</td>
</tr>
<tr class="altColor">
<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>
<div class="block"><span class="deprecationComment">Use the clusterDefaults property's replicas property.</span></div>
</td>
</tr>
<tr class="rowColor">
<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>
<div class="block"><span class="deprecationComment">Use the servers, clusters, clusterDefaults, nonClusteredServerDefaults and
serverDefaults properties.</span></div>
</td>
</tr>
<tr class="altColor">
<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>
<div class="block"><span class="deprecationComment">Use the servers, clusters, clusterDefaults, nonClusteredServerDefaults and
serverDefaults properties.</span></div>
</td>
</tr>
<tr class="rowColor">
<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>
<div class="block"><span class="deprecationComment">Use the clusters and clusterDefaults properties.</span></div>
</td>
</tr>
<tr class="altColor">
<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>
</tr>
<tr class="rowColor">
<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>
<div class="block"><span class="deprecationComment">Use the Server imagePullPolicy property.</span></div>
</td>
</tr>
<tr class="altColor">
<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>
<div class="block"><span class="deprecationComment">Use the clusterDefaults property's replicas property.</span></div>
</td>
</tr>
<tr class="rowColor">
<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>
<div class="block"><span class="deprecationComment">Use the servers, clusters, clusterDefaults, nonClusteredServerDefaults and
serverDefaults properties.</span></div>
</td>
</tr>
<tr class="altColor">
<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>
<div class="block"><span class="deprecationComment">Use the servers, clusters, clusterDefaults, nonClusteredServerDefaults and
serverDefaults properties.</span></div>
</td>
</tr>
</tbody>
</table>
</li>
</ul>
</div>
<!-- ======= START OF BOTTOM NAVBAR ====== -->
<div class="bottomNav"><a name="navbar.bottom">
Expand Down Expand Up @@ -140,9 +257,6 @@ <h2 title="Contents">Contents</h2>
}
//-->
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
</div>
<a name="skip.navbar.bottom">
<!-- -->
Expand Down
39 changes: 6 additions & 33 deletions docs/apidocs/help-doc.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,27 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (9.0.4) on Mon May 07 06:59:10 EDT 2018 -->
<title>API Help (operator-runtime 1.0 API)</title>
<!-- Generated by javadoc (1.8.0_162) on Thu Aug 16 16:56:15 EDT 2018 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="date" content="2018-05-07">
<title>API Help (weblogic-kubernetes-operator 1.1 API)</title>
<meta name="date" content="2018-08-16">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-1.10.2.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
</head>
<body>
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="API Help (operator-runtime 1.0 API)";
parent.document.title="API Help (weblogic-kubernetes-operator 1.1 API)";
}
}
catch(err) {
}
//-->
var pathtoroot = "./";loadScripts(document, 'script');</script>
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
<div class="fixedNav">
<!-- ========= START OF TOP NAVBAR ======= -->
<div class="topNav"><a name="navbar.top">
<!-- -->
Expand Down Expand Up @@ -63,12 +54,6 @@
<ul class="navList" id="allclasses_navbar_top">
<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
</ul>
<ul class="navListSearch">
<li><span>SEARCH:&nbsp;</span>
<input type="text" id="search" value=" " disabled="disabled">
<input type="reset" id="reset" value=" " disabled="disabled">
</li>
</ul>
<div>
<script type="text/javascript"><!--
allClassesLink = document.getElementById("allclasses_navbar_top");
Expand All @@ -80,20 +65,11 @@
}
//-->
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
</div>
<a name="skip.navbar.top">
<!-- -->
</a></div>
<!-- ========= END OF TOP NAVBAR ========= -->
</div>
<div class="navPadding">&nbsp;</div>
<script type="text/javascript"><!--
$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
//-->
</script>
<div class="header">
<h1 class="title">How This API Document Is Organized</h1>
<div class="subTitle">This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.</div>
Expand Down Expand Up @@ -190,7 +166,7 @@ <h2>Frames/No Frames</h2>
<p>These links show and hide the HTML frames. All pages are available with or without frames.</p>
</li>
<li class="blockList">
<h2>All&nbsp;Classes</h2>
<h2>All Classes</h2>
<p>The <a href="allclasses-noframe.html">All Classes</a> link shows all classes and interfaces except non-static nested types.</p>
</li>
<li class="blockList">
Expand Down Expand Up @@ -245,9 +221,6 @@ <h2>Constant Field Values</h2>
}
//-->
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
</div>
<a name="skip.navbar.bottom">
<!-- -->
Expand Down

0 comments on commit 996c49d

Please sign in to comment.