Provide operator configuration via FLINK_PROPERTIES fixes lyft#135

tweise · Dec 21, 2019 · 9d99a4c · 9d99a4c
1 parent 8460804
commit 9d99a4c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 20 deletions.
diff --git a/examples/wordcount/Dockerfile b/examples/wordcount/Dockerfile
@@ -7,7 +7,7 @@ ENV PATH=$MAVEN_HOME/bin:$PATH
 # Install dependencies
 RUN set -ex; \
   apt-get update \
-  && apt-get -y install gettext-base openjdk-8-jdk-headless \
+  && apt-get -y install openjdk-8-jdk-headless \
   && rm -rf /var/lib/apt/lists/*
 
 # Install Maven
@@ -25,6 +25,4 @@ RUN \
   JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 mvn package \
   && ln -s /code/target $FLINK_HOME/flink-web-upload
 
-COPY docker-entrypoint.sh /flinkk8soperator-entrypoint.sh
-ENTRYPOINT ["/flinkk8soperator-entrypoint.sh"]
 CMD ["help"]
diff --git a/examples/wordcount/docker-entrypoint.sh b/examples/wordcount/docker-entrypoint.sh
diff --git a/integ/operator-test-app/docker-entrypoint.sh b/integ/operator-test-app/docker-entrypoint.sh
@@ -14,8 +14,8 @@ drop_privs_cmd() {
 }
 
 # Add in extra configs set by the operator
-if [ -n "$OPERATOR_FLINK_CONFIG" ]; then
-    echo "$OPERATOR_FLINK_CONFIG" >> "/usr/local/flink-conf.yaml"
+if [ -n "$FLINK_PROPERTIES" ]; then
+    echo "$FLINK_PROPERTIES" >> "/usr/local/flink-conf.yaml"
 fi
 
 envsubst < /usr/local/flink-conf.yaml > $FLINK_HOME/conf/flink-conf.yaml

diff --git a/pkg/controller/flink/container_utils.go b/pkg/controller/flink/container_utils.go
@@ -23,7 +23,7 @@ const (
 	AwsMetadataServiceNumAttemptsKey = "AWS_METADATA_SERVICE_NUM_ATTEMPTS"
 	AwsMetadataServiceTimeout        = "5"
 	AwsMetadataServiceNumAttempts    = "20"
-	OperatorFlinkConfig              = "OPERATOR_FLINK_CONFIG"
+	OperatorFlinkConfig              = "FLINK_PROPERTIES"
 	HostName                         = "HOST_NAME"
 	HostIP                           = "HOST_IP"
 	FlinkDeploymentTypeEnv           = "FLINK_DEPLOYMENT_TYPE"
@@ -208,6 +208,8 @@ func InjectOperatorCustomizedConfig(deployment *appsv1.Deployment, app *v1beta1.
 				if deploymentType == FlinkDeploymentTypeTaskmanager {
 					env.Value = fmt.Sprintf("%staskmanager.host: $HOST_IP\n", env.Value)
 				}
+				// backward compatibility: https://github.com/lyft/flinkk8soperator/issues/135
+				newEnv = append(newEnv, v1.EnvVar{ Name: "OPERATOR_FLINK_CONFIG", Value: env.Value })
 			}
 			newEnv = append(newEnv, env)
 		}

diff --git a/pkg/controller/flink/job_manager_controller_test.go b/pkg/controller/flink/job_manager_controller_test.go
@@ -91,7 +91,7 @@ func TestJobManagerCreateSuccess(t *testing.T) {
 				"taskmanager.numberOfTaskSlots: 16\n\n"+
 				"jobmanager.rpc.address: app-name-"+hash+"\n",
 				common.GetEnvVar(deployment.Spec.Template.Spec.Containers[0].Env,
-					"OPERATOR_FLINK_CONFIG").Value)
+					"FLINK_PROPERTIES").Value)
 		case 2:
 			service := object.(*coreV1.Service)
 			assert.Equal(t, app.Name, service.Name)
@@ -169,7 +169,7 @@ func TestJobManagerHACreateSuccess(t *testing.T) {
 				"high-availability.cluster-id: app-name-"+hash+"\n"+
 				"jobmanager.rpc.address: $HOST_IP\n",
 				common.GetEnvVar(deployment.Spec.Template.Spec.Containers[0].Env,
-					"OPERATOR_FLINK_CONFIG").Value)
+					"FLINK_PROPERTIES").Value)
 		case 2:
 			service := object.(*coreV1.Service)
 			assert.Equal(t, app.Name, service.Name)

diff --git a/pkg/controller/flink/task_manager_controller_test.go b/pkg/controller/flink/task_manager_controller_test.go
@@ -87,7 +87,7 @@ func TestTaskManagerCreateSuccess(t *testing.T) {
 			"jobmanager.rpc.address: app-name-"+hash+"\n"+
 			"taskmanager.host: $HOST_IP\n",
 			common.GetEnvVar(deployment.Spec.Template.Spec.Containers[0].Env,
-				"OPERATOR_FLINK_CONFIG").Value)
+				"FLINK_PROPERTIES").Value)
 
 		return nil
 	}
@@ -136,7 +136,7 @@ func TestTaskManagerHACreateSuccess(t *testing.T) {
 			"high-availability.cluster-id: app-name-"+hash+"\n"+
 			"taskmanager.host: $HOST_IP\n",
 			common.GetEnvVar(deployment.Spec.Template.Spec.Containers[0].Env,
-				"OPERATOR_FLINK_CONFIG").Value)
+				"FLINK_PROPERTIES").Value)
 
 		return nil
 	}