linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add MC Gateway Service Annotations (#5185) 

Fixes #5182

That will allow setting the load balancer as internal.

Signed-off-by: Shai Katz <shai@soluto.com>
This commit is contained in:
Shai Katz 2020-11-12 21:19:19 +02:00 committed by GitHub
parent 440a201997
commit 4ffb41ab44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/linkerd2-multicluster/README.md
View File

@ -13,7 +13,7 @@ linkerd2-multicluster chart and their default values.
| Parameter | Description | Default | | Parameter | Description | Default |
|---------------------------------|---------------------------------------------------------------------------------------------|----------------------------------------------| |---------------------------------|---------------------------------------------------------------------------------------------|----------------------------------------------|
|`controllerComponentLabel` | Control plane label. Do not edit |`linkerd.io/control-plane-component` | |`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` | |`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` | |`createdByAnnotation` | Annotation label for the proxy create. Do not edit. |`linkerd.io/created-by` |
|`gateway` | If the gateway component should be installed |`true` | |`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` | |`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` | |`gatewayProbePort` | The port used for liveliness probing |`4181` |
|`gatewayProbeSeconds` | The interval (in seconds) between liveness probes |`3` | |`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` | |`identityTrustDomain` | Trust domain used for identity of the existing linkerd installation |`cluster.local` |
|`installNamespace` | If the namespace should be installed |`true` | |`installNamespace` | If the namespace should be installed |`true` |
|`linkerdNamespace` | The namespace of the existing Linkerd installation |`linkerd` | |`linkerdNamespace` | The namespace of the existing Linkerd installation |`linkerd` |

1
charts/linkerd2-multicluster/templates/gateway.yaml
View File

@ -122,6 +122,7 @@ metadata:
mirror.linkerd.io/multicluster-gateway: "true" mirror.linkerd.io/multicluster-gateway: "true"
{{.Values.controllerComponentLabel}}: gateway {{.Values.controllerComponentLabel}}: gateway
{{.Values.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.linkerdVersion) .Values.cliVersion}} {{.Values.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.linkerdVersion) .Values.cliVersion}}
{{- with .Values.gatewayServiceAnnotations }}{{ toYaml . | trim | nindent 4 }}{{- end }}
spec: spec:
ports: ports:
- name: mc-gateway - name: mc-gateway