From 15dc97c70ee22fa0be0c5d3ed77c80edef08e2f1 Mon Sep 17 00:00:00 2001 From: Kevin Leimkuhler Date: Tue, 8 Dec 2020 10:27:16 -0500 Subject: [PATCH] add some missing helm values for multicluster setup (#5346) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original description: > **Subject** > Add missing helm values for multicluster setup > > **Problem** > When executing this without the linkerd command the two variables are missing and the rendering will generate empty values. > This produces the following gateway identity, that is also used in the gateway link command to generate the link crd: > > ``` > mirror.linkerd.io/gateway-identity: linkerd-gateway.linkerd-multicluster.serviceaccount.identity.. > ``` > > **Solution** > Add the values as defaults to the helm chart values.yaml file. If the cli is used they are overwritten by the following parameters: > * https://github.com/linkerd/linkerd2/blob/main/cli/cmd/multicluster.go#L197 > * https://github.com/linkerd/linkerd2/blob/main/cli/cmd/multicluster.go#L196 Signed-off-by: Kevin Leimkuhler Co-authored-by: Björn Wenzel --- multicluster/charts/linkerd2-multicluster/README.md | 2 ++ multicluster/charts/linkerd2-multicluster/values.yaml | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/multicluster/charts/linkerd2-multicluster/README.md b/multicluster/charts/linkerd2-multicluster/README.md index 79a3225f5..37488284a 100644 --- a/multicluster/charts/linkerd2-multicluster/README.md +++ b/multicluster/charts/linkerd2-multicluster/README.md @@ -28,7 +28,9 @@ Kubernetes: `>=1.13.0-0` | gatewayProbePort | int | `4181` | The port used for liveliness probing | | gatewayProbeSeconds | int | `3` | The interval (in seconds) between liveness probes | | gatewayServiceType | string | `"LoadBalancer"` | Service Type of gateway Service | +| identityTrustDomain | string | `"cluster.local"` | Identity Trust Domain of the certificate authority | | installNamespace | bool | `true` | If the namespace should be installed | +| linkerdNamespace | string | `"linkerd"` | Namespace of linkerd installation | | linkerdVersion | string | `"linkerdVersionValue"` | Control plane version | | namespace | string | `"linkerd-multicluster"` | Service Mirror component namespace | | proxyOutboundPort | int | `4140` | The port on which the proxy accepts outbound traffic | diff --git a/multicluster/charts/linkerd2-multicluster/values.yaml b/multicluster/charts/linkerd2-multicluster/values.yaml index e89dc8996..fc705bee4 100644 --- a/multicluster/charts/linkerd2-multicluster/values.yaml +++ b/multicluster/charts/linkerd2-multicluster/values.yaml @@ -40,3 +40,7 @@ remoteMirrorServiceAccount: true remoteMirrorServiceAccountName: linkerd-service-mirror-remote-access-default # -- Service Type of gateway Service gatewayServiceType: LoadBalancer +# -- Namespace of linkerd installation +linkerdNamespace: linkerd +# -- Identity Trust Domain of the certificate authority +identityTrustDomain: cluster.local