Skip to content

Commit d18a6f5

Browse files
committed
Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into owls-72998
2 parents 2a7bd6b + a7c5656 commit d18a6f5

File tree

671 files changed

+294196
-1815
lines changed

Some content is hidden

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

671 files changed

+294196
-1815
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@ release.properties
4343
dependency-reduced-pom.xml
4444
*.ipr
4545
*.iws
46+
docs-source/docs

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Oracle is finding ways for organizations using WebLogic Server to run important
2121
The fastest way to experience the operator is to follow the [Quick Start guide](https://oracle.github.io/weblogic-kubernetes-operator/quickstart/), or you can peruse our [documentation](https://oracle.github.io/weblogic-kubernetes-operator), read our [blogs](https://blogs.oracle.com/weblogicserver/updated-weblogic-kubernetes-support-with-operator-20), or try out the [samples](https://oracle.github.io/weblogic-kubernetes-operator/samples/).
2222

2323
***
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.
24+
The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.2.
25+
This release was published on TBD.
2626
***
2727

2828
# Documentation

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</version>
8+
<version>2.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

docs-source/config.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ theme = "hugo-theme-learn"
77

88
publishDir = "docs"
99

10+
# analytics
11+
googleAnalytics = "UA-129126578-2"
12+
1013
# For search functionality
1114
[outputs]
1215
home = [ "HTML", "RSS", "JSON"]
13-

docs-source/content/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ 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.1.
20+
The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.2.
2121
This release was published on TBD.
2222
***
2323

docs-source/content/recent-changes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ This document tracks recent changes to the operator, especially ones that introd
1010

1111
| Date | Version | Introduces backward incompatibilities | Change |
1212
| --- | --- | --- | --- |
13+
| TBD | v2.2 | no | TBD
14+
| April 4, 2019 | v2.1 | no | Customers can add init and sidecar containers to generated pods.
1315
| 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.
1416
| January 24, 2019 | v2.0 | yes; not compatible with 1.x releases, but is compatible with 2.0-rc2. | Final version numbers and documentation updates.
1517
| January 16, 2019 | v2.0-rc2 | yes | Schema updates are completed, and various bugs fixed.

docs-source/content/release-notes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ draft: false
88

99
| Date | Version | Introduces backward incompatibilities | Change |
1010
| --- | --- | --- | --- |
11-
| TBD | v2.1 | no |
11+
| TBD | v2.2 | no | TBD
12+
| April 4, 2019 | v2.1 | no | Customers can add init and sidecar containers to generated pods.
1213
| 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.
1314
| January 24, 2019 | v2.0 | yes; not compatible with 1.x releases, but is compatible with 2.0-rc2. | Final version numbers and documentation updates.
1415
| January 16, 2019 | v2.0-rc2 | yes | Schema updates are completed, and various bugs fixed.

docs-source/content/userguide/managing-operators/using-the-operator/using-helm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ javaLoggingLevel: "FINE"
101101

102102
Specifies the Docker image containing the operator code.
103103

104-
Defaults to `weblogic-kubernetes-operator:2.1`.
104+
Defaults to `weblogic-kubernetes-operator:2.2`.
105105

106106
Example:
107107
```

docs-source/themes/hugo-theme-learn/layouts/_default/single.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
{{end}}
1010
</footer>
1111

12-
12+
{{ template "_internal/google_analytics_async.html" . }}
1313
{{ partial "footer.html" . }}

docs/2.0.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/2.0.1/images/favicon.png" type="image/png">
8+
9+
<title>404 Page not found</title>
10+
11+
12+
<link href="/weblogic-kubernetes-operator/2.0.1/css/nucleus.css?1554382007" rel="stylesheet">
13+
<link href="/weblogic-kubernetes-operator/2.0.1/css/fontawesome-all.min.css?1554382007" rel="stylesheet">
14+
<link href="/weblogic-kubernetes-operator/2.0.1/css/hybrid.css?1554382007" rel="stylesheet">
15+
<link href="/weblogic-kubernetes-operator/2.0.1/css/featherlight.min.css?1554382007" rel="stylesheet">
16+
<link href="/weblogic-kubernetes-operator/2.0.1/css/perfect-scrollbar.min.css?1554382007" rel="stylesheet">
17+
<link href="/weblogic-kubernetes-operator/2.0.1/css/horsey.css?1554382007" rel="stylesheet">
18+
<link href="/weblogic-kubernetes-operator/2.0.1/css/theme.css?1554382007" rel="stylesheet">
19+
<link href="/weblogic-kubernetes-operator/2.0.1/css/hugo-theme.css?1554382007" 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/2.0.1/'>Go to homepage</a></p>
53+
<p><img src='/weblogic-kubernetes-operator/2.0.1/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)