diff --git a/charts/linkerd2-multicluster-link/templates/service-mirror.yaml b/charts/linkerd2-multicluster-link/templates/service-mirror.yaml index a337660d2..f0b2a9eae 100644 --- a/charts/linkerd2-multicluster-link/templates/service-mirror.yaml +++ b/charts/linkerd2-multicluster-link/templates/service-mirror.yaml @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: linkerd-service-mirror-access-local-resources-{{.Values.targetClusterName}} labels: - {{.Values.controllerComponentLabel}}: linkerd-service-mirror + {{.Values.controllerComponentLabel}}: service-mirror mirror.linkerd.io/cluster-name: {{.Values.targetClusterName}} rules: - apiGroups: [""] @@ -19,7 +19,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: linkerd-service-mirror-access-local-resources-{{.Values.targetClusterName}} labels: - {{.Values.controllerComponentLabel}}: linkerd-service-mirror + {{.Values.controllerComponentLabel}}: service-mirror mirror.linkerd.io/cluster-name: {{.Values.targetClusterName}} roleRef: apiGroup: rbac.authorization.k8s.io @@ -36,7 +36,7 @@ metadata: name: linkerd-service-mirror-read-remote-creds-{{.Values.targetClusterName}} namespace: {{.Values.namespace}} labels: - {{.Values.controllerComponentLabel}}: linkerd-service-mirror + {{.Values.controllerComponentLabel}}: service-mirror mirror.linkerd.io/cluster-name: {{.Values.targetClusterName}} rules: - apiGroups: [""] @@ -53,7 +53,7 @@ metadata: name: linkerd-service-mirror-read-remote-creds-{{.Values.targetClusterName}} namespace: {{.Values.namespace}} labels: - {{.Values.controllerComponentLabel}}: linkerd-service-mirror + {{.Values.controllerComponentLabel}}: service-mirror mirror.linkerd.io/cluster-name: {{.Values.targetClusterName}} roleRef: apiGroup: rbac.authorization.k8s.io @@ -70,14 +70,14 @@ metadata: name: linkerd-service-mirror-{{.Values.targetClusterName}} namespace: {{.Values.namespace}} labels: - {{.Values.controllerComponentLabel}}: linkerd-service-mirror + {{.Values.controllerComponentLabel}}: service-mirror mirror.linkerd.io/cluster-name: {{.Values.targetClusterName}} --- apiVersion: apps/v1 kind: Deployment metadata: labels: - {{.Values.controllerComponentLabel}}: linkerd-service-mirror + {{.Values.controllerComponentLabel}}: service-mirror mirror.linkerd.io/cluster-name: {{.Values.targetClusterName}} name: linkerd-service-mirror-{{.Values.targetClusterName}} namespace: {{.Values.namespace}} diff --git a/charts/linkerd2-multicluster/templates/gateway.yaml b/charts/linkerd2-multicluster/templates/gateway.yaml index 1a85c3fb2..c540b20c5 100644 --- a/charts/linkerd2-multicluster/templates/gateway.yaml +++ b/charts/linkerd2-multicluster/templates/gateway.yaml @@ -4,6 +4,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{.Values.gatewayName}}-config + labels: + {{.Values.controllerComponentLabel}}: gateway annotations: {{.Values.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.linkerdVersion) .Values.cliVersion}} namespace: {{.Values.namespace}} @@ -54,6 +56,7 @@ metadata: app.kubernetes.io/name: gateway app.kubernetes.io/part-of: Linkerd app.kubernetes.io/version: {{.Values.linkerdVersion}} + {{.Values.controllerComponentLabel}}: gateway app: {{.Values.gatewayName}} name: {{.Values.gatewayName}} namespace: {{.Values.namespace}} @@ -117,6 +120,7 @@ metadata: mirror.linkerd.io/probe-period: "{{.Values.gatewayProbeSeconds}}" mirror.linkerd.io/probe-path: {{.Values.gatewayProbePath}} mirror.linkerd.io/multicluster-gateway: "true" + {{.Values.controllerComponentLabel}}: gateway {{.Values.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.linkerdVersion) .Values.cliVersion}} spec: ports: diff --git a/charts/linkerd2-multicluster/values.yaml b/charts/linkerd2-multicluster/values.yaml index 78d17be59..6522e7107 100644 --- a/charts/linkerd2-multicluster/values.yaml +++ b/charts/linkerd2-multicluster/values.yaml @@ -1,3 +1,4 @@ +controllerComponentLabel: linkerd.io/control-plane-component createdByAnnotation: linkerd.io/created-by gateway: true gatewayLocalProbePath: /health-local