Skip to content

Commit 3c04953

Browse files
committed
Merge branch 'no-logstash-manipulation' into 'main'
Move logging initialization to Java and remove init-container See merge request weblogic-cloud/weblogic-kubernetes-operator!5037
2 parents 2eb2554 + 4b91ffd commit 3c04953

File tree

20 files changed

+210
-348
lines changed

20 files changed

+210
-348
lines changed

Dockerfile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,19 @@ RUN set -eux; \
4747
java -Xshare:dump; \
4848
useradd -d /operator -M -s /bin/bash -g root -u 1000 oracle; \
4949
mkdir -m 775 /operator; \
50-
mkdir -m 775 /deployment; \
51-
mkdir -m 775 /probes; \
5250
mkdir -m 775 /logs; \
5351
mkdir /operator/lib; \
54-
chown -R oracle:root /operator /deployment /probes /logs
52+
chown -R oracle:root /operator /logs
5553

5654
USER oracle
5755

5856
COPY --chown=oracle:root operator/scripts/* /operator/
59-
COPY --chown=oracle:root deployment/scripts/* /deployment/
60-
COPY --chown=oracle:root probes/scripts/* /probes/
6157
COPY --chown=oracle:root operator/target/weblogic-kubernetes-operator.jar /operator/weblogic-kubernetes-operator.jar
6258
COPY --chown=oracle:root operator/target/lib/*.jar /operator/lib/
6359

6460
HEALTHCHECK --interval=1m --timeout=10s \
65-
CMD /probes/livenessProbe.sh
61+
CMD /operator/livenessProbe.sh
6662

67-
WORKDIR /deployment/
63+
WORKDIR /operator/
6864

69-
CMD ["/deployment/operator.sh"]
65+
CMD ["/operator/operator.sh"]

common/src/main/resources/Operator.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ WLSKO-0028=No servers configured in WebLogic cluster with name {0}
1212
WLSKO-0029=Verifying that operator service account can access required operations on required resources in namespace {0}
1313
WLSKO-0030=Access denied for operator service account for operation {0} on resource {1}
1414
WLSKO-0034=Starting operator liveness Thread
15-
WLSKO-0035=Could not create liveness file /probes/.alive
15+
WLSKO-0035=Could not create liveness file /deployment/.alive
1616
WLSKO-0037=The request must contain an ''Authorization'' header whose value is ''Bearer <accessToken>'' where <accessToken> is a Kubernetes access token
1717
WLSKO-0038=Creating or updating Kubernetes presence for WebLogic Domain with UID: {0}
1818
WLSKO-0039=Watch event triggered for WebLogic Domain with UID: {0}

deployment/scripts/logstash.properties

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

deployment/scripts/operator.sh

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

deployment/scripts/webhook.sh

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

0 commit comments

Comments
 (0)