Skip to content

Commit 1255dfc

Browse files
adleongadleong
committed
Integration tests pass
Signed-off-by: Alex Leong <[email protected]>
1 parent 04f3552 commit 1255dfc

File tree

12 files changed

+90
-21
lines changed

12 files changed

+90
-21
lines changed

‎charts/linkerd2-multicluster-link/.helmignore‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Patterns to ignore when building packages.
2+
# This supports shell glob matching, relative path matching, and
3+
# negation (prefixed with !). Only one pattern per line.
4+
.DS_Store
5+
OWNERS
6+
# Common VCS dirs
7+
.git/
8+
.gitignore
9+
.bzr/
10+
.bzrignore
11+
.hg/
12+
.hgignore
13+
.svn/
14+
# Common backup files
15+
*.swp
16+
*.bak
17+
*.tmp
18+
*~
19+
# Various IDEs
20+
.project
21+
.idea/
22+
*.tmproj

‎charts/linkerd2-multicluster-link/Chart.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: v1
2+
appVersion: edge-XX.X.X
3+
description: A helm chart containing the resources to enable mirroring of services from a remote cluster
4+
kubeVersion: ">=1.13.0-0"
5+
icon: https://linkerd.io/images/logo-only-200h.png
6+
name: "linkerd2-multicluster-link"
7+
version: 0.1.0

‎charts/linkerd2-multicluster-link/README.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
2+
# Linkerd2-multicluster-link Helm Chart
3+
4+
Linkerd is a *service mesh*, designed to give platform-wide observability,
5+
reliability, and security without requiring configuration or code changes. This
6+
chart provides the components needed to enable communication between clusters.
7+
8+
## Configuration
9+
10+
The following table lists the configurable parameters of the
11+
linkerd2-multicluster chart and their default values.
12+
13+
| Parameter | Description | Default |
14+
|---------------------------------|---------------------------------------------------------------------------------------------|----------------------------------------------|
15+
|`controllerComponentLabel` | Control plane label. Do not edit |`linkerd.io/control-plane-component` |
16+
|`controllerImage` | Docker image for the Service mirror component (uses the Linkerd controller image) |`gcr.io/linkerd-io/controller` |
17+
|`controllerImageVersion` | Tag for the Service Mirror container Docker image |`latest version` |
18+
|`createdByAnnotation` | Annotation label for the proxy create. Do not edit. |`linkerd.io/created-by` |
19+
|`gateway` | If the gateway component should be installed |`true` |
20+
|`gatewayLocalProbePath` | The path that will be used by the local liveness checks to ensure the gateway is alive |`/health-local` |
21+
|`gatewayLocalProbePort` | The port that will be used by the local liveness checks to ensure the gateway is alive |`8888` |
22+
|`gatewayName` | The name of the gateway that will be installed |`linkerd-gateway` |
23+
|`gatewayNginxImage` | The Nginx image |`nginx` |
24+
|`gatewayNginxImageVersion` | The version of the Nginx image |`1.17` |
25+
|`gatewayPort` | The port on which all the gateway will accept incoming traffic |`4143` |
26+
|`gatewayProbePath` | The path that will be used by remote clusters for determining whether the gateway is alive |`/health` |
27+
|`gatewayProbePort` | The port used for liveliness probing |`4181` |
28+
|`gatewayProbeSeconds` | The interval (in seconds) between liveness probes |`3` |
29+
|`identityTrustDomain` | Trust domain used for identity of the existing linkerd installation |`cluster.local` |
30+
|`installNamespace` | If the namespace should be installed |`true` |
31+
|`linkerdNamespace` | The namespace of the existing Linkerd installation |`linkerd` |
32+
|`linkerdVersion` | Control plane version | latest version |
33+
|`namespace` | Service Mirror component namespace |`linkerd-multicluster` |
34+
|`proxyOutboundPort` | The port on which the proxy accepts outbound traffic |`4140` |
35+
|`remoteMirrorServiceAccountName` | The name of the service account used to allow remote clusters to mirror local services |`linkerd-service-mirror-remote-access-default`|
36+
|`remoteMirrorServiceAccount` | If the remote mirror service account should be installed |`true` |
37+
|`serviceMirror` | If the service mirror component should be installed |`true` |
38+
|`logLevel` | Log level for the Multicluster components |`info` |
39+
|`serviceMirrorRetryLimit` | Number of times update from the remote cluster is allowed to be requeued (retried) |`3` |
40+
|`serviceMirrorUID` | User id under which the Service Mirror shall be ran |`2103` |

‎charts/linkerd2-multicluster/templates/gateway-mirror.yaml‎ renamed to ‎charts/linkerd2-multicluster-link/templates/gateway-mirror.yaml‎

File renamed without changes.

‎charts/linkerd2-multicluster/templates/service-mirror.yaml‎ renamed to ‎charts/linkerd2-multicluster-link/templates/service-mirror.yaml‎

File renamed without changes.

‎charts/linkerd2-multicluster-link/values.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
controllerComponentLabel: linkerd.io/control-plane-component
2+
controllerImage: gcr.io/linkerd-io/controller
3+
controllerImageVersion: linkerdVersionValue
4+
createdByAnnotation: linkerd.io/created-by
5+
gatewayProbePort: 4181
6+
namespace: linkerd-multicluster
7+
logLevel: info
8+
serviceMirrorRetryLimit: 3
9+
serviceMirrorUID: 2103

‎charts/linkerd2-multicluster/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
appVersion: edge-XX.X.X
3-
description: A helm chart containing the resources to enable mirroring of services on remote clusters
3+
description: A helm chart containing the resources to support multicluster linking to remote clusters
44
kubeVersion: ">=1.13.0-0"
55
icon: https://linkerd.io/images/logo-only-200h.png
66
name: "linkerd2-multicluster"
7-
version: 0.1.0
7+
version: 0.1.0

‎charts/linkerd2-multicluster/values.yaml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
controllerComponentLabel: linkerd.io/control-plane-component
2-
controllerImage: gcr.io/linkerd-io/controller
3-
controllerImageVersion: linkerdVersionValue
41
createdByAnnotation: linkerd.io/created-by
52
gateway: true
63
gatewayLocalProbePath: /health-local
@@ -12,15 +9,9 @@ gatewayPort: 4143
129
gatewayProbePath: /health
1310
gatewayProbePort: 4181
1411
gatewayProbeSeconds: 3
15-
identityTrustDomain: cluster.local
1612
installNamespace: true
17-
linkerdNamespace: linkerd
1813
linkerdVersion: linkerdVersionValue
1914
namespace: linkerd-multicluster
2015
proxyOutboundPort: 4140
21-
serviceMirror: true
22-
logLevel: info
23-
serviceMirrorRetryLimit: 3
24-
serviceMirrorUID: 2103
2516
remoteMirrorServiceAccount: true
2617
remoteMirrorServiceAccountName: linkerd-service-mirror-remote-access-default

‎cli/cmd/multicluster.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@ import (
3434
)
3535

3636
const (
37-
defaultMulticlusterNamespace = "linkerd-multicluster"
38-
defaultGatewayName = "linkerd-gateway"
39-
helmMulticlusterDefaultChartName = "linkerd2-multicluster"
40-
tokenKey = "token"
41-
defaultServiceAccountName = "linkerd-service-mirror-remote-access-default"
37+
defaultMulticlusterNamespace = "linkerd-multicluster"
38+
defaultGatewayName = "linkerd-gateway"
39+
helmMulticlusterDefaultChartName = "linkerd2-multicluster"
40+
helmMulticlusterLinkDefaultChartName = "linkerd2-multicluster-link"
41+
tokenKey = "token"
42+
defaultServiceAccountName = "linkerd-service-mirror-remote-access-default"
4243
)
4344

4445
type (
@@ -589,8 +590,8 @@ func newLinkCommand() *cobra.Command {
589590
}
590591

591592
chart := &charts.Chart{
592-
Name: helmMulticlusterDefaultChartName,
593-
Dir: helmMulticlusterDefaultChartName,
593+
Name: helmMulticlusterLinkDefaultChartName,
594+
Dir: helmMulticlusterLinkDefaultChartName,
594595
Namespace: controlPlaneNamespace,
595596
RawValues: rawValues,
596597
Files: files,

‎test/install_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,6 @@ func TestUninstallMulticluster(t *testing.T) {
894894

895895
exec := append([]string{"multicluster"}, []string{
896896
"install",
897-
"--log-level", "debug",
898897
"--namespace", TestHelper.GetMulticlusterNamespace(),
899898
}...)
900899
out, stderr, err := TestHelper.LinkerdRun(exec...)

0 commit comments

Comments
 (0)