Skip to content

Commit

Permalink
Support both Cert v1 and v1beta1 APIs (#99)
Browse files Browse the repository at this point in the history
  • Loading branch information
nitishkrishna authored Nov 30, 2021
1 parent 0c9b9f5 commit 3ac34a4
Showing 1 changed file with 21 additions and 6 deletions.
27 changes: 21 additions & 6 deletions pkg/kube/kube_fake.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ import (
batchv1 "k8s.io/api/batch/v1"
batchv1b1 "k8s.io/api/batch/v1beta1"
csr "k8s.io/api/certificates/v1"
csrv1b1 "k8s.io/api/certificates/v1beta1"
corev1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
networkingv1 "k8s.io/api/networking/v1"
Expand Down Expand Up @@ -146,14 +147,22 @@ func (h *fakeKube) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
csReq, ok := obj.(*csr.CertificateSigningRequest)
if !ok {
http.Error(w, "obj is not a *csr.CertificateSigningRequest", http.StatusBadRequest)
return
csReq, okV1b1 := obj.(*csrv1b1.CertificateSigningRequest)
if !okV1b1 {
http.Error(w, "obj is not a *csr.CertificateSigningRequest", http.StatusBadRequest)
return
}
csReq.TypeMeta = metav1.TypeMeta{
APIVersion: "certificates.k8s.io/v1beta1",
Kind: "CertificateSigningRequest",
}
} else {
csReq.TypeMeta = metav1.TypeMeta{
APIVersion: "certificates.k8s.io/v1",
Kind: "CertificateSigningRequest",
}
}
csReq.Status.Certificate = []byte("cert")
csReq.TypeMeta = metav1.TypeMeta{
APIVersion: "certificates.k8s.io/v1",
Kind: "CertificateSigningRequest",
}
data, err = apiruntime.Encode(unstructured.UnstructuredJSONScheme, csReq)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
Expand Down Expand Up @@ -420,6 +429,12 @@ func fakeDiscovery() discovery.DiscoveryInterface {
{Name: "certificatesigningrequests", Kind: "CertificateSigningRequest"},
},
},
{
GroupVersion: csrv1b1.SchemeGroupVersion.String(),
APIResources: []metav1.APIResource{
{Name: "certificatesigningrequests", Kind: "CertificateSigningRequest"},
},
},
{
GroupVersion: admissionregistrationv1.SchemeGroupVersion.String(),
APIResources: []metav1.APIResource{
Expand Down

0 comments on commit 3ac34a4

Please sign in to comment.