Add ability to add annotations and labels to JobManager service (#320)

spotify · Mar 21, 2022 · 2749ad0 · 2749ad0
1 parent 94ea8d1
commit 2749ad0
Show file tree

Hide file tree

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

diff --git a/apis/flinkcluster/v1beta1/zz_generated.deepcopy.go b/apis/flinkcluster/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/flinkoperator.k8s.io_flinkclusters.yaml b/config/crd/bases/flinkoperator.k8s.io_flinkclusters.yaml
@@ -1647,6 +1647,14 @@ spec:
                   type: object
                 jobManager:
                   properties:
+                    ServiceAnnotations:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    ServiceLabels:
+                      additionalProperties:
+                        type: string
+                      type: object
                     accessScope:
                       type: string
                     extraPorts:

diff --git a/controllers/flinkcluster/flinkcluster_converter.go b/controllers/flinkcluster/flinkcluster_converter.go
@@ -272,14 +272,17 @@ func newJobManagerService(flinkCluster *v1beta1.FlinkCluster) *corev1.Service {
 	var jobManagerServiceName = getJobManagerServiceName(clusterName)
 	var podLabels = getComponentLabels(flinkCluster, "jobmanager")
 	podLabels = mergeLabels(podLabels, jobManagerSpec.PodLabels)
-	var serviceLabels = mergeLabels(podLabels, getRevisionHashLabels(&flinkCluster.Status.Revision))
+	var serviceLabels = mergeLabels(jobManagerSpec.ServiceLabels, getRevisionHashLabels(&flinkCluster.Status.Revision))
+	var serviceAnnotations = jobManagerSpec.ServiceAnnotations
+
 	var jobManagerService = &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: clusterNamespace,
 			Name:      jobManagerServiceName,
 			OwnerReferences: []metav1.OwnerReference{
 				ToOwnerReference(flinkCluster)},
-			Labels: serviceLabels,
+			Labels:      serviceLabels,
+			Annotations: serviceAnnotations,
 		},
 		Spec: corev1.ServiceSpec{
 			Selector: podLabels,
@@ -294,11 +297,11 @@ func newJobManagerService(flinkCluster *v1beta1.FlinkCluster) *corev1.Service {
 		jobManagerService.Spec.Type = corev1.ServiceTypeClusterIP
 	case v1beta1.AccessScopeVPC:
 		jobManagerService.Spec.Type = corev1.ServiceTypeLoadBalancer
-		jobManagerService.Annotations =
+		jobManagerService.Annotations = mergeLabels(serviceAnnotations,
 			map[string]string{
 				"networking.gke.io/load-balancer-type":                         "Internal",
 				"networking.gke.io/internal-load-balancer-allow-global-access": "true",
-			}
+			})
 	case v1beta1.AccessScopeExternal:
 		jobManagerService.Spec.Type = corev1.ServiceTypeLoadBalancer
 	case v1beta1.AccessScopeNodePort:

diff --git a/controllers/flinkcluster/flinkcluster_converter_test.go b/controllers/flinkcluster/flinkcluster_converter_test.go
@@ -485,9 +485,6 @@ func TestGetDesiredClusterState(t *testing.T) {
 			Name:      "flinkjobcluster-sample-jobmanager",
 			Namespace: "default",
 			Labels: map[string]string{
-				"app":             "flink",
-				"cluster":         "flinkjobcluster-sample",
-				"component":       "jobmanager",
 				RevisionNameLabel: "flinkjobcluster-sample-85dc8f749",
 			},
 			Annotations: map[string]string{

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