Skip to content

Commit 1d27789

Browse files
author
Furkhat Kasymov Genii Uulu
committed
GroupVersionKind() returns empty
1 parent ff8cb75 commit 1d27789

File tree

3 files changed

+9
-16
lines changed

3 files changed

+9
-16
lines changed

internal/actions/csr/svc.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
corev1 "k8s.io/api/core/v1"
1616
apierrors "k8s.io/apimachinery/pkg/api/errors"
1717
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
18-
"k8s.io/apimachinery/pkg/runtime"
1918
"k8s.io/apimachinery/pkg/util/wait"
2019
"k8s.io/client-go/kubernetes"
2120
"k8s.io/client-go/tools/cache"
@@ -72,12 +71,7 @@ func (m *ApprovalManager) Start(ctx context.Context) error {
7271

7372
handlerFuncs := cache.ResourceEventHandlerFuncs{
7473
AddFunc: func(obj interface{}) {
75-
csrObj, ok := obj.(runtime.Object)
76-
if !ok {
77-
m.log.WithField("object", obj).Warn("object is not a runtime.Object")
78-
return
79-
}
80-
csr, err := wrapper.NewCSR(m.clientset, csrObj)
74+
csr, err := wrapper.NewCSR(m.clientset, obj)
8175
if err != nil {
8276
m.log.WithError(err).Warn("creating csr wrapper")
8377
return

internal/actions/csr/wrapper/csr.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
v1 "k8s.io/api/core/v1"
1414
k8serrors "k8s.io/apimachinery/pkg/api/errors"
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
16-
"k8s.io/apimachinery/pkg/runtime"
1716
"k8s.io/client-go/kubernetes"
1817
certificatesv1 "k8s.io/client-go/kubernetes/typed/certificates/v1"
1918
certificatesv1beta1 "k8s.io/client-go/kubernetes/typed/certificates/v1beta1"
@@ -35,21 +34,21 @@ type CSR struct {
3534
}
3635

3736
// NewCSR validates and creates new certificateRequestFacade.
38-
func NewCSR(clientset kubernetes.Interface, csrObj runtime.Object) (*CSR, error) {
37+
func NewCSR(clientset kubernetes.Interface, csrObj interface{}) (*CSR, error) {
3938
var (
4039
v1 *certv1.CertificateSigningRequest
4140
v1b1 *certv1beta1.CertificateSigningRequest
4241
)
4342
if csrObj == nil {
4443
return nil, fmt.Errorf("either v1 or v1beta1 CertificateSigningRequests expected but got none")
4544
}
46-
switch csrObj.DeepCopyObject().GetObjectKind().GroupVersionKind() {
47-
case certv1.SchemeGroupVersion.WithKind("CertificateSigningRequest"):
48-
v1 = csrObj.(*certv1.CertificateSigningRequest)
49-
case certv1beta1.SchemeGroupVersion.WithKind("CertificateSigningRequest"):
50-
v1b1 = csrObj.(*certv1beta1.CertificateSigningRequest)
45+
switch csr := csrObj.(type) {
46+
case *certv1.CertificateSigningRequest:
47+
v1 = csr
48+
case *certv1beta1.CertificateSigningRequest:
49+
v1b1 = csr
5150
default:
52-
return nil, fmt.Errorf("either v1 or v1beta1 CertificateSigningRequests expected but got %s", csrObj.DeepCopyObject().GetObjectKind().GroupVersionKind())
51+
return nil, fmt.Errorf("either v1 or v1beta1 CertificateSigningRequests expected but got %T", csrObj)
5352
}
5453
var result CSR
5554
var err error

internal/actions/csr/wrapper/csr_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestNewCSR(t *testing.T) {
2727
t.Parallel()
2828
for _, testcase := range []struct {
2929
name string
30-
csrObj runtime.Object
30+
csrObj interface{}
3131
notOK bool
3232
}{
3333
{

0 commit comments

Comments
 (0)