From e8fbd37634721784de4ffe03105a789e226bf5ee Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Fri, 15 Nov 2019 00:58:03 +0000 Subject: [PATCH] Mark 'csr' field as required in CertificateRequest Signed-off-by: James Munnelly --- deploy/charts/cert-manager/crds/certificaterequests.yaml | 1 + deploy/manifests/00-crds.yaml | 1 + design/20190708.certificate-request-crd.md | 3 +-- pkg/apis/certmanager/v1alpha2/types_certificaterequest.go | 3 +-- pkg/internal/apis/certmanager/types_certificaterequest.go | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/deploy/charts/cert-manager/crds/certificaterequests.yaml b/deploy/charts/cert-manager/crds/certificaterequests.yaml index f84ad61a5..fb59d98a1 100644 --- a/deploy/charts/cert-manager/crds/certificaterequests.yaml +++ b/deploy/charts/cert-manager/crds/certificaterequests.yaml @@ -56,6 +56,7 @@ spec: description: CertificateRequestSpec defines the desired state of CertificateRequest type: object required: + - csr - issuerRef properties: csr: diff --git a/deploy/manifests/00-crds.yaml b/deploy/manifests/00-crds.yaml index 588a7b29b..d002a6eb4 100644 --- a/deploy/manifests/00-crds.yaml +++ b/deploy/manifests/00-crds.yaml @@ -56,6 +56,7 @@ spec: description: CertificateRequestSpec defines the desired state of CertificateRequest type: object required: + - csr - issuerRef properties: csr: diff --git a/design/20190708.certificate-request-crd.md b/design/20190708.certificate-request-crd.md index f7e106203..7aa28164d 100644 --- a/design/20190708.certificate-request-crd.md +++ b/design/20190708.certificate-request-crd.md @@ -124,8 +124,7 @@ type CertificateRequestSpec struct { IssuerRef ObjectReference `json:"issuerRef"` // Byte slice containing the PEM encoded CertificateSigningRequest - // +optional - CSRPEM []byte `json:"csr,omitempty"` + CSRPEM []byte `json:"csr"` // IsCA will mark the resulting certificate as valid for signing. This // implies that the 'signing' usage is set diff --git a/pkg/apis/certmanager/v1alpha2/types_certificaterequest.go b/pkg/apis/certmanager/v1alpha2/types_certificaterequest.go index b8ad1a6c2..7451490a7 100644 --- a/pkg/apis/certmanager/v1alpha2/types_certificaterequest.go +++ b/pkg/apis/certmanager/v1alpha2/types_certificaterequest.go @@ -73,8 +73,7 @@ type CertificateRequestSpec struct { IssuerRef cmmeta.ObjectReference `json:"issuerRef"` // Byte slice containing the PEM encoded CertificateSigningRequest - // +optional - CSRPEM []byte `json:"csr,omitempty"` + CSRPEM []byte `json:"csr"` // IsCA will mark the resulting certificate as valid for signing. This // implies that the 'cert sign' usage is set diff --git a/pkg/internal/apis/certmanager/types_certificaterequest.go b/pkg/internal/apis/certmanager/types_certificaterequest.go index 793cad97d..7e9d1cee6 100644 --- a/pkg/internal/apis/certmanager/types_certificaterequest.go +++ b/pkg/internal/apis/certmanager/types_certificaterequest.go @@ -65,8 +65,7 @@ type CertificateRequestSpec struct { IssuerRef cmmeta.ObjectReference `json:"issuerRef"` // Byte slice containing the PEM encoded CertificateSigningRequest - // +optional - CSRPEM []byte `json:"csr,omitempty"` + CSRPEM []byte `json:"csr"` // IsCA will mark the resulting certificate as valid for signing. This // implies that the 'signing' usage is set