add some missing helm values for multicluster setup (#5346)

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 <kevin@kleimkuhler.com>
Co-authored-by: Björn Wenzel <bjoern.wenzel@dbschenker.com>
This commit is contained in:
Kevin Leimkuhler 2020-12-08 10:27:16 -05:00 committed by GitHub
parent 48666a7673
commit 15dc97c70e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions

View File

@ -28,7 +28,9 @@ Kubernetes: `>=1.13.0-0`
| gatewayProbePort | int | `4181` | The port used for liveliness probing | | gatewayProbePort | int | `4181` | The port used for liveliness probing |
| gatewayProbeSeconds | int | `3` | The interval (in seconds) between liveness probes | | gatewayProbeSeconds | int | `3` | The interval (in seconds) between liveness probes |
| gatewayServiceType | string | `"LoadBalancer"` | Service Type of gateway Service | | 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 | | installNamespace | bool | `true` | If the namespace should be installed |
| linkerdNamespace | string | `"linkerd"` | Namespace of linkerd installation |
| linkerdVersion | string | `"linkerdVersionValue"` | Control plane version | | linkerdVersion | string | `"linkerdVersionValue"` | Control plane version |
| namespace | string | `"linkerd-multicluster"` | Service Mirror component namespace | | namespace | string | `"linkerd-multicluster"` | Service Mirror component namespace |
| proxyOutboundPort | int | `4140` | The port on which the proxy accepts outbound traffic | | proxyOutboundPort | int | `4140` | The port on which the proxy accepts outbound traffic |

View File

@ -40,3 +40,7 @@ remoteMirrorServiceAccount: true
remoteMirrorServiceAccountName: linkerd-service-mirror-remote-access-default remoteMirrorServiceAccountName: linkerd-service-mirror-remote-access-default
# -- Service Type of gateway Service # -- Service Type of gateway Service
gatewayServiceType: LoadBalancer gatewayServiceType: LoadBalancer
# -- Namespace of linkerd installation
linkerdNamespace: linkerd
# -- Identity Trust Domain of the certificate authority
identityTrustDomain: cluster.local