From 5b9cd23d0f925b047fe78e3f7443335e28622e0a Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Mon, 3 Feb 2020 18:18:38 +0000 Subject: [PATCH] Make the Venafi Cloud URL field optional Signed-off-by: James Munnelly --- deploy/charts/cert-manager/crds/clusterissuers.yaml | 1 - deploy/charts/cert-manager/crds/issuers.yaml | 1 - deploy/manifests/00-crds.yaml | 2 -- pkg/apis/certmanager/v1alpha2/types_issuer.go | 3 ++- pkg/apis/certmanager/v1alpha3/types_issuer.go | 3 ++- pkg/internal/apis/certmanager/types_issuer.go | 3 ++- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/deploy/charts/cert-manager/crds/clusterissuers.yaml b/deploy/charts/cert-manager/crds/clusterissuers.yaml index 4fe8bb29d..2cb62affc 100644 --- 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 diff --git a/deploy/charts/cert-manager/crds/issuers.yaml b/deploy/charts/cert-manager/crds/issuers.yaml index 3944ec800..cdf9ae83f 100644 --- 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 diff --git a/deploy/manifests/00-crds.yaml b/deploy/manifests/00-crds.yaml index 00c648cb9..d14d87665 100644 --- 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 diff --git a/pkg/apis/certmanager/v1alpha2/types_issuer.go b/pkg/apis/certmanager/v1alpha2/types_issuer.go index ccb480a69..9d79359c0 100644 --- 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"` diff --git a/pkg/apis/certmanager/v1alpha3/types_issuer.go b/pkg/apis/certmanager/v1alpha3/types_issuer.go index c87f0171f..3d400dcaa 100644 --- 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"` diff --git a/pkg/internal/apis/certmanager/types_issuer.go b/pkg/internal/apis/certmanager/types_issuer.go index efc63a355..1a5f0be8a 100644 --- a/pkg/internal/apis/certmanager/types_issuer.go +++ b/pkg/internal/apis/certmanager/types_issuer.go @@ -128,7 +128,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"`