diff --git a/internal/apis/certmanager/types_certificate.go b/internal/apis/certmanager/types_certificate.go index 2cbbb04e5..8276739fd 100644 --- a/internal/apis/certmanager/types_certificate.go +++ b/internal/apis/certmanager/types_certificate.go @@ -123,18 +123,10 @@ type CertificateSpec struct { // denoted issuer. SecretName string - // SecretTemplate defines annotations and labels to be propagated to the - // Kubernetes Secret when it is created or updated. Once created, labels and - // annotations are not yet removed from the Secret when they are removed from - // the template unless the - // 'ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO' - // feature gate is enabled. - // See: - // - https://github.com/jetstack/cert-manager/issues/4292 - // - https://github.com/jetstack/cert-manager/pull/4638 - // - TODO: website link - // +optional - SecretTemplate *CertificateSecretTemplate `json:"secretTemplate,omitempty"` + // SecretTemplate defines annotations and labels to be copied to the + // Certificate's Secret. Labels and annotations on the Secret will be changed + // as they appear on the SecretTemplate. + SecretTemplate *CertificateSecretTemplate // Keystores configures additional keystore output formats stored in the // `secretName` Secret resource. diff --git a/internal/apis/certmanager/v1alpha2/types_certificate.go b/internal/apis/certmanager/v1alpha2/types_certificate.go index 71e32b4e5..32afca574 100644 --- a/internal/apis/certmanager/v1alpha2/types_certificate.go +++ b/internal/apis/certmanager/v1alpha2/types_certificate.go @@ -135,16 +135,9 @@ type CertificateSpec struct { // denoted issuer. SecretName string `json:"secretName"` - // SecretTemplate defines annotations and labels to be propagated to the - // Kubernetes Secret when it is created or updated. Once created, labels and - // annotations are not yet removed from the Secret when they are removed from - // the template unless the - // 'ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO' - // feature gate is enabled. - // See: - // - https://github.com/jetstack/cert-manager/issues/4292 - // - https://github.com/jetstack/cert-manager/pull/4638 - // - TODO: website link + // SecretTemplate defines annotations and labels to be copied to the + // Certificate's Secret. Labels and annotations on the Secret will be changed + // as they appear on the SecretTemplate. // +optional SecretTemplate *CertificateSecretTemplate `json:"secretTemplate,omitempty"` diff --git a/internal/apis/certmanager/v1alpha3/types_certificate.go b/internal/apis/certmanager/v1alpha3/types_certificate.go index 84624db54..7afbf14ff 100644 --- a/internal/apis/certmanager/v1alpha3/types_certificate.go +++ b/internal/apis/certmanager/v1alpha3/types_certificate.go @@ -133,16 +133,9 @@ type CertificateSpec struct { // denoted issuer. SecretName string `json:"secretName"` - // SecretTemplate defines annotations and labels to be propagated to the - // Kubernetes Secret when it is created or updated. Once created, labels and - // annotations are not yet removed from the Secret when they are removed from - // the template unless the - // 'ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO' - // feature gate is enabled. - // See: - // - https://github.com/jetstack/cert-manager/issues/4292 - // - https://github.com/jetstack/cert-manager/pull/4638 - // - TODO: website link + // SecretTemplate defines annotations and labels to be copied to the + // Certificate's Secret. Labels and annotations on the Secret will be changed + // as they appear on the SecretTemplate. // +optional SecretTemplate *CertificateSecretTemplate `json:"secretTemplate,omitempty"` diff --git a/internal/apis/certmanager/v1beta1/types_certificate.go b/internal/apis/certmanager/v1beta1/types_certificate.go index 4bf4e517c..ef18b4b5f 100644 --- a/internal/apis/certmanager/v1beta1/types_certificate.go +++ b/internal/apis/certmanager/v1beta1/types_certificate.go @@ -134,16 +134,9 @@ type CertificateSpec struct { // denoted issuer. SecretName string `json:"secretName"` - // SecretTemplate defines annotations and labels to be propagated to the - // Kubernetes Secret when it is created or updated. Once created, labels and - // annotations are not yet removed from the Secret when they are removed from - // the template unless the - // 'ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO' - // feature gate is enabled. - // See: - // - https://github.com/jetstack/cert-manager/issues/4292 - // - https://github.com/jetstack/cert-manager/pull/4638 - // - TODO: website link + // SecretTemplate defines annotations and labels to be copied to the + // Certificate's Secret. Labels and annotations on the Secret will be changed + // as they appear on the SecretTemplate. // +optional SecretTemplate *CertificateSecretTemplate `json:"secretTemplate,omitempty"` diff --git a/pkg/apis/certmanager/v1/types_certificate.go b/pkg/apis/certmanager/v1/types_certificate.go index 58627221f..582843ea2 100644 --- a/pkg/apis/certmanager/v1/types_certificate.go +++ b/pkg/apis/certmanager/v1/types_certificate.go @@ -138,16 +138,9 @@ type CertificateSpec struct { // denoted issuer. SecretName string `json:"secretName"` - // SecretTemplate defines annotations and labels to be propagated to the - // Kubernetes Secret when it is created or updated. Once created, labels and - // annotations are not yet removed from the Secret when they are removed from - // the template unless the - // 'ExperimentalSecretApplySecretTemplateControllerMinKubernetesVTODO' - // feature gate is enabled. - // See: - // - https://github.com/jetstack/cert-manager/issues/4292 - // - https://github.com/jetstack/cert-manager/pull/4638 - // - TODO: website link + // SecretTemplate defines annotations and labels to be copied to the + // Certificate's Secret. Labels and annotations on the Secret will be changed + // as they appear on the SecretTemplate. // +optional SecretTemplate *CertificateSecretTemplate `json:"secretTemplate,omitempty"`