From cae4add8d0fb289f6def2073f53f621338c63198 Mon Sep 17 00:00:00 2001 From: Simon Weald <7832341+glitchcrab@users.noreply.github.com> Date: Wed, 9 Dec 2020 20:56:25 +0000 Subject: [PATCH] Update RBAC API versions to avoid deprecations (#5332) When testing the `linkerd2-cni` chart with `ct`, it flags up usage of some deprecated apiVersions. This PR aligns the RBAC API group across all resources in the chart. --- Signed-off-by: Simon Weald --- charts/linkerd2-cni/templates/cni-plugin.yaml | 4 ++-- cli/cmd/testdata/install-cni-plugin_default.golden | 4 ++-- cli/cmd/testdata/install-cni-plugin_fully_configured.golden | 4 ++-- .../install-cni-plugin_fully_configured_equal_dsts.golden | 4 ++-- .../install-cni-plugin_fully_configured_no_namespace.golden | 4 ++-- cli/cmd/testdata/install-cni-plugin_skip_ports.golden | 4 ++-- cli/cmd/testdata/install_cni_helm_default_output.golden | 4 ++-- cli/cmd/testdata/install_cni_helm_override_output.golden | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/charts/linkerd2-cni/templates/cni-plugin.yaml b/charts/linkerd2-cni/templates/cni-plugin.yaml index d600f20b9..68e15a254 100644 --- a/charts/linkerd2-cni/templates/cni-plugin.yaml +++ b/charts/linkerd2-cni/templates/cni-plugin.yaml @@ -93,7 +93,7 @@ subjects: namespace: {{.Values.namespace}} --- kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 metadata: name: linkerd-cni labels: @@ -103,7 +103,7 @@ rules: resources: ["pods", "nodes", "namespaces"] verbs: ["list", "get", "watch"] --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: linkerd-cni diff --git a/cli/cmd/testdata/install-cni-plugin_default.golden b/cli/cmd/testdata/install-cni-plugin_default.golden index 66ce80b3b..6de67b927 100644 --- a/cli/cmd/testdata/install-cni-plugin_default.golden +++ b/cli/cmd/testdata/install-cni-plugin_default.golden @@ -68,7 +68,7 @@ subjects: namespace: linkerd-cni --- kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 metadata: name: linkerd-cni labels: @@ -78,7 +78,7 @@ rules: resources: ["pods", "nodes", "namespaces"] verbs: ["list", "get", "watch"] --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: linkerd-cni diff --git a/cli/cmd/testdata/install-cni-plugin_fully_configured.golden b/cli/cmd/testdata/install-cni-plugin_fully_configured.golden index 22e9b5e2a..333a1d637 100644 --- a/cli/cmd/testdata/install-cni-plugin_fully_configured.golden +++ b/cli/cmd/testdata/install-cni-plugin_fully_configured.golden @@ -68,7 +68,7 @@ subjects: namespace: other --- kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 metadata: name: linkerd-cni labels: @@ -78,7 +78,7 @@ rules: resources: ["pods", "nodes", "namespaces"] verbs: ["list", "get", "watch"] --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: linkerd-cni diff --git a/cli/cmd/testdata/install-cni-plugin_fully_configured_equal_dsts.golden b/cli/cmd/testdata/install-cni-plugin_fully_configured_equal_dsts.golden index 245d769a6..4d71f7110 100644 --- a/cli/cmd/testdata/install-cni-plugin_fully_configured_equal_dsts.golden +++ b/cli/cmd/testdata/install-cni-plugin_fully_configured_equal_dsts.golden @@ -68,7 +68,7 @@ subjects: namespace: other --- kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 metadata: name: linkerd-cni labels: @@ -78,7 +78,7 @@ rules: resources: ["pods", "nodes", "namespaces"] verbs: ["list", "get", "watch"] --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: linkerd-cni diff --git a/cli/cmd/testdata/install-cni-plugin_fully_configured_no_namespace.golden b/cli/cmd/testdata/install-cni-plugin_fully_configured_no_namespace.golden index 0e0801cef..61bab3967 100644 --- a/cli/cmd/testdata/install-cni-plugin_fully_configured_no_namespace.golden +++ b/cli/cmd/testdata/install-cni-plugin_fully_configured_no_namespace.golden @@ -58,7 +58,7 @@ subjects: namespace: other --- kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 metadata: name: linkerd-cni labels: @@ -68,7 +68,7 @@ rules: resources: ["pods", "nodes", "namespaces"] verbs: ["list", "get", "watch"] --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: linkerd-cni diff --git a/cli/cmd/testdata/install-cni-plugin_skip_ports.golden b/cli/cmd/testdata/install-cni-plugin_skip_ports.golden index f5d83da1f..c2f0e7a11 100644 --- a/cli/cmd/testdata/install-cni-plugin_skip_ports.golden +++ b/cli/cmd/testdata/install-cni-plugin_skip_ports.golden @@ -68,7 +68,7 @@ subjects: namespace: linkerd-cni --- kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 metadata: name: linkerd-cni labels: @@ -78,7 +78,7 @@ rules: resources: ["pods", "nodes", "namespaces"] verbs: ["list", "get", "watch"] --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: linkerd-cni diff --git a/cli/cmd/testdata/install_cni_helm_default_output.golden b/cli/cmd/testdata/install_cni_helm_default_output.golden index dfcbdf73b..bf967f1b5 100644 --- a/cli/cmd/testdata/install_cni_helm_default_output.golden +++ b/cli/cmd/testdata/install_cni_helm_default_output.golden @@ -70,7 +70,7 @@ subjects: namespace: linkerd-cni --- kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 metadata: name: linkerd-cni labels: @@ -80,7 +80,7 @@ rules: resources: ["pods", "nodes", "namespaces"] verbs: ["list", "get", "watch"] --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: linkerd-cni diff --git a/cli/cmd/testdata/install_cni_helm_override_output.golden b/cli/cmd/testdata/install_cni_helm_override_output.golden index 17bf55af9..0f72e1f66 100644 --- a/cli/cmd/testdata/install_cni_helm_override_output.golden +++ b/cli/cmd/testdata/install_cni_helm_override_output.golden @@ -70,7 +70,7 @@ subjects: namespace: linkerd-test --- kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 metadata: name: linkerd-cni labels: @@ -80,7 +80,7 @@ rules: resources: ["pods", "nodes", "namespaces"] verbs: ["list", "get", "watch"] --- -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: linkerd-cni