add serviceAnnotation to KubernetesResourcesSpec.

ARCHITECTURE.md

@@ -156,6 +156,7 @@ imagePullPolicy| [ImagePullPolicy](https://kubernetes.io/docs/concepts/container
 priorityClassName | [priority class name](https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass)
 nodeSelector| [node selector](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector)
 affinity | [affinity and anti-affinity](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity)
+serviceAnnotations | [service annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)
 
 These K8s setting are available for each component under the `k8s` field, for example:
 

cmd/mesh/testdata/manifest-generate/input/telemetry_k8s_settings.yaml

@@ -50,3 +50,5 @@ spec:
             requests:
               cpu: 888m
               memory: 999Mi
+          serviceAnnotations:
+            cloud.google.com/load-balancer-type: "internal"

cmd/mesh/testdata/manifest-generate/output/telemetry_k8s_settings.yaml

@@ -7338,12 +7338,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: istio-telemetry
-  namespace: istio-telemetry
+  annotations:
+    cloud.google.com/load-balancer-type: internal
   labels:
     app: mixer
     istio: mixer
     release: istio
+  name: istio-telemetry
+  namespace: istio-telemetry
 spec:
   ports:
   - name: grpc-mixer
@@ -7357,6 +7359,7 @@ spec:
   selector:
     istio: mixer
     istio-mixer-type: telemetry
+
 ---
 
 

cmd/mesh/testdata/manifest-migrate/output/default_values.yaml

@@ -71,6 +71,7 @@ spec:
             requests:
               cpu: 100m
               memory: 128Mi
+          serviceAnnotations: {}
           strategy:
             rollingUpdate:
               maxSurge: 100%
@@ -103,6 +104,7 @@ spec:
             requests:
               cpu: 100m
               memory: 128Mi
+          serviceAnnotations: {}
           strategy:
             rollingUpdate:
               maxSurge: 100%

data/translateConfig/reverseTranslateConfig-1.5.yaml

@@ -11,4 +11,5 @@ kubernetesPatternMapping:
   "{{.ValueComponentName}}.replicaCount":          "{{.FeatureName}}.Components.{{.ComponentName}}.K8s.ReplicaCount"
   "{{.ValueComponentName}}.resources":             "{{.FeatureName}}.Components.{{.ComponentName}}.K8s.Resources"
   "{{.ValueComponentName}}.rollingMaxSurge":       "{{.FeatureName}}.Components.{{.ComponentName}}.K8s.Strategy"
-  "{{.ValueComponentName}}.rollingMaxUnavailable": "{{.FeatureName}}.Components.{{.ComponentName}}.K8s.Strategy"
+  "{{.ValueComponentName}}.rollingMaxUnavailable": "{{.FeatureName}}.Components.{{.ComponentName}}.K8s.Strategy"
+  "{{.ValueComponentName}}.serviceAnnotations":    "{{.FeatureName}}.Components.{{.ComponentName}}.K8s.ServiceAnnotations"

data/translateConfig/translateConfig-1.5.yaml

@@ -42,6 +42,8 @@ kubernetesMapping:
     outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.strategy"
   "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Tolerations":
     outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.tolerations"
+  "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.ServiceAnnotations":
+    outPath: "[Service:{{.ResourceName}}].metadata.annotations"
 toFeature:
   Base:               Base
   Pilot:              TrafficManagement

pkg/apis/istio/v1alpha2/istiocontrolplane_types.proto

@@ -532,6 +532,9 @@ message KubernetesResourcesSpec {
     // k8s toleration
     // https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
     repeated k8s.io.api.core.v1.Toleration tolerations = 14;
+    // k8s service annotations.
+    // https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+    map<string, string> service_annotations = 15;
 
     // Overlays for k8s resources in rendered manifests.
     repeated k8sObjectOverlay overlays = 100;