From 32f8aef97b5bf64ea563756f3399eb64e4dcb918 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Thu, 20 Jun 2019 11:40:39 -0700 Subject: [PATCH] add import-alias for k8s.io/api/rbac/v1 --- hack/.import-aliases | 3 +- test/e2e/framework/create.go | 30 +++++++++---------- .../monitoring/custom_metrics_deployments.go | 8 ++--- test/e2e/manifest/manifest.go | 6 ++-- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/hack/.import-aliases b/hack/.import-aliases index 405cc4cabed..86255f81935 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -23,5 +23,6 @@ "k8s.io/api/networking/v1beta1": "networkingv1beta1", "k8s.io/api/node/v1alpha1": "nodev1alpha1", "k8s.io/api/node/v1beta1": "nodev1beta1", - "k8s.io/api/policy/v1beta1": "policyv1beta1" + "k8s.io/api/policy/v1beta1": "policyv1beta1", + "k8s.io/api/rbac/v1": "rbacv1" } \ No newline at end of file diff --git a/test/e2e/framework/create.go b/test/e2e/framework/create.go index abab5cdf20d..9fb01483712 100644 --- a/test/e2e/framework/create.go +++ b/test/e2e/framework/create.go @@ -25,7 +25,7 @@ import ( appsv1 "k8s.io/api/apps/v1" "k8s.io/api/core/v1" - rbac "k8s.io/api/rbac/v1" + rbacv1 "k8s.io/api/rbac/v1" storage "k8s.io/api/storage/v1" apierrs "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -307,9 +307,9 @@ func (f *Framework) PatchNamespace(item *string) { func (f *Framework) patchItemRecursively(item interface{}) error { switch item := item.(type) { - case *rbac.Subject: + case *rbacv1.Subject: f.PatchNamespace(&item.Namespace) - case *rbac.RoleRef: + case *rbacv1.RoleRef: // TODO: avoid hard-coding this special name. Perhaps add a Framework.PredefinedRoles // which contains all role names that are defined cluster-wide before the test starts? // All those names are excempt from renaming. That list could be populated by querying @@ -317,9 +317,9 @@ func (f *Framework) patchItemRecursively(item interface{}) error { if item.Name != "e2e-test-privileged-psp" { f.PatchName(&item.Name) } - case *rbac.ClusterRole: + case *rbacv1.ClusterRole: f.PatchName(&item.Name) - case *rbac.Role: + case *rbacv1.Role: f.PatchNamespace(&item.Namespace) // Roles are namespaced, but because for RoleRef above we don't // know whether the referenced role is a ClusterRole or Role @@ -331,7 +331,7 @@ func (f *Framework) patchItemRecursively(item interface{}) error { f.PatchNamespace(&item.ObjectMeta.Namespace) case *v1.Secret: f.PatchNamespace(&item.ObjectMeta.Namespace) - case *rbac.ClusterRoleBinding: + case *rbacv1.ClusterRoleBinding: f.PatchName(&item.Name) for i := range item.Subjects { if err := f.patchItemRecursively(&item.Subjects[i]); err != nil { @@ -341,7 +341,7 @@ func (f *Framework) patchItemRecursively(item interface{}) error { if err := f.patchItemRecursively(&item.RoleRef); err != nil { return errors.Wrapf(err, "%T", f) } - case *rbac.RoleBinding: + case *rbacv1.RoleBinding: f.PatchNamespace(&item.Namespace) for i := range item.Subjects { if err := f.patchItemRecursively(&item.Subjects[i]); err != nil { @@ -391,11 +391,11 @@ func (*serviceAccountFactory) Create(f *Framework, i interface{}) (func() error, type clusterRoleFactory struct{} func (f *clusterRoleFactory) New() runtime.Object { - return &rbac.ClusterRole{} + return &rbacv1.ClusterRole{} } func (*clusterRoleFactory) Create(f *Framework, i interface{}) (func() error, error) { - item, ok := i.(*rbac.ClusterRole) + item, ok := i.(*rbacv1.ClusterRole) if !ok { return nil, errorItemNotSupported } @@ -413,11 +413,11 @@ func (*clusterRoleFactory) Create(f *Framework, i interface{}) (func() error, er type clusterRoleBindingFactory struct{} func (f *clusterRoleBindingFactory) New() runtime.Object { - return &rbac.ClusterRoleBinding{} + return &rbacv1.ClusterRoleBinding{} } func (*clusterRoleBindingFactory) Create(f *Framework, i interface{}) (func() error, error) { - item, ok := i.(*rbac.ClusterRoleBinding) + item, ok := i.(*rbacv1.ClusterRoleBinding) if !ok { return nil, errorItemNotSupported } @@ -434,11 +434,11 @@ func (*clusterRoleBindingFactory) Create(f *Framework, i interface{}) (func() er type roleFactory struct{} func (f *roleFactory) New() runtime.Object { - return &rbac.Role{} + return &rbacv1.Role{} } func (*roleFactory) Create(f *Framework, i interface{}) (func() error, error) { - item, ok := i.(*rbac.Role) + item, ok := i.(*rbacv1.Role) if !ok { return nil, errorItemNotSupported } @@ -455,11 +455,11 @@ func (*roleFactory) Create(f *Framework, i interface{}) (func() error, error) { type roleBindingFactory struct{} func (f *roleBindingFactory) New() runtime.Object { - return &rbac.RoleBinding{} + return &rbacv1.RoleBinding{} } func (*roleBindingFactory) Create(f *Framework, i interface{}) (func() error, error) { - item, ok := i.(*rbac.RoleBinding) + item, ok := i.(*rbacv1.RoleBinding) if !ok { return nil, errorItemNotSupported } diff --git a/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go b/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go index 41e51151f2c..1e2a4952d9a 100644 --- a/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go +++ b/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go @@ -24,7 +24,7 @@ import ( gcm "google.golang.org/api/monitoring/v3" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" - rbac "k8s.io/api/rbac/v1" + rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" e2elog "k8s.io/kubernetes/test/e2e/framework/log" @@ -44,16 +44,16 @@ var ( StackdriverExporter = "stackdriver-exporter" // HPAPermissions is a ClusterRoleBinding that grants unauthenticated user permissions granted for // HPA for testing purposes, i.e. it should grant permission to read custom metrics. - HPAPermissions = &rbac.ClusterRoleBinding{ + HPAPermissions = &rbacv1.ClusterRoleBinding{ ObjectMeta: metav1.ObjectMeta{ Name: "custom-metrics-reader", }, - RoleRef: rbac.RoleRef{ + RoleRef: rbacv1.RoleRef{ APIGroup: "rbac.authorization.k8s.io", Kind: "ClusterRole", Name: "system:controller:horizontal-pod-autoscaler", }, - Subjects: []rbac.Subject{ + Subjects: []rbacv1.Subject{ { APIGroup: "rbac.authorization.k8s.io", Kind: "Group", diff --git a/test/e2e/manifest/manifest.go b/test/e2e/manifest/manifest.go index 09930ae64f3..691c5ef1309 100644 --- a/test/e2e/manifest/manifest.go +++ b/test/e2e/manifest/manifest.go @@ -23,7 +23,7 @@ import ( appsv1 "k8s.io/api/apps/v1" "k8s.io/api/core/v1" networkingv1beta1 "k8s.io/api/networking/v1beta1" - rbac "k8s.io/api/rbac/v1" + rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -163,8 +163,8 @@ func DaemonSetFromManifest(fileName, ns string) (*appsv1.DaemonSet, error) { } // RoleFromManifest returns a Role from a manifest stored in fileName in the Namespace indicated by ns. -func RoleFromManifest(fileName, ns string) (*rbac.Role, error) { - var role rbac.Role +func RoleFromManifest(fileName, ns string) (*rbacv1.Role, error) { + var role rbacv1.Role data, err := testfiles.Read(fileName) json, err := utilyaml.ToJSON(data)