Merge pull request #2368 from munnerz/cr-csr-required

Mark 'csr' field as required in CertificateRequest

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:

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:

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

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

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