Accumulate service annotations

First, global config, then ServiceAnnotations overriding, then MasterServiceAnnotations and ReplicaServiceAnnotations.

This addresses
zalando#2161 (comment).

Author: owenthereal

pkg/cluster/cluster_test.go

@@ -672,13 +672,15 @@ func TestServiceAnnotations(t *testing.T) {
 			enableTeamIdClusterPrefix:  false,
 			operatorAnnotations:        make(map[string]string),
 			serviceAnnotations: map[string]string{
+				"service.beta.kubernetes.io/aws-load-balancer-nlb-target-type":         "ip",
 				"service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout": "1800",
 			},
 			masterServiceAnnotations: map[string]string{
 				"service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout": "2000",
 			},
 			expect: map[string]string{
 				"external-dns.alpha.kubernetes.io/hostname":                            "acid-test.test.db.example.com,test.acid.db.example.com",
+				"service.beta.kubernetes.io/aws-load-balancer-nlb-target-type":         "ip",
 				"service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout": "2000",
 			},
 		},
@@ -825,13 +827,15 @@ func TestServiceAnnotations(t *testing.T) {
 			enableTeamIdClusterPrefix:   false,
 			operatorAnnotations:         make(map[string]string),
 			serviceAnnotations: map[string]string{
+				"service.beta.kubernetes.io/aws-load-balancer-nlb-target-type":         "ip",
 				"service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout": "1800",
 			},
 			replicaServiceAnnotations: map[string]string{
 				"service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout": "2000",
 			},
 			expect: map[string]string{
 				"external-dns.alpha.kubernetes.io/hostname":                            "acid-test-repl.test.db.example.com,test-repl.acid.db.example.com",
+				"service.beta.kubernetes.io/aws-load-balancer-nlb-target-type":         "ip",
 				"service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout": "2000",
 			},
 		},

pkg/cluster/k8sres.go

@@ -1906,32 +1906,17 @@ func (c *Cluster) generateServiceAnnotations(role PostgresRole, spec *acidv1.Pos
 		annotations[k] = v
 	}
 
-	var specServiceAnnotations map[string]string
 	if spec != nil {
+		annotations = mergeAnnotations(annotations, spec.ServiceAnnotations)
+
 		switch role {
 		case Master:
-			// MasterServiceAnnotations take precedence over ServiceAnnotations if they are not empty
-			if len(spec.MasterServiceAnnotations) > 0 {
-				specServiceAnnotations = spec.MasterServiceAnnotations
-			} else {
-				specServiceAnnotations = spec.ServiceAnnotations
-			}
+			annotations = mergeAnnotations(annotations, spec.MasterServiceAnnotations)
 		case Replica:
-			// ReplicaServiceAnnotations take precedence over ServiceAnnotations if they are not empty
-			if len(spec.ReplicaServiceAnnotations) > 0 {
-				specServiceAnnotations = spec.ReplicaServiceAnnotations
-			} else {
-				specServiceAnnotations = spec.ServiceAnnotations
-			}
-		default:
-			specServiceAnnotations = spec.ServiceAnnotations
+			annotations = mergeAnnotations(annotations, spec.ReplicaServiceAnnotations)
 		}
 	}
 
-	for k, v := range specServiceAnnotations {
-		annotations[k] = v
-	}
-
 	if c.shouldCreateLoadBalancerForService(role, spec) {
 		dnsName := c.dnsName(role)
 
@@ -2401,3 +2386,18 @@ func ensurePath(file string, defaultDir string, defaultFile string) string {
 	}
 	return file
 }
+
+// mergeAnnotations merged annotations that entries in b override the ones in a.
+func mergeAnnotations(a, b map[string]string) map[string]string {
+	result := make(map[string]string)
+
+	for k, v := range a {
+		result[k] = v
+	}
+
+	for k, v := range b {
+		result[k] = v
+	}
+
+	return result
+}