Merge pull request #2568 from munnerz/venafi-cloud-optional-url

Make the Venafi Cloud URL field optional
2020-02-06 15:48:10 +00:00 · 2020-02-06 15:48:10 +00:00 · 94bc5f60f8
commit 94bc5f60f8
parent ba46885ee4 12d77f5ed2
6 changed files with 6 additions and 7 deletions
--- a/deploy/charts/cert-manager/crds/clusterissuers.yaml
+++ b/deploy/charts/cert-manager/crds/clusterissuers.yaml
@ -1625,7 +1625,6 @@ spec:
                  type: object
                  required:
                  - apiTokenSecretRef
-                  - url
                  properties:
                    apiTokenSecretRef:
                      description: APITokenSecretRef is a secret key selector for
--- a/deploy/charts/cert-manager/crds/issuers.yaml
+++ b/deploy/charts/cert-manager/crds/issuers.yaml
@ -1625,7 +1625,6 @@ spec:
                  type: object
                  required:
                  - apiTokenSecretRef
-                  - url
                  properties:
                    apiTokenSecretRef:
                      description: APITokenSecretRef is a secret key selector for
--- a/deploy/manifests/00-crds.yaml
+++ b/deploy/manifests/00-crds.yaml
@ -3489,7 +3489,6 @@ spec:
                  type: object
                  required:
                  - apiTokenSecretRef
-                  - url
                  properties:
                    apiTokenSecretRef:
                      description: APITokenSecretRef is a secret key selector for
@ -5229,7 +5228,6 @@ spec:
                  type: object
                  required:
                  - apiTokenSecretRef
-                  - url
                  properties:
                    apiTokenSecretRef:
                      description: APITokenSecretRef is a secret key selector for
--- a/pkg/apis/certmanager/v1alpha2/types_issuer.go
+++ b/pkg/apis/certmanager/v1alpha2/types_issuer.go
@ -140,7 +140,8 @@ type VenafiTPP struct {
 // VenafiCloud defines connection configuration details for Venafi Cloud
 type VenafiCloud struct {
 	// URL is the base URL for Venafi Cloud
-	URL string `json:"url"`
+	// +optional
+	URL string `json:"url,omitempty"`

 	// APITokenSecretRef is a secret key selector for the Venafi Cloud API token.
 	APITokenSecretRef cmmeta.SecretKeySelector `json:"apiTokenSecretRef"`
--- a/pkg/apis/certmanager/v1alpha3/types_issuer.go
+++ b/pkg/apis/certmanager/v1alpha3/types_issuer.go
@ -140,7 +140,8 @@ type VenafiTPP struct {
 // VenafiCloud defines connection configuration details for Venafi Cloud
 type VenafiCloud struct {
 	// URL is the base URL for Venafi Cloud
-	URL string `json:"url"`
+	// +optional
+	URL string `json:"url,omitempty"`

 	// APITokenSecretRef is a secret key selector for the Venafi Cloud API token.
 	APITokenSecretRef cmmeta.SecretKeySelector `json:"apiTokenSecretRef"`
--- a/pkg/internal/apis/certmanager/types_issuer.go
+++ b/pkg/internal/apis/certmanager/types_issuer.go
@ -120,7 +120,8 @@ type VenafiTPP struct {
 // VenafiCloud defines connection configuration details for Venafi Cloud
 type VenafiCloud struct {
 	// URL is the base URL for Venafi Cloud
-	URL string
+	// +optional
+	URL string `json:"url,omitempty"`

 	// APITokenSecretRef is a secret key selector for the Venafi Cloud API token.
 	APITokenSecretRef cmmeta.SecretKeySelector