Skip to content

Commit 3e216e9

Browse files
alai8alai8
committed
Merge branch 'develop' into owls-70496
2 parents 2e8aecf + 1f3ca45 commit 3e216e9

File tree

1,770 files changed

+588489
-2758
lines changed

Some content is hidden

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

1,770 files changed

+588489
-2758
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2017, 2018, Oracle Corporation and/or its affiliates. All rights reserved.
1+
# Copyright 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
22
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
33
#
44
# HOW TO BUILD THIS IMAGE

‎LICENSE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
1+
Copyright (c) 2017, 2019, Oracle Corporation Oracle and/or its affiliates. All rights reserved.
22

3-
The Universal Permissive License (UPL), Version 1.0
3+
Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44

55
Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this
66
software, associated documentation and/or data (collectively the "Software"), free of charge and under any and

‎build-tools/src/main/resources/weblogic-kubernetes-operator/spotbugs/exclude-common.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
44
5-
Copyright (c) 2011-2013 Oracle and/or its affiliates. All rights reserved.
5+
Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
66
77
The contents of this file are subject to the terms of either the GNU
88
General Public License Version 2 only ("GPL") or the Common Development

‎deploy.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
2-
# Copyright 2017, 2018, Oracle Corporation and/or affiliates. All rights reserved.
2+
# Copyright 2017, 2019, Oracle Corporation and/or affiliates. All rights reserved.
3+
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
34

45
IMAGE="container-registry.oracle.com/middleware/weblogic-kubernetes-operator:latest"
56

‎docs-source/content/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Oracle is finding ways for organizations using WebLogic Server to run important
1717
The fastest way to experience the operator is to follow the [Quick Start guide]({{< relref "/quickstart/_index.md" >}}), or you can peruse our [documentation]({{< relref "/userguide/_index.md" >}}), read our [blogs](https://blogs.oracle.com/weblogicserver/updated-weblogic-kubernetes-support-with-operator-20), or try out the [samples]({{< relref "/samples/_index.md" >}}).
1818

1919
***
20-
The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.2.0.
21-
This release was published on June 6, 2019.
20+
The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.2.1.
21+
This release was published on June 20, 2019.
2222
***
2323

2424
#### Operator earlier versions

‎docs-source/content/recent-changes.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎docs-source/content/release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ draft: false
88

99
| Date | Version | Introduces backward incompatibilities | Change |
1010
| --- | --- | --- | --- |
11+
| June 20, 2019 | v2.2.1 | no | The operator now supports Kubernetes 1.14.0+. This release is primarily a bug fix release and resolves the following issues:<br><ul><li>Servers in domains, where the domain home is on a persistent volume, would sometimes fail to start. These failures would be during the introspection phase following a full domain shutdown. Now, the introspection script better handles the relevant error conditions.</li><li>The domain resource provides an option to <a href="https://github.com/oracle/weblogic-kubernetes-operator/blob/master/docs/domains/Domain.md#server-service">pre-create Kubernetes services</a> for WebLogic Servers that are not yet running so that the DNS addresses of these services are resolvable. These services are now created as non-headless so that they have an IP address.</li></ul>
1112
| June 6, 2019 | v2.2.0 | no | Added support for FMW Infrastructure domains. WebLogic Server instances are now gracefully shut down by default and shutdown options are configurable. Operator is now built and runs on JDK 11.
1213
| April 4, 2019 | v2.1 | no | Customers can add init and sidecar containers to generated pods.
1314
| 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.

‎docs-source/content/samples/simple/storage/_index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ The create script will verify that the PV and PVC were created, and will report
8181
The content of the generated `weblogic-sample-pvc.yaml`:
8282

8383
```
84-
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
84+
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
8585
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
8686
8787
kind: PersistentVolumeClaim
@@ -102,7 +102,7 @@ metadata:
102102

103103
The content of the generated `weblogic-sample-pv.yaml`:
104104
```
105-
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
105+
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
106106
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
107107
108108
apiVersion: v1
@@ -132,7 +132,7 @@ spec:
132132
The content of the generated `domain1-weblogic-sample-pvc.yaml` when `domainUID` is set to `domain1`:
133133

134134
```
135-
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
135+
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
136136
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
137137
138138
kind: PersistentVolumeClaim
@@ -154,7 +154,7 @@ spec:
154154

155155
The content of the generated `domain1-weblogic-sample-pv.yaml` when `domainUID` is set to `domain1`:
156156
```
157-
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
157+
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
158158
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
159159
160160
apiVersion: v1

‎docs-source/content/userguide/introduction/introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Detailed instructions are available [here]({{< relref "/userguide/managing-opera
1616

1717
### Operator prerequisites
1818

19-
* Kubernetes 1.11.5+, 1.12.3+, and 1.13.0+ (check with `kubectl version`).
19+
* Kubernetes 1.11.5+, 1.12.3+, 1.13.0+, and 1.14.0+ (check with `kubectl version`).
2020
* Flannel networking v0.9.1-amd64 (check with `docker images | grep flannel`).
2121
* Docker 18.03.1.ce (check with `docker version`).
2222
* Helm 2.8.2+ (check with `helm version`).

‎docs/2.2.1/404.html

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<!DOCTYPE html>
2+
<html lang="en" class="js csstransforms3d">
3+
4+
<head>
5+
<meta charset="utf-8"> <meta name="description" content="">
6+
7+
<link rel="icon" href="/weblogic-kubernetes-operator/images/favicon.png" type="image/png">
8+
9+
<title>404 Page not found</title>
10+
11+
12+
<link href="/weblogic-kubernetes-operator/css/nucleus.css?1561069276" rel="stylesheet">
13+
<link href="/weblogic-kubernetes-operator/css/fontawesome-all.min.css?1561069276" rel="stylesheet">
14+
<link href="/weblogic-kubernetes-operator/css/hybrid.css?1561069276" rel="stylesheet">
15+
<link href="/weblogic-kubernetes-operator/css/featherlight.min.css?1561069276" rel="stylesheet">
16+
<link href="/weblogic-kubernetes-operator/css/perfect-scrollbar.min.css?1561069276" rel="stylesheet">
17+
<link href="/weblogic-kubernetes-operator/css/horsey.css?1561069276" rel="stylesheet">
18+
<link href="/weblogic-kubernetes-operator/css/theme.css?1561069276" rel="stylesheet">
19+
<link href="/weblogic-kubernetes-operator/css/hugo-theme.css?1561069276" rel="stylesheet">
20+
21+
<style type="text/css">
22+
:root #header + #content > #left > #rlblock_left {
23+
display: none !important;
24+
}
25+
26+
p,
27+
li,
28+
ul {
29+
text-align: center
30+
}
31+
32+
ul {
33+
list-style-type: none;
34+
}
35+
</style>
36+
37+
</head>
38+
39+
<body>
40+
41+
<body class="" data-url="/">
42+
43+
<section id="body" style="margin-left:0px;">
44+
<div id="overlay"></div>
45+
<div id="chapter">
46+
<div id="body-inner">
47+
<h1>Error</h1>
48+
<p>
49+
</p>
50+
<p>Woops. Looks like this page doesn&#39;t exist ¯\_(ツ)_/¯.</p>
51+
<p></p>
52+
<p><a href='/weblogic-kubernetes-operator/'>Go to homepage</a></p>
53+
<p><img src='/weblogic-kubernetes-operator/images/gopher-404.jpg' style="width:50%" alt="Page not found!"></img></p>
54+
</div>
55+
</div>
56+
57+
</section>
58+
</body>
59+
60+
</html>

0 commit comments

Comments
 (0)