Add flinkPropertiesSecret for supporting secret properties

Resolves GoogleCloudPlatform#383 Signed-off-by: Sunghoon Kang <[email protected]>
devholic · May 12, 2021 · 2add80b · 2add80b
1 parent 0310df7
commit 2add80b
Show file tree

Hide file tree

Showing 11 changed files with 665 additions and 76 deletions.
diff --git a/api/v1beta1/flinkcluster_default_test.go b/api/v1beta1/flinkcluster_default_test.go
@@ -110,7 +110,8 @@ func TestSetDefault(t *testing.T) {
 				},
 				SecurityContext: nil,
 			},
-			FlinkProperties: nil,
+			FlinkProperties:       nil,
+			FlinkPropertiesSecret: nil,
 			HadoopConfig: &HadoopConfig{
 				MountPath: "/etc/hadoop/conf",
 			},
@@ -204,7 +205,8 @@ func TestSetNonDefault(t *testing.T) {
 					AfterJobCancelled: "KeepCluster",
 				},
 			},
-			FlinkProperties: nil,
+			FlinkProperties:       nil,
+			FlinkPropertiesSecret: nil,
 			HadoopConfig: &HadoopConfig{
 				MountPath: "/opt/flink/hadoop/conf",
 			},
@@ -268,7 +270,8 @@ func TestSetNonDefault(t *testing.T) {
 					AfterJobCancelled: "KeepCluster",
 				},
 			},
-			FlinkProperties: nil,
+			FlinkProperties:       nil,
+			FlinkPropertiesSecret: nil,
 			HadoopConfig: &HadoopConfig{
 				MountPath: "/opt/flink/hadoop/conf",
 			},

diff --git a/api/v1beta1/flinkcluster_types.go b/api/v1beta1/flinkcluster_types.go
@@ -447,9 +447,12 @@ type FlinkClusterSpec struct {
 	// TaskManager and job containers.
 	EnvFrom []corev1.EnvFromSource `json:"envFrom,omitempty"`
 
-	// Flink properties which are appened to flink-conf.yaml.
+	// Flink properties which are appended to flink-conf.yaml.
 	FlinkProperties map[string]string `json:"flinkProperties,omitempty"`
 
+	// Secret source of Flink properties which will be appended to flink-conf.yaml.
+	FlinkPropertiesSecret *corev1.SecretEnvSource `json:"flinkPropertiesSecret,omitempty"`
+
 	// Config for Hadoop.
 	HadoopConfig *HadoopConfig `json:"hadoopConfig,omitempty"`
 

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go