From 6ae8fbbbb2a7d45f2e70a4f17d0d9c2c824db75a Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Fri, 13 Oct 2017 11:23:20 +0100 Subject: [PATCH] Standardise SecretKeySelector field naming --- pkg/apis/certmanager/v1alpha1/types.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/apis/certmanager/v1alpha1/types.go b/pkg/apis/certmanager/v1alpha1/types.go index b901da2df..35bbfe515 100644 --- a/pkg/apis/certmanager/v1alpha1/types.go +++ b/pkg/apis/certmanager/v1alpha1/types.go @@ -79,7 +79,9 @@ type IssuerConfig struct { } type CAIssuer struct { - SecretRef LocalObjectReference `json:"secretRef"` + // SecretName is the name of the secret used to sign Certificates issued + // by this Issuer. + SecretName string `json:"secretName"` } // ACMEIssuer contains the specification for an ACME issuer @@ -90,7 +92,7 @@ type ACMEIssuer struct { Server string `json:"server"` // PrivateKey is the name of a secret containing the private key for this // user account. - PrivateKey string `json:"privateKey"` + PrivateKey SecretKeySelector `json:"privateKeySecretRef"` // DNS-01 config DNS01 *ACMEIssuerDNS01Config `json:"dns-01"` } @@ -113,7 +115,7 @@ type ACMEIssuerDNS01Provider struct { // ACMEIssuerDNS01ProviderCloudDNS is a structure containing the DNS // configuration for Google Cloud DNS type ACMEIssuerDNS01ProviderCloudDNS struct { - ServiceAccount SecretKeySelector `json:"serviceAccount"` + ServiceAccount SecretKeySelector `json:"serviceAccountSecretRef"` Project string `json:"project"` } @@ -121,14 +123,14 @@ type ACMEIssuerDNS01ProviderCloudDNS struct { // configuration for Cloudflare type ACMEIssuerDNS01ProviderCloudflare struct { Email string `json:"email"` - APIKey SecretKeySelector `json:"apiKey"` + APIKey SecretKeySelector `json:"apiKeySecretRef"` } // ACMEIssuerDNS01ProviderRoute53 is a structure containing the Route 53 // configuration for AWS type ACMEIssuerDNS01ProviderRoute53 struct { AccessKeyID string `json:"accessKeyID"` - SecretAccessKey SecretKeySelector `json:"secretAccessKey"` + SecretAccessKey SecretKeySelector `json:"secretAccessKeySecretRef"` HostedZoneID string `json:"hostedZoneID"` Region string `json:"region"` }