From 4ffb41ab44eb0d0d9cf1a5340e451ed4bd8b514b Mon Sep 17 00:00:00 2001 From: Shai Katz Date: Thu, 12 Nov 2020 21:19:19 +0200 Subject: [PATCH] Add MC Gateway Service Annotations (#5185) Fixes #5182 That will allow setting the load balancer as internal. Signed-off-by: Shai Katz --- charts/linkerd2-multicluster/README.md | 3 ++- charts/linkerd2-multicluster/templates/gateway.yaml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/linkerd2-multicluster/README.md b/charts/linkerd2-multicluster/README.md index 6f418054f..1c18c415b 100644 --- a/charts/linkerd2-multicluster/README.md +++ b/charts/linkerd2-multicluster/README.md @@ -13,7 +13,7 @@ linkerd2-multicluster chart and their default values. | Parameter | Description | Default | |---------------------------------|---------------------------------------------------------------------------------------------|----------------------------------------------| |`controllerComponentLabel` | Control plane label. Do not edit |`linkerd.io/control-plane-component` | -|`controllerImage` | Docker image for the Service mirror component (uses the Linkerd controller image) |`ghcr.io/linkerd/controller` | +|`controllerImage` | Docker image for the Service mirror component (uses the Linkerd controller image) |`ghcr.io/linkerd/controller` | |`controllerImageVersion` | Tag for the Service Mirror container Docker image |`latest version` | |`createdByAnnotation` | Annotation label for the proxy create. Do not edit. |`linkerd.io/created-by` | |`gateway` | If the gateway component should be installed |`true` | @@ -26,6 +26,7 @@ linkerd2-multicluster chart and their default values. |`gatewayProbePath` | The path that will be used by remote clusters for determining whether the gateway is alive |`/health` | |`gatewayProbePort` | The port used for liveliness probing |`4181` | |`gatewayProbeSeconds` | The interval (in seconds) between liveness probes |`3` | +|`gatewayServiceAnnotations` | Additional annotations to add to the gateway service |`{}` | |`identityTrustDomain` | Trust domain used for identity of the existing linkerd installation |`cluster.local` | |`installNamespace` | If the namespace should be installed |`true` | |`linkerdNamespace` | The namespace of the existing Linkerd installation |`linkerd` | diff --git a/charts/linkerd2-multicluster/templates/gateway.yaml b/charts/linkerd2-multicluster/templates/gateway.yaml index 4cac56680..9f45c70ae 100644 --- a/charts/linkerd2-multicluster/templates/gateway.yaml +++ b/charts/linkerd2-multicluster/templates/gateway.yaml @@ -122,6 +122,7 @@ metadata: mirror.linkerd.io/multicluster-gateway: "true" {{.Values.controllerComponentLabel}}: gateway {{.Values.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.linkerdVersion) .Values.cliVersion}} + {{- with .Values.gatewayServiceAnnotations }}{{ toYaml . | trim | nindent 4 }}{{- end }} spec: ports: - name: mc-gateway