(flink-kubernetes-operator) branch main updated: [FLINK-40104] Logging framework JARs are placed under /log instead of the operator lib directory

[gyfora]

This is an automated email from the ASF dual-hosted git repository.

gyfora pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git


The following commit(s) were added to refs/heads/main by this push:
     new a05d2f604 [FLINK-40104] Logging framework JARs are placed under /log 
instead of the operator lib directory
a05d2f604 is described below

commit a05d2f604618dc8c04d6baa15a4248b429fd896f
Author: Dennis-Mircea Ciupitu <dennis.mircea.ciup...@gmail.com>
AuthorDate: Thu Jul 9 12:44:55 2026 +0300

    [FLINK-40104] Logging framework JARs are placed under /log instead of the 
operator lib directory
---
 Dockerfile           | 7 +++----
 docker-entrypoint.sh | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2198dd1e9..c7c200713 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,8 +44,7 @@ ENV 
WEBHOOK_JAR=flink-kubernetes-webhook-$OPERATOR_VERSION-shaded.jar
 ENV KUBERNETES_STANDALONE_JAR=flink-kubernetes-standalone-$OPERATOR_VERSION.jar
 
 ENV OPERATOR_LIB=$FLINK_HOME/operator-lib
-ENV OPERATOR_LOG=$FLINK_HOME/log
-RUN mkdir -p $OPERATOR_LIB $OPERATOR_LOG/log4j $OPERATOR_LOG/logback
+RUN mkdir -p $OPERATOR_LIB/log4j $OPERATOR_LIB/logback
 
 WORKDIR /flink-kubernetes-operator
 RUN groupadd --system --gid=9999 flink && \
@@ -57,8 +56,8 @@ COPY --chown=flink:flink --from=build 
/app/flink-kubernetes-operator/target/$OPE
 COPY --chown=flink:flink --from=build 
/app/flink-kubernetes-webhook/target/$WEBHOOK_JAR .
 COPY --chown=flink:flink --from=build 
/app/flink-kubernetes-standalone/target/$KUBERNETES_STANDALONE_JAR .
 COPY --chown=flink:flink --from=build 
/app/flink-kubernetes-operator/target/plugins $FLINK_HOME/plugins
-COPY --chown=flink:flink --from=build 
/app/flink-kubernetes-operator/target/log4j/ $FLINK_HOME/log/log4j/
-COPY --chown=flink:flink --from=build 
/app/flink-kubernetes-operator/target/logback/ $FLINK_HOME/log/logback/
+COPY --chown=flink:flink --from=build 
/app/flink-kubernetes-operator/target/log4j/ $OPERATOR_LIB/log4j/
+COPY --chown=flink:flink --from=build 
/app/flink-kubernetes-operator/target/logback/ $OPERATOR_LIB/logback/
 COPY --chown=flink:flink --from=build 
/app/tools/license/licenses-output/NOTICE .
 COPY --chown=flink:flink --from=build 
/app/tools/license/licenses-output/licenses ./licenses
 COPY --chown=flink:flink --from=build /app/LICENSE ./LICENSE
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index db1dde61f..8fa099fc4 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -45,12 +45,11 @@ maybe_enable_jemalloc
 
 # Select the logging framework JARs to put on the classpath.
 # Supported values: "log4j2" (default), "logback".
-OPERATOR_LOG=${FLINK_HOME:-/opt/flink}/log
 LOGGING_FRAMEWORK="${LOGGING_FRAMEWORK:-log4j2}"
 if [ "$LOGGING_FRAMEWORK" = "logback" ]; then
-    LOG_CLASSPATH="$OPERATOR_LOG/logback/*"
+    LOG_CLASSPATH="$OPERATOR_LIB/logback/*"
 else
-    LOG_CLASSPATH="$OPERATOR_LOG/log4j/*"
+    LOG_CLASSPATH="$OPERATOR_LIB/log4j/*"
 fi
 
 if [ "$1" = "help" ]; then