Add ability to add annotations to JobManager service

spotify · Mar 9, 2022 · 8e140a0 · 8e140a0
1 parent 312c1ac
commit 8e140a0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/apis/flinkcluster/v1beta1/flinkcluster_types.go b/apis/flinkcluster/v1beta1/flinkcluster_types.go
@@ -195,6 +195,9 @@ type JobManagerSpec struct {
 	// Currently `VPC, External` are only available for GKE.
 	AccessScope string `json:"accessScope,omitempty"`
 
+	// _(Optional)_ Define JobManager Service annotations for configuration.
+	Annotations map[string]string `json:"annotations,omitempty"`
+
 	// _(Optional)_ Provide external access to JobManager UI/API.
 	Ingress *JobManagerIngressSpec `json:"ingress,omitempty"`
 

diff --git a/config/crd/bases/flinkoperator.k8s.io_flinkclusters.yaml b/config/crd/bases/flinkoperator.k8s.io_flinkclusters.yaml
@@ -1649,6 +1649,10 @@ spec:
                   properties:
                     accessScope:
                       type: string
+                    annotations:
+                      additionalProperties:
+                        type: string
+                      type: object
                     extraPorts:
                       items:
                         properties:

diff --git a/controllers/flinkcluster/flinkcluster_converter.go b/controllers/flinkcluster/flinkcluster_converter.go
@@ -292,6 +292,7 @@ func newJobManagerService(flinkCluster *v1beta1.FlinkCluster) *corev1.Service {
 	switch jobManagerSpec.AccessScope {
 	case v1beta1.AccessScopeCluster:
 		jobManagerService.Spec.Type = corev1.ServiceTypeClusterIP
+		jobManagerService.Annotations = jobManagerSpec.Annotations
 	case v1beta1.AccessScopeVPC:
 		jobManagerService.Spec.Type = corev1.ServiceTypeLoadBalancer
 		jobManagerService.Annotations =
@@ -301,8 +302,10 @@ func newJobManagerService(flinkCluster *v1beta1.FlinkCluster) *corev1.Service {
 			}
 	case v1beta1.AccessScopeExternal:
 		jobManagerService.Spec.Type = corev1.ServiceTypeLoadBalancer
+		jobManagerService.Annotations = jobManagerSpec.Annotations
 	case v1beta1.AccessScopeNodePort:
 		jobManagerService.Spec.Type = corev1.ServiceTypeNodePort
+		jobManagerService.Annotations = jobManagerSpec.Annotations
 	case v1beta1.AccessScopeHeadless:
 		// Headless services do not allocate any sort of VIP or LoadBalancer, and merely
 		// collect a set of Pod IPs that are assumed to be independently routable:

diff --git a/helm-chart/flink-operator/templates/flink-cluster-crd.yaml b/helm-chart/flink-operator/templates/flink-cluster-crd.yaml
@@ -1593,6 +1593,10 @@ spec:
                 properties:
                   accessScope:
                     type: string
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   extraPorts:
                     items:
                       properties: