linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add namespace name to MWC (#2905) 

When installing multiple control planes, the mutatingwebhookconfiguration of the first control plane gets overwritten by any subsequent control plane install. This is caused by the fixed name given to the mutatingwebhookconfiguration manifest at install time.

This commit adds in the namespace to the manifest so that there is a unique configuration for each control plane.

Fixes #2887
This commit is contained in:
Dennis Adjei-Baah 2019-06-13 12:15:43 -07:00 committed by GitHub
parent ecc4465cd1
commit 8aef9280dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart/templates/proxy_injector-rbac.yaml
View File

@ -59,7 +59,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: MutatingWebhookConfiguration
metadata:
name: linkerd-proxy-injector-webhook-config
name: linkerd-{{ .Namespace }}-proxy-injector-webhook-config
labels:
{{ .ControllerComponentLabel }}: proxy-injector
webhooks:

2
chart/templates/sp_validator-rbac.yaml
View File

@ -53,7 +53,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: ValidatingWebhookConfiguration
metadata:
name: linkerd-sp-validator-webhook-config
name: linkerd-{{ .Namespace }}-sp-validator-webhook-config
labels:
{{ .ControllerComponentLabel }}: sp-validator
webhooks:

4
cli/cmd/testdata/install_config.golden vendored
View File

@ -301,7 +301,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: MutatingWebhookConfiguration
metadata:
name: linkerd-proxy-injector-webhook-config
name: linkerd-linkerd-proxy-injector-webhook-config
labels:
linkerd.io/control-plane-component: proxy-injector
webhooks:
@ -376,7 +376,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: ValidatingWebhookConfiguration
metadata:
name: linkerd-sp-validator-webhook-config
name: linkerd-linkerd-sp-validator-webhook-config
labels:
linkerd.io/control-plane-component: sp-validator
webhooks:

4
cli/cmd/testdata/install_default.golden vendored
View File

@ -301,7 +301,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: MutatingWebhookConfiguration
metadata:
name: linkerd-proxy-injector-webhook-config
name: linkerd-linkerd-proxy-injector-webhook-config
labels:
linkerd.io/control-plane-component: proxy-injector
webhooks:
@ -376,7 +376,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: ValidatingWebhookConfiguration
metadata:
name: linkerd-sp-validator-webhook-config
name: linkerd-linkerd-sp-validator-webhook-config
labels:
linkerd.io/control-plane-component: sp-validator
webhooks:

4
cli/cmd/testdata/install_ha_output.golden vendored
View File

@ -301,7 +301,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: MutatingWebhookConfiguration
metadata:
name: linkerd-proxy-injector-webhook-config
name: linkerd-linkerd-proxy-injector-webhook-config
labels:
linkerd.io/control-plane-component: proxy-injector
webhooks:
@ -376,7 +376,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: ValidatingWebhookConfiguration
metadata:
name: linkerd-sp-validator-webhook-config
name: linkerd-linkerd-sp-validator-webhook-config
labels:
linkerd.io/control-plane-component: sp-validator
webhooks:

4
cli/cmd/testdata/install_ha_with_overrides_output.golden vendored
View File

@ -301,7 +301,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: MutatingWebhookConfiguration
metadata:
name: linkerd-proxy-injector-webhook-config
name: linkerd-linkerd-proxy-injector-webhook-config
labels:
linkerd.io/control-plane-component: proxy-injector
webhooks:
@ -376,7 +376,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: ValidatingWebhookConfiguration
metadata:
name: linkerd-sp-validator-webhook-config
name: linkerd-linkerd-sp-validator-webhook-config
labels:
linkerd.io/control-plane-component: sp-validator
webhooks:

4
cli/cmd/testdata/install_no_init_container.golden vendored
View File

@ -301,7 +301,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: MutatingWebhookConfiguration
metadata:
name: linkerd-proxy-injector-webhook-config
name: linkerd-linkerd-proxy-injector-webhook-config
labels:
linkerd.io/control-plane-component: proxy-injector
webhooks:
@ -376,7 +376,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: ValidatingWebhookConfiguration
metadata:
name: linkerd-sp-validator-webhook-config
name: linkerd-linkerd-sp-validator-webhook-config
labels:
linkerd.io/control-plane-component: sp-validator
webhooks:

4
cli/cmd/testdata/install_output.golden vendored
View File

@ -301,7 +301,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: MutatingWebhookConfiguration
metadata:
name: linkerd-proxy-injector-webhook-config
name: linkerd-Namespace-proxy-injector-webhook-config
labels:
ControllerComponentLabel: proxy-injector
webhooks:
@ -376,7 +376,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: ValidatingWebhookConfiguration
metadata:
name: linkerd-sp-validator-webhook-config
name: linkerd-Namespace-sp-validator-webhook-config
labels:
ControllerComponentLabel: sp-validator
webhooks:

4
cli/cmd/testdata/upgrade_default.golden vendored
View File

@ -301,7 +301,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: MutatingWebhookConfiguration
metadata:
name: linkerd-proxy-injector-webhook-config
name: linkerd-linkerd-proxy-injector-webhook-config
labels:
linkerd.io/control-plane-component: proxy-injector
webhooks:
@ -376,7 +376,7 @@ data:
apiVersion: admissionregistration.k8s.io/v1beta1
kind: ValidatingWebhookConfiguration
metadata:
name: linkerd-sp-validator-webhook-config
name: linkerd-linkerd-sp-validator-webhook-config
labels:
linkerd.io/control-plane-component: sp-validator
webhooks: