Skip to content

Commit 99b6716

Browse files
rjeberhardrjeberhard
authored
Merge branch 'develop' into develop-OWLS-70567
2 parents 51ad759 + 0013ff4 commit 99b6716

Some content is hidden

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

53 files changed

+958
-1147
lines changed

‎README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ The fastest way to experience the operator is to follow the [Quick start guide](
3434
| --- | --- |
3535
| [#721](https://github.com/oracle/weblogic-kubernetes-operator/issues/721) | Incorrect default `domainHome` when `domainHomeInImage` is true. |
3636
| [#722](https://github.com/oracle/weblogic-kubernetes-operator/issues/722) | Server services not recreated when labels/annotations changed. |
37+
| [#726](https://github.com/oracle/weblogic-kubernetes-operator/issues/726) | Clusters only support default channel. |
3738

3839
## Operator version 1.1
3940

@@ -51,17 +52,17 @@ maintained for one release after a replacement is available.
5152

5253
# About this documentation
5354

54-
This documentation includes sections aimed at different audiences. To help you find what you are looking for more easily,
55+
This documentation includes sections targeted to different audiences. To help you find what you are looking for more easily,
5556
please consult this table of contents:
5657

57-
* The [Quick start guide](site/quickstart.md) explains how to just get the operator running quickly, using all the defaults, nothing special.
58-
* The [User guide](site/user-guide.md) contains detailed information for users of the operator, including how to install and configure it,
58+
* The [Quick start guide](site/quickstart.md) explains how to quickly get the operator running, using the defaults, nothing special.
59+
* The [User guide](site/user-guide.md) contains detailed usage information, including how to install and configure the operator,
5960
and how to use it to create and manage WebLogic domains.
60-
* Our [Samples](kubernetes/samples/README.md) provide detailed example code and instructions that show you how to perform
61+
* The [Samples](kubernetes/samples/README.md) provide detailed example code and instructions that show you how to perform
6162
various tasks related to the operator.
6263
* The [Developer guide](site/developer.md) provides details for people who want to understand how the operator is built, tested, and so on. Those who wish to contribute to the operator code will find useful information here. This section also includes
6364
API documentation (Javadoc) and Swagger/OpenAPI documentation for the REST APIs.
64-
* The [Contributing](#contributing-to-the-operator) section provides information about conribution requirements.
65+
* The [Contributing](#contributing-to-the-operator) section provides information about contribution requirements.
6566

6667

6768
# User guide
@@ -80,7 +81,7 @@ The [User guide](site/user-guide.md) provides detailed information about all asp
8081

8182
# Samples
8283

83-
Please refer to our [samples](kubernetes/samples/README.md) for information about the available sample code we provide.
84+
Please refer to our [samples](kubernetes/samples/README.md) for information about the available sample code.
8485

8586
# Need more help? Have a suggestion? Come and say "Hello!"
8687

@@ -97,17 +98,17 @@ See [Recent changes](site/recent-changes.md) for changes to the operator, includ
9798

9899
Developers interested in this project are encouraged to read the [Developer guide](site/developer.md) to learn how to build the project, run tests, and so on. The Developer guide also provides details about the structure of the code, coding standards, and the Asynchronous Call facility used in the code to manage calls to the Kubernetes API.
99100

100-
Please take a look at our [wish list](https://github.com/oracle/weblogic-kubernetes-operator/wiki/Wish-list) to get an idea of the kind of features we would like to add to the operator. Maybe you will see something you would like to contribute to!
101+
Please take a look at our [wish list](https://github.com/oracle/weblogic-kubernetes-operator/wiki/Wish-list) to get an idea of the kind of features we would like to add to the operator. Maybe you will see something to which you would like to contribute!
101102

102103
## API documentation
103104

104105
Documentation for APIs is provided here:
105106

106-
* The operator provides a REST API that you can use to obtain information about the configuration and to initiate scaling actions. For details about how to use the REST APIs, see [Using the operator's REST services](site/rest.md).
107+
* The operator provides a REST API that you can use to obtain configuration information and to initiate scaling actions. For details about how to use the REST APIs, see [Using the operator's REST services](site/rest.md).
107108

108109
* See the [Swagger](https://oracle.github.io/weblogic-kubernetes-operator/swagger/index.html) documentation for the operator's REST interface.
109110

110-
* [Javadoc](https://oracle.github.io/weblogic-kubernetes-operator/apidocs/index.html) for the operator.
111+
* See the [Javadoc](https://oracle.github.io/weblogic-kubernetes-operator/apidocs/index.html) for the operator.
111112

112113
# Contributing to the operator
113114

‎THIRDPARTY

Lines changed: 214 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
1+
SnakeYAML:
2+
The SnakeYAML library is developed by the team of developers and it is based on
3+
PyYAML module written by Kirill Simonov and Andrey Somov.
4+
SnakeYAML is released under the Apache 2.0 license.
5+
6+
JacksonCore:
7+
Project is licensed under Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
8+
like all official Jackson components.
9+
FasterXML also explicitly allows users to alternatively license component under
10+
Lesser GPL (LGPL) 2.1 up to and including version 2.2. If so, they may want to
11+
repackage artifacts to reflect their choice of license to use.
12+
13+
Swagger Annotations:
14+
This software is released under the MIT license:
15+
16+
Permission is hereby granted, free of charge, to any person obtaining a copy of
17+
this software and associated documentation files (the "Software"), to deal in
18+
the Software without restriction, including without limitation the rights to
19+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
20+
the Software, and to permit persons to whom the Software is furnished to do so,
21+
subject to the following conditions:
22+
The above copyright notice and this permission notice shall be included in all
23+
copies or substantial portions of the Software.
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
25+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
26+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
27+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
28+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
29+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
30+
31+
Joda-Time:
32+
Copyright ©2002-2018 Joda.org. All Rights Reserved.
33+
Joda-Time is licensed under the business-friendly Apache 2.0 licence.
34+
35+
Apache Commons Codec
36+
This code is under the Apache Licence v2.
37+
38+
39+
Apache License
40+
                           Version 2.0, January 2004
41+
                        http://www.apache.org/licenses/
42+
43+
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
44+
45+
   1. Definitions.
46+
47+
      "License" shall mean the terms and conditions for use, reproduction,
48+
      and distribution as defined by Sections 1 through 9 of this document.
49+
50+
      "Licensor" shall mean the copyright owner or entity authorized by
51+
      the copyright owner that is granting the License.
52+
53+
      "Legal Entity" shall mean the union of the acting entity and all
54+
      other entities that control, are controlled by, or are under common
55+
      control with that entity. For the purposes of this definition,
56+
      "control" means (i) the power, direct or indirect, to cause the
57+
      direction or management of such entity, whether by contract or
58+
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
59+
      outstanding shares, or (iii) beneficial ownership of such entity.
60+
61+
      "You" (or "Your") shall mean an individual or Legal Entity
62+
      exercising permissions granted by this License.
63+
64+
      "Source" form shall mean the preferred form for making modifications,
65+
      including but not limited to software source code, documentation
66+
      source, and configuration files.
67+
68+
      "Object" form shall mean any form resulting from mechanical
69+
      transformation or translation of a Source form, including but
70+
      not limited to compiled object code, generated documentation,
71+
      and conversions to other media types.
72+
73+
      "Work" shall mean the work of authorship, whether in Source or
74+
      Object form, made available under the License, as indicated by a
75+
      copyright notice that is included in or attached to the work
76+
      (an example is provided in the Appendix below).
77+
78+
      "Derivative Works" shall mean any work, whether in Source or Object
79+
      form, that is based on (or derived from) the Work and for which the
80+
      editorial revisions, annotations, elaborations, or other modifications
81+
      represent, as a whole, an original work of authorship. For the purposes
82+
      of this License, Derivative Works shall not include works that remain
83+
      separable from, or merely link (or bind by name) to the interfaces of,
84+
      the Work and Derivative Works thereof.
85+
86+
      "Contribution" shall mean any work of authorship, including
87+
      the original version of the Work and any modifications or additions
88+
      to that Work or Derivative Works thereof, that is intentionally
89+
      submitted to Licensor for inclusion in the Work by the copyright owner
90+
      or by an individual or Legal Entity authorized to submit on behalf of
91+
      the copyright owner. For the purposes of this definition, "submitted"
92+
      means any form of electronic, verbal, or written communication sent
93+
      to the Licensor or its representatives, including but not limited to
94+
      communication on electronic mailing lists, source code control systems,
95+
      and issue tracking systems that are managed by, or on behalf of, the
96+
      Licensor for the purpose of discussing and improving the Work, but
97+
      excluding communication that is conspicuously marked or otherwise
98+
      designated in writing by the copyright owner as "Not a Contribution."
99+
100+
      "Contributor" shall mean Licensor and any individual or Legal Entity
101+
      on behalf of whom a Contribution has been received by Licensor and
102+
      subsequently incorporated within the Work.
103+
104+
   2. Grant of Copyright License. Subject to the terms and conditions of
105+
      this License, each Contributor hereby grants to You a perpetual,
106+
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
107+
      copyright license to reproduce, prepare Derivative Works of,
108+
      publicly display, publicly perform, sublicense, and distribute the
109+
      Work and such Derivative Works in Source or Object form.
110+
111+
   3. Grant of Patent License. Subject to the terms and conditions of
112+
      this License, each Contributor hereby grants to You a perpetual,
113+
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
114+
      (except as stated in this section) patent license to make, have made,
115+
      use, offer to sell, sell, import, and otherwise transfer the Work,
116+
      where such license applies only to those patent claims licensable
117+
      by such Contributor that are necessarily infringed by their
118+
      Contribution(s) alone or by combination of their Contribution(s)
119+
      with the Work to which such Contribution(s) was submitted. If You
120+
      institute patent litigation against any entity (including a
121+
      cross-claim or counterclaim in a lawsuit) alleging that the Work
122+
      or a Contribution incorporated within the Work constitutes direct
123+
      or contributory patent infringement, then any patent licenses
124+
      granted to You under this License for that Work shall terminate
125+
      as of the date such litigation is filed.
126+
127+
   4. Redistribution. You may reproduce and distribute copies of the
128+
      Work or Derivative Works thereof in any medium, with or without
129+
      modifications, and in Source or Object form, provided that You
130+
      meet the following conditions:
131+
132+
      (a) You must give any other recipients of the Work or
133+
          Derivative Works a copy of this License; and
134+
135+
      (b) You must cause any modified files to carry prominent notices
136+
          stating that You changed the files; and
137+
138+
      (c) You must retain, in the Source form of any Derivative Works
139+
          that You distribute, all copyright, patent, trademark, and
140+
          attribution notices from the Source form of the Work,
141+
          excluding those notices that do not pertain to any part of
142+
          the Derivative Works; and
143+
144+
      (d) If the Work includes a "NOTICE" text file as part of its
145+
          distribution, then any Derivative Works that You distribute must
146+
          include a readable copy of the attribution notices contained
147+
          within such NOTICE file, excluding those notices that do not
148+
          pertain to any part of the Derivative Works, in at least one
149+
          of the following places: within a NOTICE text file distributed
150+
          as part of the Derivative Works; within the Source form or
151+
          documentation, if provided along with the Derivative Works; or,
152+
          within a display generated by the Derivative Works, if and
153+
          wherever such third-party notices normally appear. The contents
154+
          of the NOTICE file are for informational purposes only and
155+
          do not modify the License. You may add Your own attribution
156+
          notices within Derivative Works that You distribute, alongside
157+
          or as an addendum to the NOTICE text from the Work, provided
158+
          that such additional attribution notices cannot be construed
159+
          as modifying the License.
160+
161+
      You may add Your own copyright statement to Your modifications and
162+
      may provide additional or different license terms and conditions
163+
      for use, reproduction, or distribution of Your modifications, or
164+
      for any such Derivative Works as a whole, provided Your use,
165+
      reproduction, and distribution of the Work otherwise complies with
166+
      the conditions stated in this License.
167+
168+
   5. Submission of Contributions. Unless You explicitly state otherwise,
169+
      any Contribution intentionally submitted for inclusion in the Work
170+
      by You to the Licensor shall be under the terms and conditions of
171+
      this License, without any additional terms or conditions.
172+
      Notwithstanding the above, nothing herein shall supersede or modify
173+
      the terms of any separate license agreement you may have executed
174+
      with Licensor regarding such Contributions.
175+
176+
   6. Trademarks. This License does not grant permission to use the trade
177+
      names, trademarks, service marks, or product names of the Licensor,
178+
      except as required for reasonable and customary use in describing the
179+
      origin of the Work and reproducing the content of the NOTICE file.
180+
181+
   7. Disclaimer of Warranty. Unless required by applicable law or
182+
      agreed to in writing, Licensor provides the Work (and each
183+
      Contributor provides its Contributions) on an "AS IS" BASIS,
184+
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
185+
      implied, including, without limitation, any warranties or conditions
186+
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
187+
      PARTICULAR PURPOSE. You are solely responsible for determining the
188+
      appropriateness of using or redistributing the Work and assume any
189+
      risks associated with Your exercise of permissions under this License.
190+
191+
   8. Limitation of Liability. In no event and under no legal theory,
192+
      whether in tort (including negligence), contract, or otherwise,
193+
      unless required by applicable law (such as deliberate and grossly
194+
      negligent acts) or agreed to in writing, shall any Contributor be
195+
      liable to You for damages, including any direct, indirect, special,
196+
      incidental, or consequential damages of any character arising as a
197+
      result of this License or out of the use or inability to use the
198+
      Work (including but not limited to damages for loss of goodwill,
199+
      work stoppage, computer failure or malfunction, or any and all
200+
      other commercial damages or losses), even if such Contributor
201+
      has been advised of the possibility of such damages.
202+
203+
   9. Accepting Warranty or Additional Liability. While redistributing
204+
      the Work or Derivative Works thereof, You may choose to offer,
205+
      and charge a fee for, acceptance of support, warranty, indemnity,
206+
      or other liability obligations and/or rights consistent with this
207+
      License. However, in accepting such obligations, You may act only
208+
      on Your own behalf and on Your sole responsibility, not on behalf
209+
      of any other Contributor, and only if You agree to indemnify,
210+
      defend, and hold each Contributor harmless for any liability
211+
      incurred by, or claims asserted against, such Contributor by reason
212+
      of your accepting any such warranty or additional liability.
213+
214+
   END OF TERMS AND CONDITIONS

‎kubernetes/internal/utility.sh

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,35 @@ function toDNS1123Legal {
184184

185185
#
186186
# Function to check if a value is lowercase
187-
# $1 - value to check
188-
# $2 - name of object being checked
187+
# $1 - name of object being checked
188+
# $2 - value to check
189189
function validateLowerCase {
190190
local lcVal=$(toLower $2)
191191
if [ "$lcVal" != "$2" ]; then
192192
validationError "The value of $1 must be lowercase: $2"
193193
fi
194194
}
195195

196+
#
197+
# Function to lowercase a value and make it a legal DNS1123 name
198+
# $1 - value to convert to DNS legal name
199+
function toDNS1123Legal {
200+
local val=`echo $1 | tr "[:upper:]" "[:lower:]"`
201+
val=${val//"_"/"-"}
202+
echo "$val"
203+
}
204+
205+
#
206+
# Function to check if a value is lowercase and legal DNS name
207+
# $1 - name of object being checked
208+
# $2 - value to check
209+
function validateDNS1123LegalName {
210+
local val=$(toDNS1123Legal $2)
211+
if [ "$val" != "$2" ]; then
212+
validationError "The value of $1 contains invalid charaters (uppercase letters or "_"): $2"
213+
fi
214+
}
215+
196216
#
197217
# Function to check if a value is lowercase and legal DNS name
198218
# $1 - value to check

0 commit comments

Comments
 (0)