Skip to content

Bug 1961341: Remove rbacv1beta1 support #652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 22, 2021
Merged

Bug 1961341: Remove rbacv1beta1 support #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions hack/generate-lib-resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ def scheme_group_versions(types):
'k8s.io/kube-aggregator/pkg/apis/apiregistration/v1': {'APIService'},
}

types['k8s.io/api/rbac/v1beta1'] = types['k8s.io/api/rbac/v1']
types['k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1'] = types['k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1']
types['k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1'] = types['k8s.io/kube-aggregator/pkg/apis/apiregistration/v1']

Expand All @@ -280,7 +279,6 @@ def scheme_group_versions(types):
'k8s.io/api/batch/v1': {'package': 'k8s.io/client-go/kubernetes/typed/batch/v1', 'type': 'BatchV1Client'},
'k8s.io/api/core/v1': {'package': 'k8s.io/client-go/kubernetes/typed/core/v1', 'type': 'CoreV1Client'},
'k8s.io/api/rbac/v1': {'package': 'k8s.io/client-go/kubernetes/typed/rbac/v1', 'type': 'RbacV1Client'},
'k8s.io/api/rbac/v1beta1': {'package': 'k8s.io/client-go/kubernetes/typed/rbac/v1beta1', 'type': 'RbacV1beta1Client'},
'k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1': {'package': 'k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1', 'type': 'ApiextensionsV1Client'},
'k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1': {'package': 'k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1', 'type': 'ApiextensionsV1beta1Client'},
'k8s.io/kube-aggregator/pkg/apis/apiregistration/v1': {'package': 'k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1', 'type': 'ApiregistrationV1Client'},
Expand Down
112 changes: 0 additions & 112 deletions lib/resourceapply/rbacv1beta1.go
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions lib/resourcebuilder/resourcebuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
rbacv1beta1 "k8s.io/api/rbac/v1beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsclientv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
Expand All @@ -28,7 +27,6 @@ import (
batchclientv1 "k8s.io/client-go/kubernetes/typed/batch/v1"
coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1"
rbacclientv1 "k8s.io/client-go/kubernetes/typed/rbac/v1"
rbacclientv1beta1 "k8s.io/client-go/kubernetes/typed/rbac/v1beta1"
"k8s.io/client-go/rest"
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
Expand All @@ -52,7 +50,6 @@ type builder struct {
coreClientv1 *coreclientv1.CoreV1Client
imageClientv1 *imageclientv1.ImageV1Client
rbacClientv1 *rbacclientv1.RbacV1Client
rbacClientv1beta1 *rbacclientv1beta1.RbacV1beta1Client
securityClientv1 *securityclientv1.SecurityV1Client
}

Expand All @@ -70,7 +67,6 @@ func newBuilder(config *rest.Config, m manifest.Manifest) Interface {
coreClientv1: coreclientv1.NewForConfigOrDie(withProtobuf(config)),
imageClientv1: imageclientv1.NewForConfigOrDie(config),
rbacClientv1: rbacclientv1.NewForConfigOrDie(withProtobuf(config)),
rbacClientv1beta1: rbacclientv1beta1.NewForConfigOrDie(withProtobuf(config)),
securityClientv1: securityclientv1.NewForConfigOrDie(config),
}
}
Expand Down Expand Up @@ -189,34 +185,6 @@ func (b *builder) Do(ctx context.Context) error {
if _, _, err := resourceapply.ApplyRoleBindingv1(ctx, b.rbacClientv1, typedObject); err != nil {
return err
}
case *rbacv1beta1.ClusterRole:
if b.modifier != nil {
b.modifier(typedObject)
}
if _, _, err := resourceapply.ApplyClusterRolev1beta1(ctx, b.rbacClientv1beta1, typedObject); err != nil {
return err
}
case *rbacv1beta1.ClusterRoleBinding:
if b.modifier != nil {
b.modifier(typedObject)
}
if _, _, err := resourceapply.ApplyClusterRoleBindingv1beta1(ctx, b.rbacClientv1beta1, typedObject); err != nil {
return err
}
case *rbacv1beta1.Role:
if b.modifier != nil {
b.modifier(typedObject)
}
if _, _, err := resourceapply.ApplyRolev1beta1(ctx, b.rbacClientv1beta1, typedObject); err != nil {
return err
}
case *rbacv1beta1.RoleBinding:
if b.modifier != nil {
b.modifier(typedObject)
}
if _, _, err := resourceapply.ApplyRoleBindingv1beta1(ctx, b.rbacClientv1beta1, typedObject); err != nil {
return err
}
case *apiextensionsv1.CustomResourceDefinition:
if b.modifier != nil {
b.modifier(typedObject)
Expand Down Expand Up @@ -270,10 +238,6 @@ func init() {
rm.RegisterGVK(rbacv1.SchemeGroupVersion.WithKind("ClusterRoleBinding"), newBuilder)
rm.RegisterGVK(rbacv1.SchemeGroupVersion.WithKind("Role"), newBuilder)
rm.RegisterGVK(rbacv1.SchemeGroupVersion.WithKind("RoleBinding"), newBuilder)
rm.RegisterGVK(rbacv1beta1.SchemeGroupVersion.WithKind("ClusterRole"), newBuilder)
rm.RegisterGVK(rbacv1beta1.SchemeGroupVersion.WithKind("ClusterRoleBinding"), newBuilder)
rm.RegisterGVK(rbacv1beta1.SchemeGroupVersion.WithKind("Role"), newBuilder)
rm.RegisterGVK(rbacv1beta1.SchemeGroupVersion.WithKind("RoleBinding"), newBuilder)
rm.RegisterGVK(securityv1.SchemeGroupVersion.WithKind("SecurityContextConstraints"), newBuilder)
rm.AddToMap(Mapper)
}
54 changes: 0 additions & 54 deletions lib/resourcemerge/rbacv1beta1.go
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions lib/resourceread/resourceread.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
rbacv1beta1 "k8s.io/api/rbac/v1beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -53,9 +52,6 @@ func init() {
if err := rbacv1.AddToScheme(scheme); err != nil {
panic(err)
}
if err := rbacv1beta1.AddToScheme(scheme); err != nil {
panic(err)
}
if err := securityv1.AddToScheme(scheme); err != nil {
panic(err)
}
Expand All @@ -69,7 +65,6 @@ func init() {
corev1.SchemeGroupVersion,
imagev1.SchemeGroupVersion,
rbacv1.SchemeGroupVersion,
rbacv1beta1.SchemeGroupVersion,
securityv1.SchemeGroupVersion,
)
}
Expand Down