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 ad8e60a [FLINK-27000] Support to set JVM args for operator (#153)
ad8e60a is described below
commit ad8e60a1a7db18de429a59b01f5ddd62df9fc37b
Author: Aitozi <[email protected]>
AuthorDate: Mon Apr 4 12:57:29 2022 +0800
[FLINK-27000] Support to set JVM args for operator (#153)
---
docker-entrypoint.sh | 4 ++--
.../java/org/apache/flink/kubernetes/operator/FlinkOperator.java | 3 ++-
.../flink/kubernetes/operator/admission/FlinkOperatorWebhook.java | 3 ++-
helm/flink-kubernetes-operator/templates/flink-operator.yaml | 4 ++++
helm/flink-kubernetes-operator/values.yaml | 5 +++++
5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 2889ac2..93a5f13 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -27,12 +27,12 @@ if [ "$1" = "help" ]; then
elif [ "$1" = "operator" ]; then
echo "Starting Operator"
- exec java -cp /$FLINK_KUBERNETES_SHADED_JAR:/$OPERATOR_JAR $LOG_CONFIG
org.apache.flink.kubernetes.operator.FlinkOperator
+ exec java -cp /$FLINK_KUBERNETES_SHADED_JAR:/$OPERATOR_JAR $LOG_CONFIG
$JVM_ARGS org.apache.flink.kubernetes.operator.FlinkOperator
elif [ "$1" = "webhook" ]; then
echo "Starting Webhook"
# Adds the operator shaded jar on the classpath when the webhook starts
- exec java -cp /$FLINK_KUBERNETES_SHADED_JAR:/$OPERATOR_JAR:/$WEBHOOK_JAR
$LOG_CONFIG org.apache.flink.kubernetes.operator.admission.FlinkOperatorWebhook
+ exec java -cp /$FLINK_KUBERNETES_SHADED_JAR:/$OPERATOR_JAR:/$WEBHOOK_JAR
$LOG_CONFIG $JVM_ARGS
org.apache.flink.kubernetes.operator.admission.FlinkOperatorWebhook
fi
args=("${args[@]}")
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/FlinkOperator.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/FlinkOperator.java
index 6036f9a..a569733 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/FlinkOperator.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/FlinkOperator.java
@@ -36,6 +36,7 @@ import
org.apache.flink.kubernetes.operator.service.FlinkService;
import org.apache.flink.kubernetes.operator.utils.FlinkUtils;
import org.apache.flink.kubernetes.operator.validation.DefaultValidator;
import org.apache.flink.kubernetes.operator.validation.FlinkResourceValidator;
+import org.apache.flink.runtime.util.EnvironmentInformation;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
@@ -65,7 +66,6 @@ public class FlinkOperator {
}
public FlinkOperator(DefaultConfig defaultConfig) {
- LOG.info("Starting Flink Kubernetes Operator");
OperatorMetricUtils.initOperatorMetrics(defaultConfig.getOperatorConfig());
this.defaultConfig = defaultConfig;
@@ -156,6 +156,7 @@ public class FlinkOperator {
}
public static void main(String... args) {
+ EnvironmentInformation.logEnvironmentInfo(LOG, "Flink Kubernetes
Operator", args);
new FlinkOperator().run();
}
}
diff --git
a/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/FlinkOperatorWebhook.java
b/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/FlinkOperatorWebhook.java
index ff1db98..cfcd991 100644
---
a/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/FlinkOperatorWebhook.java
+++
b/flink-kubernetes-webhook/src/main/java/org/apache/flink/kubernetes/operator/admission/FlinkOperatorWebhook.java
@@ -19,6 +19,7 @@ package org.apache.flink.kubernetes.operator.admission;
import org.apache.flink.kubernetes.operator.utils.EnvUtils;
import org.apache.flink.kubernetes.operator.validation.DefaultValidator;
+import org.apache.flink.runtime.util.EnvironmentInformation;
import org.apache.flink.shaded.netty4.io.netty.bootstrap.ServerBootstrap;
import org.apache.flink.shaded.netty4.io.netty.channel.Channel;
@@ -54,7 +55,7 @@ public class FlinkOperatorWebhook {
private static final int MAX_CONTEXT_LENGTH = 104_857_600;
public static void main(String[] args) throws Exception {
- LOG.info("Starting Flink Kubernetes Webhook");
+ EnvironmentInformation.logEnvironmentInfo(LOG, "Flink Kubernetes
Webhook", args);
AdmissionHandler endpoint =
new AdmissionHandler(new FlinkValidator(new
DefaultValidator()));
ChannelInitializer<SocketChannel> initializer =
createChannelInitializer(endpoint);
diff --git a/helm/flink-kubernetes-operator/templates/flink-operator.yaml
b/helm/flink-kubernetes-operator/templates/flink-operator.yaml
index 64bc5c8..09a8025 100644
--- a/helm/flink-kubernetes-operator/templates/flink-operator.yaml
+++ b/helm/flink-kubernetes-operator/templates/flink-operator.yaml
@@ -67,6 +67,8 @@ spec:
value: /opt/flink-operator/conf
- name: LOG_CONFIG
value:
-Dlog4j.configurationFile=/opt/flink-operator/conf/log4j2.properties
+ - name: JVM_ARGS
+ value: {{ .Values.jvmArgs.operator }}
- name: FLINK_OPERATOR_WATCH_NAMESPACES
value: {{ join "," .Values.watchNamespaces }}
volumeMounts:
@@ -102,6 +104,8 @@ spec:
value: "9443"
- name: LOG_CONFIG
value:
-Dlog4j.configurationFile=/opt/flink-operator/conf/log4j2.properties
+ - name: JVM_ARGS
+ value: {{ .Values.jvmArgs.webhook }}
volumeMounts:
- name: keystore
mountPath: "/certs"
diff --git a/helm/flink-kubernetes-operator/values.yaml
b/helm/flink-kubernetes-operator/values.yaml
index 976d61f..6b3d1a4 100644
--- a/helm/flink-kubernetes-operator/values.yaml
+++ b/helm/flink-kubernetes-operator/values.yaml
@@ -95,3 +95,8 @@ metrics:
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
+
+# Set the jvm start up options for webhook and operator
+jvmArgs:
+ webhook: ""
+ operator: ""
