diff --git a/charts/linkerd2/templates/controller-rbac.yaml b/charts/linkerd2/templates/controller-rbac.yaml index 9d7b0cfa7..577e63f64 100644 --- a/charts/linkerd2/templates/controller-rbac.yaml +++ b/charts/linkerd2/templates/controller-rbac.yaml @@ -2,7 +2,6 @@ ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/charts/linkerd2/templates/controller.yaml b/charts/linkerd2/templates/controller.yaml index 024a92022..bb2d017e0 100644 --- a/charts/linkerd2/templates/controller.yaml +++ b/charts/linkerd2/templates/controller.yaml @@ -2,7 +2,6 @@ ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: diff --git a/charts/linkerd2/templates/destination-rbac.yaml b/charts/linkerd2/templates/destination-rbac.yaml index c78dd799a..0b46fc7eb 100644 --- a/charts/linkerd2/templates/destination-rbac.yaml +++ b/charts/linkerd2/templates/destination-rbac.yaml @@ -2,7 +2,6 @@ ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/charts/linkerd2/templates/destination.yaml b/charts/linkerd2/templates/destination.yaml index db4c05f9a..48934a2f8 100644 --- a/charts/linkerd2/templates/destination.yaml +++ b/charts/linkerd2/templates/destination.yaml @@ -2,7 +2,6 @@ ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: diff --git a/charts/linkerd2/templates/heartbeat-rbac.yaml b/charts/linkerd2/templates/heartbeat-rbac.yaml index 52b471814..d19615703 100644 --- a/charts/linkerd2/templates/heartbeat-rbac.yaml +++ b/charts/linkerd2/templates/heartbeat-rbac.yaml @@ -3,7 +3,6 @@ ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: diff --git a/charts/linkerd2/templates/heartbeat.yaml b/charts/linkerd2/templates/heartbeat.yaml index 2b4561735..f0d26d3f4 100644 --- a/charts/linkerd2/templates/heartbeat.yaml +++ b/charts/linkerd2/templates/heartbeat.yaml @@ -3,7 +3,6 @@ ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: diff --git a/charts/linkerd2/templates/identity-rbac.yaml b/charts/linkerd2/templates/identity-rbac.yaml index 3d5d148f0..3d88f57a7 100644 --- a/charts/linkerd2/templates/identity-rbac.yaml +++ b/charts/linkerd2/templates/identity-rbac.yaml @@ -3,7 +3,6 @@ ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/charts/linkerd2/templates/namespace.yaml b/charts/linkerd2/templates/namespace.yaml index 7b92cdb7d..3fb453ca5 100644 --- a/charts/linkerd2/templates/namespace.yaml +++ b/charts/linkerd2/templates/namespace.yaml @@ -3,7 +3,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: diff --git a/charts/linkerd2/templates/proxy-injector-rbac.yaml b/charts/linkerd2/templates/proxy-injector-rbac.yaml index a5918cf2f..b6c8e7c59 100644 --- a/charts/linkerd2/templates/proxy-injector-rbac.yaml +++ b/charts/linkerd2/templates/proxy-injector-rbac.yaml @@ -2,7 +2,6 @@ ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/charts/linkerd2/templates/proxy-injector.yaml b/charts/linkerd2/templates/proxy-injector.yaml index 8930865ff..ead10faf0 100644 --- a/charts/linkerd2/templates/proxy-injector.yaml +++ b/charts/linkerd2/templates/proxy-injector.yaml @@ -2,7 +2,6 @@ ### ### Proxy Injector ### ---- {{- $tree := deepCopy . }} {{ $_ := set $tree.Values.global.proxy "workloadKind" "deployment" -}} {{ $_ := set $tree.Values.global.proxy "component" "linkerd-proxy-injector" -}} diff --git a/charts/linkerd2/templates/psp.yaml b/charts/linkerd2/templates/psp.yaml index 588d43b0c..ba250c169 100644 --- a/charts/linkerd2/templates/psp.yaml +++ b/charts/linkerd2/templates/psp.yaml @@ -2,7 +2,6 @@ ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/charts/linkerd2/templates/serviceprofile-crd.yaml b/charts/linkerd2/templates/serviceprofile-crd.yaml index b87d591c2..96d6ce037 100644 --- a/charts/linkerd2/templates/serviceprofile-crd.yaml +++ b/charts/linkerd2/templates/serviceprofile-crd.yaml @@ -2,7 +2,6 @@ ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/linkerd2/templates/sp-validator-rbac.yaml b/charts/linkerd2/templates/sp-validator-rbac.yaml index 2086870b4..24714b4f1 100644 --- a/charts/linkerd2/templates/sp-validator-rbac.yaml +++ b/charts/linkerd2/templates/sp-validator-rbac.yaml @@ -2,7 +2,6 @@ ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/charts/linkerd2/templates/sp-validator.yaml b/charts/linkerd2/templates/sp-validator.yaml index f6ab66d1b..33c7f3c54 100644 --- a/charts/linkerd2/templates/sp-validator.yaml +++ b/charts/linkerd2/templates/sp-validator.yaml @@ -2,7 +2,6 @@ ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: diff --git a/charts/linkerd2/templates/trafficsplit-crd.yaml b/charts/linkerd2/templates/trafficsplit-crd.yaml index 1bbc47dfa..9b30a7a47 100644 --- a/charts/linkerd2/templates/trafficsplit-crd.yaml +++ b/charts/linkerd2/templates/trafficsplit-crd.yaml @@ -3,7 +3,6 @@ ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 16a8528fa..5e79654d7 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -2,7 +2,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -17,7 +16,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -64,7 +62,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -117,7 +114,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -170,7 +166,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -212,7 +207,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -493,7 +487,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -567,7 +560,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -666,7 +658,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -753,7 +744,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1291,7 +1281,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1520,7 +1509,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1771,7 +1759,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -1818,7 +1805,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -1840,7 +1826,7 @@ spec: template: metadata: annotations: - checksum/config: 34b134a25644aed626846144efcb98914aa59229745e18182c7a945558e7cfb7 + checksum/config: d7022b763ada3361486ba693b85ebfed70f29cae8ae7b5aac95c6ef0ee89436d linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version @@ -2054,7 +2040,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2095,7 +2080,7 @@ spec: template: metadata: annotations: - checksum/config: 3b5c241ae06662bfa72d45fe6a1c7ad8db11b34b656ad91a0cb6cbd7f717b098 + checksum/config: 56804d9174f18dbed9f086203084200a34be20686d6966a2ba2d67c41679d9dd linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index 3d2c17118..81f19ffc2 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -2,7 +2,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -17,7 +16,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -64,7 +62,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -117,7 +114,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -170,7 +166,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -212,7 +207,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -493,7 +487,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -567,7 +560,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -666,7 +658,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -753,7 +744,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1290,7 +1280,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1518,7 +1507,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1768,7 +1756,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -1815,7 +1802,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -1837,7 +1823,7 @@ spec: template: metadata: annotations: - checksum/config: 264325aa8885fa9c7aae576456adcf319a6c6877d8de929481eb757fd3efd1ea + checksum/config: c4f75529c02e1cefb90d3ee3f1001e686e4b2286ce2c2226251f613378d23311 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version @@ -2051,7 +2037,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2092,7 +2077,7 @@ spec: template: metadata: annotations: - checksum/config: 7917bc8da431ef8fb46a2d84bddbd08a156d3370a7846c980dced0fc8869d51f + checksum/config: 8153cc8e32bed84b94148d753ae870def8dea3e70467b557be14a646f7aad7e5 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index ce88677bd..fb4ebaf87 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -2,7 +2,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -17,7 +16,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -64,7 +62,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -117,7 +114,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -170,7 +166,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -212,7 +207,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -493,7 +487,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -567,7 +560,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -666,7 +658,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -753,7 +744,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1290,7 +1280,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1518,7 +1507,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1768,7 +1756,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -1815,7 +1802,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -1837,7 +1823,7 @@ spec: template: metadata: annotations: - checksum/config: 34b134a25644aed626846144efcb98914aa59229745e18182c7a945558e7cfb7 + checksum/config: d7022b763ada3361486ba693b85ebfed70f29cae8ae7b5aac95c6ef0ee89436d linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version @@ -2051,7 +2037,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2092,7 +2077,7 @@ spec: template: metadata: annotations: - checksum/config: 3b5c241ae06662bfa72d45fe6a1c7ad8db11b34b656ad91a0cb6cbd7f717b098 + checksum/config: 56804d9174f18dbed9f086203084200a34be20686d6966a2ba2d67c41679d9dd linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index f10f0bb09..c92e7d2d5 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -2,7 +2,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -17,7 +16,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -64,7 +62,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -117,7 +114,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -170,7 +166,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -212,7 +207,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -493,7 +487,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -567,7 +560,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -666,7 +658,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -753,7 +744,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1290,7 +1280,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1518,7 +1507,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1768,7 +1756,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -1815,7 +1802,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -1837,7 +1823,7 @@ spec: template: metadata: annotations: - checksum/config: 34b134a25644aed626846144efcb98914aa59229745e18182c7a945558e7cfb7 + checksum/config: d7022b763ada3361486ba693b85ebfed70f29cae8ae7b5aac95c6ef0ee89436d linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version @@ -2051,7 +2037,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2092,7 +2077,7 @@ spec: template: metadata: annotations: - checksum/config: 3b5c241ae06662bfa72d45fe6a1c7ad8db11b34b656ad91a0cb6cbd7f717b098 + checksum/config: 56804d9174f18dbed9f086203084200a34be20686d6966a2ba2d67c41679d9dd linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version diff --git a/cli/cmd/testdata/install_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden index 90b6817d2..ba1b97d2e 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -2,7 +2,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -17,7 +16,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -64,7 +62,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -117,7 +114,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -170,7 +166,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -212,7 +207,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -493,7 +487,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -567,7 +560,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -666,7 +658,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -753,7 +744,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1290,7 +1280,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1518,7 +1507,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1768,7 +1756,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -1815,7 +1802,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -1837,7 +1823,7 @@ spec: template: metadata: annotations: - checksum/config: 34b134a25644aed626846144efcb98914aa59229745e18182c7a945558e7cfb7 + checksum/config: d7022b763ada3361486ba693b85ebfed70f29cae8ae7b5aac95c6ef0ee89436d linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version @@ -2051,7 +2037,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2092,7 +2077,7 @@ spec: template: metadata: annotations: - checksum/config: 3b5c241ae06662bfa72d45fe6a1c7ad8db11b34b656ad91a0cb6cbd7f717b098 + checksum/config: 56804d9174f18dbed9f086203084200a34be20686d6966a2ba2d67c41679d9dd linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 3c36bc464..389150c05 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -2,7 +2,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -17,7 +16,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -64,7 +62,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -117,7 +114,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -170,7 +166,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -212,7 +207,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -493,7 +487,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -567,7 +560,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -666,7 +658,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -753,7 +744,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1376,7 +1366,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1654,7 +1643,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1954,7 +1942,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -2007,7 +1994,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -2032,7 +2018,7 @@ spec: template: metadata: annotations: - checksum/config: 404f2f9f5f8d20f75d74e035d485841ba5e610895d3a3c44cf8c13a5dfbda6d8 + checksum/config: 4dbfc7866518bbc8e9b380aaa65fffb520ae284508e2cca21536b5e8a762a0e6 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version @@ -2293,7 +2279,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2353,7 +2338,7 @@ spec: template: metadata: annotations: - checksum/config: 838b100d69912e1948e9d70c840e54d3363366e4fb04925af94b3d24db029652 + checksum/config: 0c0f48b5124f4f4f3198fce6d1b95ff18d85297afbf589be00d3ffecf1108d0c linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index c4840d462..3872d845f 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -2,7 +2,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -17,7 +16,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -64,7 +62,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -117,7 +114,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -170,7 +166,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -212,7 +207,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -493,7 +487,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -567,7 +560,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -666,7 +658,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -753,7 +744,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1376,7 +1366,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1654,7 +1643,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1954,7 +1942,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -2007,7 +1994,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -2032,7 +2018,7 @@ spec: template: metadata: annotations: - checksum/config: 404f2f9f5f8d20f75d74e035d485841ba5e610895d3a3c44cf8c13a5dfbda6d8 + checksum/config: 4dbfc7866518bbc8e9b380aaa65fffb520ae284508e2cca21536b5e8a762a0e6 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version @@ -2293,7 +2279,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2353,7 +2338,7 @@ spec: template: metadata: annotations: - checksum/config: 838b100d69912e1948e9d70c840e54d3363366e4fb04925af94b3d24db029652 + checksum/config: 0c0f48b5124f4f4f3198fce6d1b95ff18d85297afbf589be00d3ffecf1108d0c linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index 715741193..5c4b4b963 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -2,7 +2,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -17,7 +16,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -64,7 +62,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -117,7 +114,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -171,7 +167,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -452,7 +447,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -526,7 +520,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -625,7 +618,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -712,7 +704,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1246,7 +1237,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1474,7 +1464,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1725,7 +1714,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -1747,7 +1735,7 @@ spec: template: metadata: annotations: - checksum/config: 34b134a25644aed626846144efcb98914aa59229745e18182c7a945558e7cfb7 + checksum/config: d7022b763ada3361486ba693b85ebfed70f29cae8ae7b5aac95c6ef0ee89436d linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version @@ -1961,7 +1949,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2002,7 +1989,7 @@ spec: template: metadata: annotations: - checksum/config: 3b5c241ae06662bfa72d45fe6a1c7ad8db11b34b656ad91a0cb6cbd7f717b098 + checksum/config: 56804d9174f18dbed9f086203084200a34be20686d6966a2ba2d67c41679d9dd linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version diff --git a/cli/cmd/testdata/install_helm_output.golden b/cli/cmd/testdata/install_helm_output.golden index 2b7133d24..ed5d4c935 100644 --- a/cli/cmd/testdata/install_helm_output.golden +++ b/cli/cmd/testdata/install_helm_output.golden @@ -4,7 +4,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -21,7 +20,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -70,7 +68,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -125,7 +122,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -180,7 +176,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -224,7 +219,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -507,7 +501,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -583,7 +576,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -684,7 +676,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -773,7 +764,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1285,7 +1275,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1504,7 +1493,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1745,7 +1733,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -1794,7 +1781,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -1816,7 +1802,7 @@ spec: template: metadata: annotations: - checksum/config: c57e9ee460be32dd87bccddbe193af8a56fb4d6c7d641634157d13c04879ec63 + checksum/config: 7ee83a7e6e8a76c5b3a2910e373bf40107de2f0b2292feb6c6fb757a70ee31c7 linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/identity-mode: default linkerd.io/proxy-version: test-proxy-version @@ -2021,7 +2007,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2062,7 +2047,7 @@ spec: template: metadata: annotations: - checksum/config: e7f25db668e68bb28533ef8433520d8e27bb839243b659b37c59da2d6328845c + checksum/config: cc95b3d9bc9c735ab81c7b9b464ba242a09f379663797bac50b0b7d29d321e9d linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/identity-mode: default linkerd.io/proxy-version: test-proxy-version diff --git a/cli/cmd/testdata/install_helm_output_ha.golden b/cli/cmd/testdata/install_helm_output_ha.golden index 6bc36d7c7..73d7e92c3 100644 --- a/cli/cmd/testdata/install_helm_output_ha.golden +++ b/cli/cmd/testdata/install_helm_output_ha.golden @@ -4,7 +4,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -21,7 +20,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -70,7 +68,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -125,7 +122,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -180,7 +176,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -224,7 +219,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -507,7 +501,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -583,7 +576,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -684,7 +676,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -773,7 +764,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1371,7 +1361,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1640,7 +1629,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1931,7 +1919,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -1986,7 +1973,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -2011,7 +1997,7 @@ spec: template: metadata: annotations: - checksum/config: cdf9c6f93a20cba9df019488fbbdde3cb2a5bcd3dfb50a2fc99dc18d881829f4 + checksum/config: 570d4130719fa021efe5a6a0e073576dc4f1a57e4419ffae1b70514b6adffb15 linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/identity-mode: default linkerd.io/proxy-version: test-proxy-version @@ -2263,7 +2249,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2323,7 +2308,7 @@ spec: template: metadata: annotations: - checksum/config: 247d239f6bacb634105c3a5714d4c045c18d62cb267f7396790460cb3292b775 + checksum/config: c297a2cc24563bd078ee0fdcc6ee9be916500fc00c287da599f2b8ec8f17accd linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/identity-mode: default linkerd.io/proxy-version: test-proxy-version diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index 06c44cc93..8947e278d 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -4,7 +4,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -21,7 +20,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -70,7 +68,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -125,7 +122,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -180,7 +176,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -224,7 +219,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -507,7 +501,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -583,7 +576,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -684,7 +676,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -773,7 +764,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1379,7 +1369,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1652,7 +1641,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1947,7 +1935,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -2006,7 +1993,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -2031,7 +2017,7 @@ spec: template: metadata: annotations: - checksum/config: cdf9c6f93a20cba9df019488fbbdde3cb2a5bcd3dfb50a2fc99dc18d881829f4 + checksum/config: 570d4130719fa021efe5a6a0e073576dc4f1a57e4419ffae1b70514b6adffb15 linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/identity-mode: default linkerd.io/proxy-version: test-proxy-version @@ -2287,7 +2273,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2347,7 +2332,7 @@ spec: template: metadata: annotations: - checksum/config: 247d239f6bacb634105c3a5714d4c045c18d62cb267f7396790460cb3292b775 + checksum/config: c297a2cc24563bd078ee0fdcc6ee9be916500fc00c287da599f2b8ec8f17accd linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/identity-mode: default linkerd.io/proxy-version: test-proxy-version diff --git a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden index feb47f548..b076b3aca 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -4,7 +4,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -21,7 +20,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -70,7 +68,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -125,7 +122,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -180,7 +176,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -224,7 +219,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -507,7 +501,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -583,7 +576,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -684,7 +676,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -773,7 +764,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1371,7 +1361,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1640,7 +1629,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1931,7 +1919,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -1986,7 +1973,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -2011,7 +1997,7 @@ spec: template: metadata: annotations: - checksum/config: 8dd5e303bd3c6cfe447d93b607f2c676c21fe8fb48ecbf8b3ceb49d7a8b7a5d3 + checksum/config: fa49f5bead20f3deabc1246fb38edc0635f87a8da238ab7233cb87b519da178b linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/identity-mode: default linkerd.io/proxy-version: test-proxy-version @@ -2263,7 +2249,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2323,7 +2308,7 @@ spec: template: metadata: annotations: - checksum/config: 7356459eaf6f4af5dff4e7a3625b2f5d6a31cd15865eba67ee384fd7adac3d9e + checksum/config: e4d015c97ae5fde7ba89af1e7251b8360a3f010eade736d18f93ee691e640ed1 linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/identity-mode: default linkerd.io/proxy-version: test-proxy-version diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 8f9455a84..2d07fc803 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -2,7 +2,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -17,7 +16,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -64,7 +62,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -117,7 +114,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -170,7 +166,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -212,7 +207,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -493,7 +487,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -567,7 +560,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -666,7 +658,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -753,7 +744,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1249,7 +1239,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1439,7 +1428,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1651,7 +1639,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -1698,7 +1685,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -1720,7 +1706,7 @@ spec: template: metadata: annotations: - checksum/config: 34b134a25644aed626846144efcb98914aa59229745e18182c7a945558e7cfb7 + checksum/config: d7022b763ada3361486ba693b85ebfed70f29cae8ae7b5aac95c6ef0ee89436d linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version @@ -1896,7 +1882,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -1937,7 +1922,7 @@ spec: template: metadata: annotations: - checksum/config: 3b5c241ae06662bfa72d45fe6a1c7ad8db11b34b656ad91a0cb6cbd7f717b098 + checksum/config: 56804d9174f18dbed9f086203084200a34be20686d6966a2ba2d67c41679d9dd linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 5f376e7d7..22b6f0c57 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -2,7 +2,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -17,7 +16,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -64,7 +62,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -117,7 +114,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -170,7 +166,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -212,7 +207,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -493,7 +487,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -567,7 +560,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -666,7 +658,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -753,7 +744,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1292,7 +1282,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1522,7 +1511,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1774,7 +1762,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -1821,7 +1808,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -1843,7 +1829,7 @@ spec: template: metadata: annotations: - checksum/config: 5e9ba6d1ef44ba82e6d499ef50d47b7eb1a3dd8eb4c021a6f7f9170a7f4086bd + checksum/config: b65674201363653c6dbae41dbaec0c9f8ea674c2098808ad3dbbf0854771e605 CreatedByAnnotation: CliVersion linkerd.io/identity-mode: default linkerd.io/proxy-version: ProxyVersion @@ -2059,7 +2045,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2100,7 +2085,7 @@ spec: template: metadata: annotations: - checksum/config: f4a217a7e929a059de2686e4aefad7425130cd21fe8efe81469654afe70e1fe3 + checksum/config: 07bd272aac5c2028cfc06b05b3d790f3273585565ff8a5a94a806e271140c62b CreatedByAnnotation: CliVersion linkerd.io/identity-mode: default linkerd.io/proxy-version: ProxyVersion diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 8336319c7..30fe32e44 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -2,7 +2,6 @@ ### ### Linkerd Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -17,7 +16,6 @@ metadata: ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -64,7 +62,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -117,7 +114,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -170,7 +166,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -212,7 +207,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -493,7 +487,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -567,7 +560,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -666,7 +658,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -753,7 +744,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1290,7 +1280,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1518,7 +1507,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1768,7 +1756,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -1815,7 +1802,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -1837,7 +1823,7 @@ spec: template: metadata: annotations: - checksum/config: 34b134a25644aed626846144efcb98914aa59229745e18182c7a945558e7cfb7 + checksum/config: d7022b763ada3361486ba693b85ebfed70f29cae8ae7b5aac95c6ef0ee89436d linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version @@ -2051,7 +2037,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2092,7 +2077,7 @@ spec: template: metadata: annotations: - checksum/config: 3b5c241ae06662bfa72d45fe6a1c7ad8db11b34b656ad91a0cb6cbd7f717b098 + checksum/config: 56804d9174f18dbed9f086203084200a34be20686d6966a2ba2d67c41679d9dd linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index ecc23aa0e..d0bd265d3 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -2,7 +2,6 @@ ### ### Identity Controller Service RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -49,7 +48,6 @@ metadata: ### ### Controller RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -102,7 +100,6 @@ metadata: ### ### Destination Controller Service ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -155,7 +152,6 @@ metadata: ### ### Heartbeat RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -197,7 +193,6 @@ metadata: ### ### Service Profile CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -478,7 +473,6 @@ spec: ### TrafficSplit CRD ### Copied from github.com/servicemeshinterface/smi-sdk-go/blob/d4e76b1cd7a33ead5f38d1262dd838a31c80f4e5/crds/split.yaml ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -552,7 +546,6 @@ spec: ### ### Proxy Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -651,7 +644,6 @@ webhooks: ### ### Service Profile Validator RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -738,7 +730,6 @@ webhooks: ### ### Control Plane PSP ### ---- apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: @@ -1275,7 +1266,6 @@ spec: ### ### Controller ### ---- kind: Service apiVersion: v1 metadata: @@ -1503,7 +1493,6 @@ spec: ### ### Destination Controller Service ### ---- kind: Service apiVersion: v1 metadata: @@ -1753,7 +1742,6 @@ spec: ### ### Heartbeat ### ---- apiVersion: batch/v1beta1 kind: CronJob metadata: @@ -1800,7 +1788,6 @@ spec: ### ### Proxy Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -1822,7 +1809,7 @@ spec: template: metadata: annotations: - checksum/config: 264325aa8885fa9c7aae576456adcf319a6c6877d8de929481eb757fd3efd1ea + checksum/config: c4f75529c02e1cefb90d3ee3f1001e686e4b2286ce2c2226251f613378d23311 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version @@ -2036,7 +2023,6 @@ spec: ### ### Service Profile Validator ### ---- kind: Service apiVersion: v1 metadata: @@ -2077,7 +2063,7 @@ spec: template: metadata: annotations: - checksum/config: 7917bc8da431ef8fb46a2d84bddbd08a156d3370a7846c980dced0fc8869d51f + checksum/config: 8153cc8e32bed84b94148d753ae870def8dea3e70467b557be14a646f7aad7e5 linkerd.io/created-by: linkerd/cli dev-undefined linkerd.io/identity-mode: default linkerd.io/proxy-version: install-proxy-version diff --git a/jaeger/charts/linkerd-jaeger/templates/jaeger-injector.yaml b/jaeger/charts/linkerd-jaeger/templates/jaeger-injector.yaml index d2e9c8fbd..37a988cb5 100644 --- a/jaeger/charts/linkerd-jaeger/templates/jaeger-injector.yaml +++ b/jaeger/charts/linkerd-jaeger/templates/jaeger-injector.yaml @@ -2,7 +2,6 @@ ### ### Jaeger Injector ### ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/jaeger/charts/linkerd-jaeger/templates/rbac.yaml b/jaeger/charts/linkerd-jaeger/templates/rbac.yaml index 9b9a41312..ebedc7dd8 100644 --- a/jaeger/charts/linkerd-jaeger/templates/rbac.yaml +++ b/jaeger/charts/linkerd-jaeger/templates/rbac.yaml @@ -2,7 +2,6 @@ ### ### collector RBAC ### ---- kind: ServiceAccount apiVersion: v1 metadata: @@ -12,7 +11,6 @@ metadata: ### ### jaeger RBAC ### ---- kind: ServiceAccount apiVersion: v1 metadata: @@ -23,7 +21,6 @@ metadata: ### ### Jaeger Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/jaeger/charts/linkerd-jaeger/templates/tracing.yaml b/jaeger/charts/linkerd-jaeger/templates/tracing.yaml index 1b4d6284a..ed450bf19 100644 --- a/jaeger/charts/linkerd-jaeger/templates/tracing.yaml +++ b/jaeger/charts/linkerd-jaeger/templates/tracing.yaml @@ -2,7 +2,6 @@ ### ### Tracing Collector Service ### ---- apiVersion: v1 kind: ConfigMap metadata: @@ -119,7 +118,6 @@ spec: ### ### Tracing Jaeger Service ### ---- apiVersion: v1 kind: Service metadata: diff --git a/multicluster/charts/linkerd-multicluster/templates/link-crd.yaml b/multicluster/charts/linkerd-multicluster/templates/link-crd.yaml index e0d417a01..1199edcc3 100644 --- a/multicluster/charts/linkerd-multicluster/templates/link-crd.yaml +++ b/multicluster/charts/linkerd-multicluster/templates/link-crd.yaml @@ -2,7 +2,6 @@ ### ### Link CRD ### ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/viz/charts/linkerd-viz/templates/grafana-rbac.yaml b/viz/charts/linkerd-viz/templates/grafana-rbac.yaml index db4b694ab..91627f7e3 100644 --- a/viz/charts/linkerd-viz/templates/grafana-rbac.yaml +++ b/viz/charts/linkerd-viz/templates/grafana-rbac.yaml @@ -3,7 +3,6 @@ ### ### Grafana RBAC ### ---- kind: ServiceAccount apiVersion: v1 metadata: diff --git a/viz/charts/linkerd-viz/templates/grafana.yaml b/viz/charts/linkerd-viz/templates/grafana.yaml index a9762360e..b5fe3af4c 100644 --- a/viz/charts/linkerd-viz/templates/grafana.yaml +++ b/viz/charts/linkerd-viz/templates/grafana.yaml @@ -3,7 +3,6 @@ ### ### Grafana ### ---- kind: ConfigMap apiVersion: v1 metadata: diff --git a/viz/charts/linkerd-viz/templates/metrics-api-rbac.yaml b/viz/charts/linkerd-viz/templates/metrics-api-rbac.yaml index fa0a884dd..3ef1a73d2 100644 --- a/viz/charts/linkerd-viz/templates/metrics-api-rbac.yaml +++ b/viz/charts/linkerd-viz/templates/metrics-api-rbac.yaml @@ -2,7 +2,6 @@ ### ### Metrics API RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/viz/charts/linkerd-viz/templates/metrics-api.yaml b/viz/charts/linkerd-viz/templates/metrics-api.yaml index 8f9a4dab1..172cd5e91 100644 --- a/viz/charts/linkerd-viz/templates/metrics-api.yaml +++ b/viz/charts/linkerd-viz/templates/metrics-api.yaml @@ -2,7 +2,6 @@ ### ### Metrics API ### ---- kind: Service apiVersion: v1 metadata: diff --git a/viz/charts/linkerd-viz/templates/namespace.yaml b/viz/charts/linkerd-viz/templates/namespace.yaml index 7b29f29c1..a296aaee5 100644 --- a/viz/charts/linkerd-viz/templates/namespace.yaml +++ b/viz/charts/linkerd-viz/templates/namespace.yaml @@ -3,7 +3,6 @@ ### ### Linkerd Viz Extension Namespace ### ---- kind: Namespace apiVersion: v1 metadata: diff --git a/viz/charts/linkerd-viz/templates/prometheus-rbac.yaml b/viz/charts/linkerd-viz/templates/prometheus-rbac.yaml index 4bd8efd13..09936b307 100644 --- a/viz/charts/linkerd-viz/templates/prometheus-rbac.yaml +++ b/viz/charts/linkerd-viz/templates/prometheus-rbac.yaml @@ -3,7 +3,6 @@ ### ### Prometheus RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/viz/charts/linkerd-viz/templates/prometheus.yaml b/viz/charts/linkerd-viz/templates/prometheus.yaml index 791705d28..328101327 100644 --- a/viz/charts/linkerd-viz/templates/prometheus.yaml +++ b/viz/charts/linkerd-viz/templates/prometheus.yaml @@ -3,7 +3,6 @@ ### ### Prometheus ### ---- kind: ConfigMap apiVersion: v1 metadata: diff --git a/viz/charts/linkerd-viz/templates/tap-injector-rbac.yaml b/viz/charts/linkerd-viz/templates/tap-injector-rbac.yaml index a3c04a74e..4c3ac0076 100644 --- a/viz/charts/linkerd-viz/templates/tap-injector-rbac.yaml +++ b/viz/charts/linkerd-viz/templates/tap-injector-rbac.yaml @@ -1,7 +1,7 @@ +--- ### ### Tap Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/viz/charts/linkerd-viz/templates/tap-injector.yaml b/viz/charts/linkerd-viz/templates/tap-injector.yaml index bca64e376..ceb9ee10b 100644 --- a/viz/charts/linkerd-viz/templates/tap-injector.yaml +++ b/viz/charts/linkerd-viz/templates/tap-injector.yaml @@ -2,7 +2,6 @@ ### ### Tap Injector ### ---- kind: Service apiVersion: v1 metadata: diff --git a/viz/charts/linkerd-viz/templates/tap-rbac.yaml b/viz/charts/linkerd-viz/templates/tap-rbac.yaml index 26ebc2ad1..e3b9c5c5e 100644 --- a/viz/charts/linkerd-viz/templates/tap-rbac.yaml +++ b/viz/charts/linkerd-viz/templates/tap-rbac.yaml @@ -2,7 +2,6 @@ ### ### Tap RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/viz/charts/linkerd-viz/templates/tap.yaml b/viz/charts/linkerd-viz/templates/tap.yaml index 773cc12eb..37e8e7e94 100644 --- a/viz/charts/linkerd-viz/templates/tap.yaml +++ b/viz/charts/linkerd-viz/templates/tap.yaml @@ -2,7 +2,6 @@ ### ### Tap ### ---- kind: Service apiVersion: v1 metadata: diff --git a/viz/charts/linkerd-viz/templates/web-rbac.yaml b/viz/charts/linkerd-viz/templates/web-rbac.yaml index 16227e452..0480386ce 100644 --- a/viz/charts/linkerd-viz/templates/web-rbac.yaml +++ b/viz/charts/linkerd-viz/templates/web-rbac.yaml @@ -2,7 +2,6 @@ ### ### Web RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: diff --git a/viz/charts/linkerd-viz/templates/web.yaml b/viz/charts/linkerd-viz/templates/web.yaml index 3a11b9b73..c34054f7c 100644 --- a/viz/charts/linkerd-viz/templates/web.yaml +++ b/viz/charts/linkerd-viz/templates/web.yaml @@ -2,7 +2,6 @@ ### ### Web ### ---- kind: Service apiVersion: v1 metadata: diff --git a/viz/cmd/testdata/install_default.golden b/viz/cmd/testdata/install_default.golden index 59f9be377..a707feecc 100644 --- a/viz/cmd/testdata/install_default.golden +++ b/viz/cmd/testdata/install_default.golden @@ -2,7 +2,6 @@ ### ### Linkerd Viz Extension Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -15,7 +14,6 @@ metadata: ### ### Metrics API RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -68,7 +66,6 @@ metadata: ### ### Grafana RBAC ### ---- kind: ServiceAccount apiVersion: v1 metadata: @@ -82,7 +79,6 @@ metadata: ### ### Prometheus RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -124,7 +120,6 @@ metadata: ### ### Tap RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -251,7 +246,6 @@ spec: ### ### Web RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -392,7 +386,6 @@ subjects: ### ### Metrics API ### ---- kind: Service apiVersion: v1 metadata: @@ -435,7 +428,7 @@ spec: template: metadata: annotations: - checksum/config: b9049bed0ca52f3d63f34e03d87cfdd38bd81f6066310d0bf64d2d3f380d5733 + checksum/config: 6827b2203b1cd90692d9dd6a973a2162e574dc9fd7b5b9e346ceac7e287204a6 linkerd.io/created-by: linkerd/helm dev-undefined labels: linkerd.io/extension: linkerd-viz @@ -475,7 +468,6 @@ spec: ### ### Grafana ### ---- kind: ConfigMap apiVersion: v1 metadata: @@ -633,7 +625,6 @@ spec: ### ### Prometheus ### ---- kind: ConfigMap apiVersion: v1 metadata: @@ -880,7 +871,6 @@ spec: ### ### Tap ### ---- kind: Service apiVersion: v1 metadata: @@ -929,7 +919,7 @@ spec: template: metadata: annotations: - checksum/config: 1396a8de42cb50dca5caf85bdb2b7ae7ad08152d0c107ec3586c366912d36aff + checksum/config: bbc82b03e8c9fdc549e1ef5d3f795c07c21fb3b4c089351186f170b722689d86 linkerd.io/created-by: linkerd/helm dev-undefined labels: linkerd.io/extension: linkerd-viz @@ -977,10 +967,10 @@ spec: secret: secretName: linkerd-tap-k8s-tls +--- ### ### Tap Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -1052,7 +1042,6 @@ webhooks: ### ### Tap Injector ### ---- kind: Service apiVersion: v1 metadata: @@ -1092,7 +1081,7 @@ spec: template: metadata: annotations: - checksum/config: bc00476e81704f0ff91b91f8c7a9e78ae452f4e003791bb755f2021820b459f8 + checksum/config: 0120b5feafdef04a057ab39fd63ed315ebbcc2bfc0b0657e3007fa34ffb8b7e2 linkerd.io/created-by: linkerd/helm dev-undefined labels: linkerd.io/extension: linkerd-viz @@ -1138,7 +1127,6 @@ spec: ### ### Web ### ---- kind: Service apiVersion: v1 metadata: diff --git a/viz/cmd/testdata/install_prometheus_disabled.golden b/viz/cmd/testdata/install_prometheus_disabled.golden index 71e50edcc..3487b8c5b 100644 --- a/viz/cmd/testdata/install_prometheus_disabled.golden +++ b/viz/cmd/testdata/install_prometheus_disabled.golden @@ -2,7 +2,6 @@ ### ### Linkerd Viz Extension Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -15,7 +14,6 @@ metadata: ### ### Metrics API RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -68,7 +66,6 @@ metadata: ### ### Grafana RBAC ### ---- kind: ServiceAccount apiVersion: v1 metadata: @@ -82,7 +79,6 @@ metadata: ### ### Tap RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -209,7 +205,6 @@ spec: ### ### Web RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -347,7 +342,6 @@ subjects: ### ### Metrics API ### ---- kind: Service apiVersion: v1 metadata: @@ -390,7 +384,7 @@ spec: template: metadata: annotations: - checksum/config: b9049bed0ca52f3d63f34e03d87cfdd38bd81f6066310d0bf64d2d3f380d5733 + checksum/config: 6827b2203b1cd90692d9dd6a973a2162e574dc9fd7b5b9e346ceac7e287204a6 linkerd.io/created-by: linkerd/helm dev-undefined labels: linkerd.io/extension: linkerd-viz @@ -430,7 +424,6 @@ spec: ### ### Grafana ### ---- kind: ConfigMap apiVersion: v1 metadata: @@ -588,7 +581,6 @@ spec: ### ### Tap ### ---- kind: Service apiVersion: v1 metadata: @@ -637,7 +629,7 @@ spec: template: metadata: annotations: - checksum/config: 1396a8de42cb50dca5caf85bdb2b7ae7ad08152d0c107ec3586c366912d36aff + checksum/config: bbc82b03e8c9fdc549e1ef5d3f795c07c21fb3b4c089351186f170b722689d86 linkerd.io/created-by: linkerd/helm dev-undefined labels: linkerd.io/extension: linkerd-viz @@ -685,10 +677,10 @@ spec: secret: secretName: linkerd-tap-k8s-tls +--- ### ### Tap Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -760,7 +752,6 @@ webhooks: ### ### Tap Injector ### ---- kind: Service apiVersion: v1 metadata: @@ -800,7 +791,7 @@ spec: template: metadata: annotations: - checksum/config: bc00476e81704f0ff91b91f8c7a9e78ae452f4e003791bb755f2021820b459f8 + checksum/config: 0120b5feafdef04a057ab39fd63ed315ebbcc2bfc0b0657e3007fa34ffb8b7e2 linkerd.io/created-by: linkerd/helm dev-undefined labels: linkerd.io/extension: linkerd-viz @@ -846,7 +837,6 @@ spec: ### ### Web ### ---- kind: Service apiVersion: v1 metadata: diff --git a/viz/cmd/testdata/install_proxy_resources.golden b/viz/cmd/testdata/install_proxy_resources.golden index 26e07fb8c..27837a82a 100644 --- a/viz/cmd/testdata/install_proxy_resources.golden +++ b/viz/cmd/testdata/install_proxy_resources.golden @@ -2,7 +2,6 @@ ### ### Linkerd Viz Extension Namespace ### ---- kind: Namespace apiVersion: v1 metadata: @@ -15,7 +14,6 @@ metadata: ### ### Metrics API RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -68,7 +66,6 @@ metadata: ### ### Grafana RBAC ### ---- kind: ServiceAccount apiVersion: v1 metadata: @@ -82,7 +79,6 @@ metadata: ### ### Prometheus RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -124,7 +120,6 @@ metadata: ### ### Tap RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -251,7 +246,6 @@ spec: ### ### Web RBAC ### ---- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -392,7 +386,6 @@ subjects: ### ### Metrics API ### ---- kind: Service apiVersion: v1 metadata: @@ -435,7 +428,7 @@ spec: template: metadata: annotations: - checksum/config: b9049bed0ca52f3d63f34e03d87cfdd38bd81f6066310d0bf64d2d3f380d5733 + checksum/config: 6827b2203b1cd90692d9dd6a973a2162e574dc9fd7b5b9e346ceac7e287204a6 linkerd.io/created-by: linkerd/helm dev-undefined labels: linkerd.io/extension: linkerd-viz @@ -475,7 +468,6 @@ spec: ### ### Grafana ### ---- kind: ConfigMap apiVersion: v1 metadata: @@ -637,7 +629,6 @@ spec: ### ### Prometheus ### ---- kind: ConfigMap apiVersion: v1 metadata: @@ -888,7 +879,6 @@ spec: ### ### Tap ### ---- kind: Service apiVersion: v1 metadata: @@ -937,7 +927,7 @@ spec: template: metadata: annotations: - checksum/config: 1396a8de42cb50dca5caf85bdb2b7ae7ad08152d0c107ec3586c366912d36aff + checksum/config: bbc82b03e8c9fdc549e1ef5d3f795c07c21fb3b4c089351186f170b722689d86 linkerd.io/created-by: linkerd/helm dev-undefined config.linkerd.io/proxy-cpu-request: "500m" config.linkerd.io/proxy-cpu-limit: "100m" @@ -989,10 +979,10 @@ spec: secret: secretName: linkerd-tap-k8s-tls +--- ### ### Tap Injector RBAC ### ---- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: @@ -1064,7 +1054,6 @@ webhooks: ### ### Tap Injector ### ---- kind: Service apiVersion: v1 metadata: @@ -1104,7 +1093,7 @@ spec: template: metadata: annotations: - checksum/config: bc00476e81704f0ff91b91f8c7a9e78ae452f4e003791bb755f2021820b459f8 + checksum/config: 0120b5feafdef04a057ab39fd63ed315ebbcc2bfc0b0657e3007fa34ffb8b7e2 linkerd.io/created-by: linkerd/helm dev-undefined labels: linkerd.io/extension: linkerd-viz @@ -1150,7 +1139,6 @@ spec: ### ### Web ### ---- kind: Service apiVersion: v1 metadata: