Skip to content

Commit da51cb1

Browse files
rjeberhardrosemarymaranomarkxnelson
authored
Release operator 2.6.0 (#1756)
* Initial move * Continue removing model-in-image * Model in image out of Java * Remove model in image from introspector * More corrections * Continued removals * Remove new schema elements * Remove DomainSpec schema items added in 3.0 * Correct a couple more changes * Domain status patching switching behavior * Implement domain status switching behavior * Bring over integration tests * Bring more changes * More integration tests * Update domain1.yaml * Update README * Restore missing line * Rebuild charts * Support domain status detection in both directions * Remove unnecessary variable * Changes from develop * Backport owls-80135 * Backport retry DB and RCU creation * Rolling fixes * Backport async HTTP client * Backport 8.0.2 and fiber suspend debugging * Port server status reader fixes * Intermittent status fix * Backport affinity merging * WatchBuilderTest.tearDown() fix * Node heating FAQ * Sample updates * OWLS-81419 * Introspector ssl issue * Backport whitespace fix * edit scaling doc as per OWLS-82641 * Backport cluster member sorting fix * Backport new integration tests to the 2.6.0 branch. (#1728) * Backport new integration test suite * Adjust api version to v6 * Backport first half of check cluster visibility changes * Include clustervie app * Backport BigDecimal fix for ItPodsRestart * Backport tail sooner enhancement * Backport integration test cleanup improvements * Backport upgrade instructions * Backport OWLS-82320 namespace error * Liveness probe tests * Istio support * CRD v7 * Correct for git names used as Docker image tags and cleanup repos where we are deleting the last tag * Use GraalVM CE 19.3.2 * Reduce versions in CRDs * Debugging around status endpoint change * Accept null returned status with status endpoint * Additional debugging * Move initialization of using domain status endpoint * add OLCNE 1.1 support (#1742) * add OLCNE 1.1 support * add K8s 1.18.0 * updated operator version to 2.6.0 * Backport OWLS-80884 fix to not stop pods no longer managed by this operator * Corrections * Review comments * Fix JavaDoc * Javadoc * archive 2.5.0 docs Signed-off-by: Mark Nelson <[email protected]> * update readme current versions Signed-off-by: Mark Nelson <[email protected]> * archive 2.5.0 apidoc, chart, etc. Signed-off-by: Mark Nelson <[email protected]> Co-authored-by: Rosemary Marano <[email protected]> Co-authored-by: Mark Nelson <[email protected]>
1 parent 18c7651 commit da51cb1

File tree

2,077 files changed

+987980
-16740
lines changed

Some content is hidden

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

2,077 files changed

+987980
-16740
lines changed

Dockerfile

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,60 @@
44
# HOW TO BUILD THIS IMAGE
55
# -----------------------
66
# Run:
7-
# $ docker build -t weblogic-kubernetes-operator:latest .
7+
# $ ./buildDockerImage.sh [-t <image-name>]
88
#
9-
# Pull base image
10-
# From the Docker store
119
# -------------------------
12-
FROM openjdk:11-oracle
13-
RUN yum -y install openssl && yum clean all
10+
FROM oraclelinux:7-slim
1411

1512
# Maintainer
1613
# ----------
1714
MAINTAINER Ryan Eberhard <[email protected]>
1815

19-
# make the operator run with a non-root user id (1000 is the `oracle` user)
20-
RUN groupadd -g 1000 oracle && \
21-
useradd -d /operator -M -s /bin/bash -g 1000 -u 1000 oracle && \
22-
mkdir /operator && \
23-
mkdir /operator/lib && \
24-
mkdir /logs && \
16+
RUN set -eux; \
17+
yum -y install gzip tar openssl; \
18+
rm -rf /var/cache/yum
19+
20+
# Default to UTF-8 file.encoding
21+
ENV LANG en_US.UTF-8
22+
23+
ENV JAVA_HOME /usr/local/graalvm-ce-java11
24+
ENV PATH /operator:$JAVA_HOME/bin:$PATH
25+
26+
ENV JAVA_VERSION 11.0.7
27+
ENV JAVA_URL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.2/graalvm-ce-java11-linux-amd64-19.3.2.tar.gz
28+
29+
# Install Java and make the operator run with a non-root user id (1000 is the `oracle` user)
30+
RUN set -eux; \
31+
curl -fL -o /graalvm-ce-java11.tar.gz "$JAVA_URL"; \
32+
mkdir -p "$JAVA_HOME"; \
33+
tar --extract --file /graalvm-ce-java11.tar.gz --directory "$JAVA_HOME" --strip-components 1; \
34+
rm /graalvm-ce-java11.tar.gz; \
35+
mkdir /usr/java; \
36+
ln -sfT "$JAVA_HOME" /usr/java/default; \
37+
ln -sfT "$JAVA_HOME" /usr/java/latest; \
38+
rm -Rf "$JAVA_HOME/include" "$JAVA_HOME/jmods" "$JAVA_HOME/languages" "$JAVA_HOME/tools" "$JAVA_HOME/lib/svm" "$JAVA_HOME/lib/installer" "$JAVA_HOME/lib/visualvm" "$JAVA_HOME/lib/truffle" "$JAVA_HOME/lib/polyglot"; \
39+
rm -f "$JAVA_HOME/lib/src.zip" "$JAVA_HOME/lib/libjvmcicompiler.so" "$JAVA_HOME/bin/polyglot"; \
40+
for bin in "$JAVA_HOME/bin/"*; do \
41+
base="$(basename "$bin")"; \
42+
[ ! -e "/usr/bin/$base" ]; \
43+
alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
44+
done; \
45+
java -Xshare:dump; \
46+
groupadd -g 1000 oracle; \
47+
useradd -d /operator -M -s /bin/bash -g 1000 -u 1000 oracle; \
48+
mkdir -p /operator/lib; \
49+
mkdir /logs; \
2550
chown -R 1000:1000 /operator /logs
26-
USER 1000
2751

28-
ENV PATH=$PATH:/operator
52+
USER 1000
2953

30-
ARG VERSION
3154
COPY src/scripts/* /operator/
32-
COPY operator/target/weblogic-kubernetes-operator-$VERSION.jar /operator/weblogic-kubernetes-operator.jar
55+
COPY operator/target/weblogic-kubernetes-operator.jar /operator/weblogic-kubernetes-operator.jar
3356
COPY operator/target/lib/*.jar /operator/lib/
3457

3558
HEALTHCHECK --interval=1m --timeout=10s \
3659
CMD /operator/livenessProbe.sh
3760

3861
WORKDIR /operator/
3962

40-
CMD ["/operator/operator.sh"]
63+
CMD ["/operator/operator.sh"]

README.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](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/).
1818

1919
***
20-
The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.5.0.
21-
This release was published on February 26, 2020.
20+
The [current release of the operator](https://github.com/oracle/weblogic-kubernetes-operator/releases) is 2.6.0.
21+
This release was published on June 22, 2020.
2222
***
2323

2424
# Documentation
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</module>
4242

4343
<module name="RegexpHeader">
44-
<property name="headerFile" value="build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/java.header"/>
44+
<property name="header" value="^// Copyright \(c\) (\d\d\d\d, )+Oracle Corporation and\/or its affiliates\.$\n^// Licensed under the Universal Permissive License v 1\.0 as shown at https://oss\.oracle\.com/licenses/upl\.$"/>
4545
<property name="fileExtensions" value="java"/>
4646
</module>
4747

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
3+
<!DOCTYPE suppressions PUBLIC
4+
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
5+
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
6+
7+
<suppressions>
8+
<!-- There's nothing wrong with these - ignore them b/c they generate noise -->
9+
<suppress checks="AbbreviationAsWordInName" files=".*"/>
10+
11+
<suppress checks="VariableDeclarationUsageDistanceCheck" files=".*"/>
12+
</suppressions>

build-tools/pom.xml

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

build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/java.header

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

0 commit comments

Comments
 (0)