@@ -51,6 +51,7 @@ import (
51
51
batchv1 "k8s.io/api/batch/v1"
52
52
batchv1b1 "k8s.io/api/batch/v1beta1"
53
53
csr "k8s.io/api/certificates/v1"
54
+ csrv1b1 "k8s.io/api/certificates/v1beta1"
54
55
corev1 "k8s.io/api/core/v1"
55
56
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
56
57
networkingv1 "k8s.io/api/networking/v1"
@@ -146,14 +147,22 @@ func (h *fakeKube) ServeHTTP(w http.ResponseWriter, r *http.Request) {
146
147
}
147
148
csReq , ok := obj .(* csr.CertificateSigningRequest )
148
149
if ! ok {
149
- http .Error (w , "obj is not a *csr.CertificateSigningRequest" , http .StatusBadRequest )
150
- return
150
+ csReq , okV1b1 := obj .(* csrv1b1.CertificateSigningRequest )
151
+ if ! okV1b1 {
152
+ http .Error (w , "obj is not a *csr.CertificateSigningRequest" , http .StatusBadRequest )
153
+ return
154
+ }
155
+ csReq .TypeMeta = metav1.TypeMeta {
156
+ APIVersion : "certificates.k8s.io/v1beta1" ,
157
+ Kind : "CertificateSigningRequest" ,
158
+ }
159
+ } else {
160
+ csReq .TypeMeta = metav1.TypeMeta {
161
+ APIVersion : "certificates.k8s.io/v1" ,
162
+ Kind : "CertificateSigningRequest" ,
163
+ }
151
164
}
152
165
csReq .Status .Certificate = []byte ("cert" )
153
- csReq .TypeMeta = metav1.TypeMeta {
154
- APIVersion : "certificates.k8s.io/v1" ,
155
- Kind : "CertificateSigningRequest" ,
156
- }
157
166
data , err = apiruntime .Encode (unstructured .UnstructuredJSONScheme , csReq )
158
167
if err != nil {
159
168
http .Error (w , err .Error (), http .StatusBadRequest )
@@ -420,6 +429,12 @@ func fakeDiscovery() discovery.DiscoveryInterface {
420
429
{Name : "certificatesigningrequests" , Kind : "CertificateSigningRequest" },
421
430
},
422
431
},
432
+ {
433
+ GroupVersion : csrv1b1 .SchemeGroupVersion .String (),
434
+ APIResources : []metav1.APIResource {
435
+ {Name : "certificatesigningrequests" , Kind : "CertificateSigningRequest" },
436
+ },
437
+ },
423
438
{
424
439
GroupVersion : admissionregistrationv1 .SchemeGroupVersion .String (),
425
440
APIResources : []metav1.APIResource {
0 commit comments