Skip to content

Commit 5421d5f

Browse files
rjeberhardrjeberhard
committed
Merge remote-tracking branch 'origin/main' into release/4.0
2 parents e647b7d + 5b846dc commit 5421d5f

File tree

38 files changed

+534
-94
lines changed

38 files changed

+534
-94
lines changed

‎common/src/main/java/oracle/kubernetes/common/utils/SchemaConversionUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.kubernetes.common.utils;
@@ -430,7 +430,7 @@ private void convertDomainHomeInImageToDomainHomeSourceType(Map<String, Object>
430430
Object existing = domainSpec.remove("domainHomeInImage");
431431
if (existing != null && !domainSpec.containsKey("domainHomeSourceType")) {
432432
domainSpec.put("domainHomeSourceType",
433-
Boolean.parseBoolean((String) existing) ? "Image" : "PersistentVolume");
433+
Boolean.TRUE.equals(existing) ? "Image" : "PersistentVolume");
434434
}
435435
}
436436
}

‎common/src/test/java/oracle/kubernetes/common/utils/SchemaConversionUtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.kubernetes.common.utils;
@@ -297,7 +297,7 @@ private Map<String, Object> getDomainSpec(Map<String, Object> domainMap) {
297297
}
298298

299299
private void setDomainHomeInImage(Map<String, Object> v8Domain, boolean domainHomeInImage) {
300-
getDomainSpec(v8Domain).put("domainHomeInImage", String.valueOf(domainHomeInImage));
300+
getDomainSpec(v8Domain).put("domainHomeInImage", domainHomeInImage);
301301
}
302302

303303
private void setDomainHomeSourceType(Map<String, Object> v8Domain, String domainHomeSourceType) {

‎documentation/2.5/content/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Please refer to our [samples]({{< relref "/samples/_index.md" >}}) for informati
7070

7171
We have a **public Slack channel** where you can get in touch with us to ask questions about using the operator or give us feedback
7272
or suggestions about what features and improvements you would like to see. We would love to hear from you. To join our channel,
73-
please [visit this site to get an invitation](https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1lnz4kpci-WdY2gWfeJc5jS_a_1Z06MA). The invitation email will include
73+
please [visit this site to get an invitation](https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1ni1gtjv6-PGC6CQ4uIte3KBdm_67~aQ). The invitation email will include
7474
details of how to access our Slack workspace. After you are logged in, please come to `#operator` and say, "hello!"
7575

7676
### Recent changes and known issues

‎documentation/2.5/themes/hugo-theme-learn/layouts/partials/menu-footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
</p></td></tr></tbody></table>
88
<p>&nbsp</p>
99
<p><a href="https://github.com/oracle/weblogic-kubernetes-operator"><i class="fab fa-github"></i> GitHub repo</a></p>
10-
<p><a href="https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1lnz4kpci-WdY2gWfeJc5jS_a_1Z06MA"><i class="fab fa-slack"></i> Public Slack #operator</a></p>
10+
<p><a href="https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1ni1gtjv6-PGC6CQ4uIte3KBdm_67~aQ"><i class="fab fa-slack"></i> Public Slack #operator</a></p>

‎documentation/2.6/content/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Documentation for APIs:
120120

121121
We have a **public Slack channel** where you can get in touch with us to ask questions about using the operator or give us feedback
122122
or suggestions about what features and improvements you would like to see. We would love to hear from you. To join our channel,
123-
please [visit this site to get an invitation](https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1lnz4kpci-WdY2gWfeJc5jS_a_1Z06MA). The invitation email will include
123+
please [visit this site to get an invitation](https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1ni1gtjv6-PGC6CQ4uIte3KBdm_67~aQ). The invitation email will include
124124
details of how to access our Slack workspace. After you are logged in, please come to `#operator` and say, "hello!"
125125

126126
### Contributing to the operator

‎documentation/2.6/themes/hugo-theme-learn/layouts/partials/menu-footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
</p></td></tr></tbody></table>
88
<p>&nbsp</p>
99
<p><a href="https://github.com/oracle/weblogic-kubernetes-operator"><i class="fab fa-github"></i> GitHub repo</a></p>
10-
<p><a href="https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1lnz4kpci-WdY2gWfeJc5jS_a_1Z06MA"><i class="fab fa-slack"></i> Public Slack #operator</a></p>
10+
<p><a href="https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1ni1gtjv6-PGC6CQ4uIte3KBdm_67~aQ"><i class="fab fa-slack"></i> Public Slack #operator</a></p>

‎documentation/3.0/content/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Documentation for APIs:
9595

9696
We have a **public Slack channel** where you can get in touch with us to ask questions about using the operator or give us feedback
9797
or suggestions about what features and improvements you would like to see. We would love to hear from you. To join our channel,
98-
please [visit this site to get an invitation](https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1lnz4kpci-WdY2gWfeJc5jS_a_1Z06MA). The invitation email will include
98+
please [visit this site to get an invitation](https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1ni1gtjv6-PGC6CQ4uIte3KBdm_67~aQ). The invitation email will include
9999
details of how to access our Slack workspace. After you are logged in, please come to `#operator` and say, "hello!"
100100

101101
### Contributing to the operator

‎documentation/3.0/themes/hugo-theme-learn/layouts/partials/menu-footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
</p></td></tr></tbody></table>
88
<p>&nbsp</p>
99
<p><a href="https://github.com/oracle/weblogic-kubernetes-operator"><i class="fab fa-github"></i> GitHub repo</a></p>
10-
<p><a href="https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1lnz4kpci-WdY2gWfeJc5jS_a_1Z06MA"><i class="fab fa-slack"></i> Public Slack #operator</a></p>
10+
<p><a href="https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1ni1gtjv6-PGC6CQ4uIte3KBdm_67~aQ"><i class="fab fa-slack"></i> Public Slack #operator</a></p>

‎documentation/3.1/content/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Documentation for APIs:
9191

9292
We have a **public Slack channel** where you can get in touch with us to ask questions about using the operator or give us feedback
9393
or suggestions about what features and improvements you would like to see. We would love to hear from you. To join our channel,
94-
please [visit this site to get an invitation](https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1lnz4kpci-WdY2gWfeJc5jS_a_1Z06MA). The invitation email will include
94+
please [visit this site to get an invitation](https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1ni1gtjv6-PGC6CQ4uIte3KBdm_67~aQ). The invitation email will include
9595
details of how to access our Slack workspace. After you are logged in, please come to `#operator` and say, "hello!"
9696

9797
### Contributing to the operator

‎documentation/3.1/themes/hugo-theme-learn/layouts/partials/menu-footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
</p></td></tr></tbody></table>
88
<p>&nbsp</p>
99
<p><a href="https://github.com/oracle/weblogic-kubernetes-operator"><i class="fab fa-github"></i> GitHub repo</a></p>
10-
<p><a href="https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1lnz4kpci-WdY2gWfeJc5jS_a_1Z06MA"><i class="fab fa-slack"></i> Public Slack #operator</a></p>
10+
<p><a href="https://join.slack.com/t/oracle-weblogic/shared_invite/zt-1ni1gtjv6-PGC6CQ4uIte3KBdm_67~aQ"><i class="fab fa-slack"></i> Public Slack #operator</a></p>

0 commit comments

Comments
 (0)