Integration tests pass

Signed-off-by: Alex Leong <[email protected]>
linkerd · Jul 14, 2020 · a913f8f · a913f8f
1 parent 6876595
commit a913f8f
Show file tree

Hide file tree

Showing 12 changed files with 90 additions and 21 deletions.
diff --git a/charts/linkerd2-multicluster-link/.helmignore b/charts/linkerd2-multicluster-link/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+OWNERS
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/charts/linkerd2-multicluster-link/Chart.yaml b/charts/linkerd2-multicluster-link/Chart.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+appVersion: edge-XX.X.X
+description: A helm chart containing the resources to enable mirroring of services from a remote cluster
+kubeVersion: ">=1.13.0-0"
+icon: https://linkerd.io/images/logo-only-200h.png
+name: "linkerd2-multicluster-link"
+version: 0.1.0
diff --git a/charts/linkerd2-multicluster-link/README.md b/charts/linkerd2-multicluster-link/README.md
@@ -0,0 +1,40 @@
+
+# Linkerd2-multicluster-link Helm Chart
+
+Linkerd is a *service mesh*, designed to give platform-wide observability,
+reliability, and security without requiring configuration or code changes. This
+chart provides the components needed to enable communication between clusters.
+
+## Configuration
+
+The following table lists the configurable parameters of the
+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)           |`gcr.io/linkerd-io/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`                                        |
+|`gatewayLocalProbePath`          | The path that will be used by the local liveness checks to ensure the gateway is alive      |`/health-local`                               |
+|`gatewayLocalProbePort`          | The port that will be used by the local liveness checks to ensure the gateway is alive      |`8888`                                        |
+|`gatewayName`                    | The name of the gateway that will be installed                                              |`linkerd-gateway`                             |
+|`gatewayNginxImage`              | The Nginx image                                                                             |`nginx`                                       |
+|`gatewayNginxImageVersion`       | The version of the Nginx image                                                              |`1.17`                                        |
+|`gatewayPort`                    | The port on which all the gateway will accept incoming traffic                              |`4143`                                        |
+|`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`                                           |
+|`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`                                     |
+|`linkerdVersion`                 | Control plane version                                                                       | latest version                               |
+|`namespace`                      | Service Mirror component namespace                                                          |`linkerd-multicluster`                        |
+|`proxyOutboundPort`              | The port on which the proxy accepts outbound traffic                                        |`4140`                                        |
+|`remoteMirrorServiceAccountName` | The name of the service account used to allow remote clusters to mirror local services      |`linkerd-service-mirror-remote-access-default`|
+|`remoteMirrorServiceAccount`     | If the remote mirror service account should be installed                                    |`true`                                        |
+|`serviceMirror`                  | If the service mirror component should be installed                                         |`true`                                        |
+|`logLevel`                       | Log level for the Multicluster components                                                   |`info`                                        |
+|`serviceMirrorRetryLimit`        | Number of times update from the remote cluster is allowed to be requeued (retried)          |`3`                                           |
+|`serviceMirrorUID`               | User id under which the Service Mirror shall be ran                                         |`2103`                                        |
diff --git a/...ulticluster/templates/gateway-mirror.yaml → ...luster-link/templates/gateway-mirror.yaml b/...ulticluster/templates/gateway-mirror.yaml → ...luster-link/templates/gateway-mirror.yaml
diff --git a/...ulticluster/templates/service-mirror.yaml → ...luster-link/templates/service-mirror.yaml b/...ulticluster/templates/service-mirror.yaml → ...luster-link/templates/service-mirror.yaml
diff --git a/charts/linkerd2-multicluster-link/values.yaml b/charts/linkerd2-multicluster-link/values.yaml
@@ -0,0 +1,9 @@
+controllerComponentLabel: linkerd.io/control-plane-component
+controllerImage: gcr.io/linkerd-io/controller
+controllerImageVersion: linkerdVersionValue
+createdByAnnotation: linkerd.io/created-by
+gatewayProbePort: 4181
+namespace: linkerd-multicluster
+logLevel: info
+serviceMirrorRetryLimit: 3
+serviceMirrorUID: 2103
diff --git a/charts/linkerd2-multicluster/Chart.yaml b/charts/linkerd2-multicluster/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 appVersion: edge-XX.X.X
-description: A helm chart containing the resources to enable mirroring of services on remote clusters
+description: A helm chart containing the resources to support multicluster linking to remote clusters
 kubeVersion: ">=1.13.0-0"
 icon: https://linkerd.io/images/logo-only-200h.png
 name: "linkerd2-multicluster"
-version: 0.1.0
+version: 0.1.0
diff --git a/charts/linkerd2-multicluster/values.yaml b/charts/linkerd2-multicluster/values.yaml
@@ -1,6 +1,3 @@
-controllerComponentLabel: linkerd.io/control-plane-component
-controllerImage: gcr.io/linkerd-io/controller
-controllerImageVersion: linkerdVersionValue
 createdByAnnotation: linkerd.io/created-by
 gateway: true
 gatewayLocalProbePath: /health-local
@@ -12,15 +9,9 @@ gatewayPort: 4143
 gatewayProbePath: /health
 gatewayProbePort: 4181
 gatewayProbeSeconds: 3
-identityTrustDomain: cluster.local
 installNamespace: true
-linkerdNamespace: linkerd
 linkerdVersion: linkerdVersionValue
 namespace: linkerd-multicluster
 proxyOutboundPort: 4140
-serviceMirror: true
-logLevel: info
-serviceMirrorRetryLimit: 3
-serviceMirrorUID: 2103
 remoteMirrorServiceAccount: true
 remoteMirrorServiceAccountName: linkerd-service-mirror-remote-access-default
diff --git a/cli/cmd/multicluster.go b/cli/cmd/multicluster.go
@@ -34,11 +34,12 @@ import (
 )
 
 const (
-	defaultMulticlusterNamespace     = "linkerd-multicluster"
-	defaultGatewayName               = "linkerd-gateway"
-	helmMulticlusterDefaultChartName = "linkerd2-multicluster"
-	tokenKey                         = "token"
-	defaultServiceAccountName        = "linkerd-service-mirror-remote-access-default"
+	defaultMulticlusterNamespace         = "linkerd-multicluster"
+	defaultGatewayName                   = "linkerd-gateway"
+	helmMulticlusterDefaultChartName     = "linkerd2-multicluster"
+	helmMulticlusterLinkDefaultChartName = "linkerd2-multicluster-link"
+	tokenKey                             = "token"
+	defaultServiceAccountName            = "linkerd-service-mirror-remote-access-default"
 )
 
 type (
@@ -589,8 +590,8 @@ func newLinkCommand() *cobra.Command {
 			}
 
 			chart := &charts.Chart{
-				Name:      helmMulticlusterDefaultChartName,
-				Dir:       helmMulticlusterDefaultChartName,
+				Name:      helmMulticlusterLinkDefaultChartName,
+				Dir:       helmMulticlusterLinkDefaultChartName,
 				Namespace: controlPlaneNamespace,
 				RawValues: rawValues,
 				Files:     files,

diff --git a/test/integration/install_test.go b/test/integration/install_test.go
@@ -863,7 +863,6 @@ func TestUninstallMulticluster(t *testing.T) {
 	} else {
 		exec := append([]string{"multicluster"}, []string{
 			"install",
-			"--log-level", "debug",
 			"--namespace", TestHelper.GetMulticlusterNamespace(),
 		}...)
 		out, stderr, err := TestHelper.LinkerdRun(exec...)

diff --git a/test/integration/testdata/check.multicluster.golden b/test/integration/testdata/check.multicluster.golden
@@ -69,7 +69,7 @@ linkerd-grafana
 √ grafana pod is running
 
 linkerd-multicluster
----------------------------
+--------------------
 √ Link CRD exists
 
 Status check results are √
diff --git a/test/integration/testdata/check.multicluster.proxy.golden b/test/integration/testdata/check.multicluster.proxy.golden
@@ -76,7 +76,7 @@ linkerd-grafana
 √ grafana pod is running
 
 linkerd-multicluster
----------------------------
+--------------------
 √ Link CRD exists
 
 Status check results are √