Merge pull request #122 from cofyc/update-api

Use rbacv1
kubernetes-sigs · Jun 28, 2019 · 8428280 · 8428280
2 parents fe9f633 + f1ca10a
commit 8428280
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -31,7 +31,7 @@ import (
 	yaml "gopkg.in/yaml.v2"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
-	rbacv1beta1 "k8s.io/api/rbac/v1beta1"
+	rbacv1 "k8s.io/api/rbac/v1"
 	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -466,88 +466,88 @@ func createServiceAccount(config *localTestConfig) {
 // service account: systemRoleNode and systemRolePVProvisioner. These are required for
 // provisioner to get node information and create persistent volumes.
 func createProvisionerClusterRoleBinding(config *localTestConfig) {
-	subjects := []rbacv1beta1.Subject{
+	subjects := []rbacv1.Subject{
 		{
-			Kind:      rbacv1beta1.ServiceAccountKind,
+			Kind:      rbacv1.ServiceAccountKind,
 			Name:      testServiceAccount,
 			Namespace: config.ns,
 		},
 	}
 
-	pvBinding := rbacv1beta1.ClusterRoleBinding{
+	pvBinding := rbacv1.ClusterRoleBinding{
 		TypeMeta: metav1.TypeMeta{
-			APIVersion: "rbac.authorization.k8s.io/v1beta1",
+			APIVersion: rbacv1.SchemeGroupVersion.String(),
 			Kind:       "ClusterRoleBinding",
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name: pvBindingName,
 		},
-		RoleRef: rbacv1beta1.RoleRef{
-			APIGroup: "rbac.authorization.k8s.io",
+		RoleRef: rbacv1.RoleRef{
+			APIGroup: rbacv1.GroupName,
 			Kind:     "ClusterRole",
 			Name:     systemRolePVProvisioner,
 		},
 		Subjects: subjects,
 	}
-	nodeBinding := rbacv1beta1.ClusterRoleBinding{
+	nodeBinding := rbacv1.ClusterRoleBinding{
 		TypeMeta: metav1.TypeMeta{
-			APIVersion: "rbac.authorization.k8s.io/v1beta1",
+			APIVersion: rbacv1.SchemeGroupVersion.String(),
 			Kind:       "ClusterRoleBinding",
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name: nodeBindingName,
 		},
-		RoleRef: rbacv1beta1.RoleRef{
-			APIGroup: "rbac.authorization.k8s.io",
+		RoleRef: rbacv1.RoleRef{
+			APIGroup: rbacv1.GroupName,
 			Kind:     "ClusterRole",
 			Name:     systemRoleNode,
 		},
 		Subjects: subjects,
 	}
 
 	deleteClusterRoleBinding(config)
-	_, err := config.client.RbacV1beta1().ClusterRoleBindings().Create(&pvBinding)
+	_, err := config.client.RbacV1().ClusterRoleBindings().Create(&pvBinding)
 	Expect(err).NotTo(HaveOccurred())
-	_, err = config.client.RbacV1beta1().ClusterRoleBindings().Create(&nodeBinding)
+	_, err = config.client.RbacV1().ClusterRoleBindings().Create(&nodeBinding)
 	Expect(err).NotTo(HaveOccurred())
 
 	// job role and rolebinding
-	jobRole := rbacv1beta1.Role{
+	jobRole := rbacv1.Role{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "local-storage-provisioner-jobs-role",
 			Namespace: config.ns,
 		},
-		Rules: []rbacv1beta1.PolicyRule{
+		Rules: []rbacv1.PolicyRule{
 			{
 				APIGroups: []string{"batch"},
 				Resources: []string{"jobs"},
 				Verbs:     []string{"*"},
 			},
 		},
 	}
-	jobRoleBinding := rbacv1beta1.RoleBinding{
+	jobRoleBinding := rbacv1.RoleBinding{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "local-storage-provisioner-jobs-rolebinding",
 			Namespace: config.ns,
 		},
 		Subjects: subjects,
-		RoleRef: rbacv1beta1.RoleRef{
-			APIGroup: "rbac.authorization.k8s.io",
+		RoleRef: rbacv1.RoleRef{
+			APIGroup: rbacv1.GroupName,
 			Kind:     "Role",
 			Name:     jobRole.Name,
 		},
 	}
-	_, err = config.client.RbacV1beta1().Roles(config.ns).Create(&jobRole)
+	_, err = config.client.RbacV1().Roles(config.ns).Create(&jobRole)
 	Expect(err).NotTo(HaveOccurred())
-	_, err = config.client.RbacV1beta1().RoleBindings(config.ns).Create(&jobRoleBinding)
+	_, err = config.client.RbacV1().RoleBindings(config.ns).Create(&jobRoleBinding)
 	Expect(err).NotTo(HaveOccurred())
 }
 
 func deleteClusterRoleBinding(config *localTestConfig) {
 	// These role bindings are created in provisioner; we just ensure it's
 	// deleted and do not panic on error.
-	config.client.RbacV1beta1().ClusterRoleBindings().Delete(nodeBindingName, metav1.NewDeleteOptions(0))
-	config.client.RbacV1beta1().ClusterRoleBindings().Delete(pvBindingName, metav1.NewDeleteOptions(0))
+	config.client.RbacV1().ClusterRoleBindings().Delete(nodeBindingName, metav1.NewDeleteOptions(0))
+	config.client.RbacV1().ClusterRoleBindings().Delete(pvBindingName, metav1.NewDeleteOptions(0))
 }
 
 func createAndSetupLoopDevice(config *localTestConfig, file string, node *v1.Node, size int) {
@@ -692,7 +692,7 @@ func createProvisionerDaemonset(config *localTestConfig) {
 	provisioner := &appsv1.DaemonSet{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "DaemonSet",
-			APIVersion: "extensions/v1beta1",
+			APIVersion: appsv1.SchemeGroupVersion.String(),
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name: daemonSetName,
@@ -780,7 +780,7 @@ func createProvisionerDaemonset(config *localTestConfig) {
 	_, err := config.client.AppsV1().DaemonSets(config.ns).Create(provisioner)
 	Expect(err).NotTo(HaveOccurred())
 
-	kind := schema.GroupKind{Group: "extensions", Kind: "DaemonSet"}
+	kind := schema.GroupKind{Group: appsv1.GroupName, Kind: "DaemonSet"}
 	framework.WaitForControlledPodsRunning(config.client, config.ns, daemonSetName, kind)
 }