From d7e3c5dffeb33abe2c30b435075fb050301da4fa Mon Sep 17 00:00:00 2001 From: Rishabh Patel <66425093+rishabh-11@users.noreply.github.com> Date: Fri, 5 Aug 2022 14:34:47 +0530 Subject: [PATCH] update clusterroles and clusterrolebindings to v1 (#738) --- .../in-tree/control-cluster-role-binding.yaml | 2 +- .../deployment/in-tree/control-cluster-role.yaml | 3 ++- .../in-tree/target-cluster-role-binding.yaml | 2 +- .../deployment/in-tree/target-cluster-role.yaml | 2 +- .../out-of-tree/control-cluster-role-binding.yaml | 2 +- .../out-of-tree/control-cluster-role.yaml | 3 ++- .../out-of-tree/target-cluster-role-binding.yaml | 2 +- .../out-of-tree/target-cluster-role.yaml | 2 +- .../integration/common/helpers/handling_files.go | 14 +++++++------- 9 files changed, 17 insertions(+), 15 deletions(-) diff --git a/kubernetes/deployment/in-tree/control-cluster-role-binding.yaml b/kubernetes/deployment/in-tree/control-cluster-role-binding.yaml index 5d6e83abc..a1623f718 100644 --- a/kubernetes/deployment/in-tree/control-cluster-role-binding.yaml +++ b/kubernetes/deployment/in-tree/control-cluster-role-binding.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: machine-controller-manager-control diff --git a/kubernetes/deployment/in-tree/control-cluster-role.yaml b/kubernetes/deployment/in-tree/control-cluster-role.yaml index a2f57544e..2e771fe2b 100644 --- a/kubernetes/deployment/in-tree/control-cluster-role.yaml +++ b/kubernetes/deployment/in-tree/control-cluster-role.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: machine-controller-manager-control @@ -53,6 +53,7 @@ rules: - leases resourceNames: - machine-controller-manager + - machine-controller verbs: - get - watch diff --git a/kubernetes/deployment/in-tree/target-cluster-role-binding.yaml b/kubernetes/deployment/in-tree/target-cluster-role-binding.yaml index a2a05fec2..4067bc1f2 100644 --- a/kubernetes/deployment/in-tree/target-cluster-role-binding.yaml +++ b/kubernetes/deployment/in-tree/target-cluster-role-binding.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: machine-controller-manager-target diff --git a/kubernetes/deployment/in-tree/target-cluster-role.yaml b/kubernetes/deployment/in-tree/target-cluster-role.yaml index 4369881c2..7819cf485 100644 --- a/kubernetes/deployment/in-tree/target-cluster-role.yaml +++ b/kubernetes/deployment/in-tree/target-cluster-role.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: machine-controller-manager-target diff --git a/kubernetes/deployment/out-of-tree/control-cluster-role-binding.yaml b/kubernetes/deployment/out-of-tree/control-cluster-role-binding.yaml index 5d6e83abc..a1623f718 100644 --- a/kubernetes/deployment/out-of-tree/control-cluster-role-binding.yaml +++ b/kubernetes/deployment/out-of-tree/control-cluster-role-binding.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: machine-controller-manager-control diff --git a/kubernetes/deployment/out-of-tree/control-cluster-role.yaml b/kubernetes/deployment/out-of-tree/control-cluster-role.yaml index ba3c0e5fc..e0327568b 100644 --- a/kubernetes/deployment/out-of-tree/control-cluster-role.yaml +++ b/kubernetes/deployment/out-of-tree/control-cluster-role.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: machine-controller-manager-control @@ -58,6 +58,7 @@ rules: - leases resourceNames: - machine-controller-manager + - machine-controller verbs: - get - watch diff --git a/kubernetes/deployment/out-of-tree/target-cluster-role-binding.yaml b/kubernetes/deployment/out-of-tree/target-cluster-role-binding.yaml index a2a05fec2..4067bc1f2 100644 --- a/kubernetes/deployment/out-of-tree/target-cluster-role-binding.yaml +++ b/kubernetes/deployment/out-of-tree/target-cluster-role-binding.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: machine-controller-manager-target diff --git a/kubernetes/deployment/out-of-tree/target-cluster-role.yaml b/kubernetes/deployment/out-of-tree/target-cluster-role.yaml index 4c35d7205..20f774edf 100644 --- a/kubernetes/deployment/out-of-tree/target-cluster-role.yaml +++ b/kubernetes/deployment/out-of-tree/target-cluster-role.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: machine-controller-manager-target diff --git a/pkg/test/integration/common/helpers/handling_files.go b/pkg/test/integration/common/helpers/handling_files.go index 8daa14412..ee1c25e84 100644 --- a/pkg/test/integration/common/helpers/handling_files.go +++ b/pkg/test/integration/common/helpers/handling_files.go @@ -14,7 +14,7 @@ import ( v1alpha1 "github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1" mcmscheme "github.com/gardener/machine-controller-manager/pkg/client/clientset/versioned/scheme" v1 "k8s.io/api/apps/v1" - rbacv1bata1 "k8s.io/api/rbac/v1beta1" + rbacv1 "k8s.io/api/rbac/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -150,20 +150,20 @@ func (c *Cluster) applyFile(filePath string, namespace string) error { return err } case "ClusterRoleBinding": - resource := obj.(*rbacv1bata1.ClusterRoleBinding) + resource := obj.(*rbacv1.ClusterRoleBinding) for i := range resource.Subjects { resource.Subjects[i].Namespace = namespace } - if _, err := c.Clientset.RbacV1beta1(). + if _, err := c.Clientset.RbacV1(). ClusterRoleBindings(). Create(ctx, resource, metav1.CreateOptions{}); err != nil { return err } case "ClusterRole": - resource := obj.(*rbacv1bata1.ClusterRole) + resource := obj.(*rbacv1.ClusterRole) - if _, err := c.Clientset.RbacV1beta1(). + if _, err := c.Clientset.RbacV1(). ClusterRoles(). Create(ctx, resource, metav1.CreateOptions{}); err != nil { return err @@ -306,7 +306,7 @@ func (c *Cluster) deleteResource(filePath string, namespace string) error { return err } case "ClusterRoleBinding": - resource := obj.(*rbacv1bata1.ClusterRoleBinding) + resource := obj.(*rbacv1.ClusterRoleBinding) for i := range resource.Subjects { resource.Subjects[i].Namespace = namespace } @@ -320,7 +320,7 @@ func (c *Cluster) deleteResource(filePath string, namespace string) error { return err } case "ClusterRole": - resource := obj.(*rbacv1bata1.ClusterRole) + resource := obj.(*rbacv1.ClusterRole) if err := c.Clientset.RbacV1beta1(). ClusterRoles(). Delete(