diff --git a/pkg/apis/certmanager/v1alpha1/types.go b/pkg/apis/certmanager/v1alpha1/types.go index 8c2caac8d..d674f4e80 100644 --- a/pkg/apis/certmanager/v1alpha1/types.go +++ b/pkg/apis/certmanager/v1alpha1/types.go @@ -372,10 +372,10 @@ type ACMEOrderChallenge struct { Token string `json:"token"` // Challenge key for this challenge - Key string `json:"token"` + Key string `json:"key"` // Configuration used to present this challenge - Config ACMESolverConfig `json:",inline"` + ACMESolverConfig `json:",inline"` } type LocalObjectReference struct { diff --git a/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go index 49e30d57c..ba2076d9e 100644 --- a/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/certmanager/v1alpha1/zz_generated.deepcopy.go @@ -351,7 +351,7 @@ func (in *ACMEIssuerStatus) DeepCopy() *ACMEIssuerStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ACMEOrderChallenge) DeepCopyInto(out *ACMEOrderChallenge) { *out = *in - in.Config.DeepCopyInto(&out.Config) + in.ACMESolverConfig.DeepCopyInto(&out.ACMESolverConfig) return } diff --git a/pkg/issuer/acme/dns/dns.go b/pkg/issuer/acme/dns/dns.go index 04bd59535..e077ed5a6 100644 --- a/pkg/issuer/acme/dns/dns.go +++ b/pkg/issuer/acme/dns/dns.go @@ -55,11 +55,11 @@ type Solver struct { } func (s *Solver) Present(ctx context.Context, _ *v1alpha1.Certificate, ch v1alpha1.ACMEOrderChallenge) error { - if ch.Config.DNS01 == nil { + if ch.ACMESolverConfig.DNS01 == nil { return fmt.Errorf("challenge dns config must be specified") } - providerName := ch.Config.DNS01.Provider + providerName := ch.ACMESolverConfig.DNS01.Provider if providerName == "" { return fmt.Errorf("dns01 challenge provider name must be set") } @@ -94,11 +94,11 @@ func (s *Solver) Check(ch v1alpha1.ACMEOrderChallenge) (bool, error) { } func (s *Solver) CleanUp(ctx context.Context, _ *v1alpha1.Certificate, ch v1alpha1.ACMEOrderChallenge) error { - if ch.Config.DNS01 == nil { + if ch.ACMESolverConfig.DNS01 == nil { return fmt.Errorf("challenge dns config must be specified") } - providerName := ch.Config.DNS01.Provider + providerName := ch.ACMESolverConfig.DNS01.Provider if providerName == "" { return fmt.Errorf("dns01 challenge provider name must be set") } diff --git a/pkg/issuer/acme/dns/dns_test.go b/pkg/issuer/acme/dns/dns_test.go index 7aa4c2191..eb5c07c25 100644 --- a/pkg/issuer/acme/dns/dns_test.go +++ b/pkg/issuer/acme/dns/dns_test.go @@ -176,7 +176,7 @@ func TestSolverFor(t *testing.T) { })}, ResourceNamespace: "default", Challenge: v1alpha1.ACMEOrderChallenge{ - Config: v1alpha1.ACMESolverConfig{ + ACMESolverConfig: v1alpha1.ACMESolverConfig{ DNS01: &v1alpha1.ACMECertificateDNS01Config{ Provider: "fake-cloudflare", }, @@ -206,7 +206,7 @@ func TestSolverFor(t *testing.T) { SecretLister: []*corev1.Secret{}, ResourceNamespace: "default", Challenge: v1alpha1.ACMEOrderChallenge{ - Config: v1alpha1.ACMESolverConfig{ + ACMESolverConfig: v1alpha1.ACMESolverConfig{ DNS01: &v1alpha1.ACMECertificateDNS01Config{ Provider: "fake-cloudflare", }, @@ -237,7 +237,7 @@ func TestSolverFor(t *testing.T) { })}, ResourceNamespace: "default", Challenge: v1alpha1.ACMEOrderChallenge{ - Config: v1alpha1.ACMESolverConfig{ + ACMESolverConfig: v1alpha1.ACMESolverConfig{ DNS01: &v1alpha1.ACMECertificateDNS01Config{ Provider: "fake-cloudflare", }, @@ -268,7 +268,7 @@ func TestSolverFor(t *testing.T) { })}, ResourceNamespace: "default", Challenge: v1alpha1.ACMEOrderChallenge{ - Config: v1alpha1.ACMESolverConfig{ + ACMESolverConfig: v1alpha1.ACMESolverConfig{ DNS01: &v1alpha1.ACMECertificateDNS01Config{ Provider: "fake-cloudflare-oops", }, @@ -282,7 +282,7 @@ func TestSolverFor(t *testing.T) { testFn := func(test testT) func(*testing.T) { return func(t *testing.T) { s := test.f.solver() - dnsSolver, err := s.solverForIssuerProvider(test.f.Challenge.Config.DNS01.Provider) + dnsSolver, err := s.solverForIssuerProvider(test.f.Challenge.ACMESolverConfig.DNS01.Provider) if err != nil && !test.expectErr { t.Errorf("expected solverFor to not error, but got: %s", err.Error()) return @@ -321,7 +321,7 @@ func TestRoute53TrimCreds(t *testing.T) { })}, ResourceNamespace: "default", Challenge: v1alpha1.ACMEOrderChallenge{ - Config: v1alpha1.ACMESolverConfig{ + ACMESolverConfig: v1alpha1.ACMESolverConfig{ DNS01: &v1alpha1.ACMECertificateDNS01Config{ Provider: "fake-route53", }, @@ -331,7 +331,7 @@ func TestRoute53TrimCreds(t *testing.T) { } s := f.solver() - _, err := s.solverForIssuerProvider(f.Challenge.Config.DNS01.Provider) + _, err := s.solverForIssuerProvider(f.Challenge.ACMESolverConfig.DNS01.Provider) if err != nil { t.Fatalf("expected solverFor to not error, but got: %s", err) } @@ -370,7 +370,7 @@ func TestRoute53AmbientCreds(t *testing.T) { }), DNSProviders: newFakeDNSProviders(), Challenge: v1alpha1.ACMEOrderChallenge{ - Config: v1alpha1.ACMESolverConfig{ + ACMESolverConfig: v1alpha1.ACMESolverConfig{ DNS01: &v1alpha1.ACMECertificateDNS01Config{ Provider: "fake-route53", }, @@ -397,7 +397,7 @@ func TestRoute53AmbientCreds(t *testing.T) { }), DNSProviders: newFakeDNSProviders(), Challenge: v1alpha1.ACMEOrderChallenge{ - Config: v1alpha1.ACMESolverConfig{ + ACMESolverConfig: v1alpha1.ACMESolverConfig{ DNS01: &v1alpha1.ACMECertificateDNS01Config{ Provider: "fake-route53", }, @@ -417,7 +417,7 @@ func TestRoute53AmbientCreds(t *testing.T) { for _, tt := range tests { f := tt.in s := f.solver() - _, err := s.solverForIssuerProvider(f.Challenge.Config.DNS01.Provider) + _, err := s.solverForIssuerProvider(f.Challenge.ACMESolverConfig.DNS01.Provider) if !reflect.DeepEqual(tt.out.expectedErr, err) { t.Fatalf("expected error %v, got error %v", tt.out.expectedErr, err) } diff --git a/pkg/issuer/acme/http/ingress.go b/pkg/issuer/acme/http/ingress.go index b801cb566..8d71c110f 100644 --- a/pkg/issuer/acme/http/ingress.go +++ b/pkg/issuer/acme/http/ingress.go @@ -95,8 +95,8 @@ func (s *Solver) createIngress(crt *v1alpha1.Certificate, svcName string, ch v1a func buildIngressResource(crt *v1alpha1.Certificate, svcName string, ch v1alpha1.ACMEOrderChallenge) *extv1beta1.Ingress { var ingClass *string - if ch.Config.HTTP01 != nil { - ingClass = ch.Config.HTTP01.IngressClass + if ch.ACMESolverConfig.HTTP01 != nil { + ingClass = ch.ACMESolverConfig.HTTP01.IngressClass } podLabels := podLabels(ch) @@ -132,7 +132,7 @@ func buildIngressResource(crt *v1alpha1.Certificate, svcName string, ch v1alpha1 } func (s *Solver) addChallengePathToIngress(crt *v1alpha1.Certificate, svcName string, ch v1alpha1.ACMEOrderChallenge) (*extv1beta1.Ingress, error) { - ingressName := ch.Config.HTTP01.Ingress + ingressName := ch.ACMESolverConfig.HTTP01.Ingress ing, err := s.ingressLister.Ingresses(crt.Namespace).Get(ingressName) if err != nil { @@ -180,7 +180,7 @@ func (s *Solver) addChallengePathToIngress(crt *v1alpha1.Certificate, svcName st // ingress, or delete the ingress if an existing ingress name is not specified // on the certificate. func (s *Solver) cleanupIngresses(crt *v1alpha1.Certificate, ch v1alpha1.ACMEOrderChallenge) error { - httpDomainCfg := ch.Config.HTTP01 + httpDomainCfg := ch.ACMESolverConfig.HTTP01 if httpDomainCfg == nil { httpDomainCfg = &v1alpha1.ACMECertificateHTTP01Config{} } diff --git a/pkg/issuer/acme/prepare.go b/pkg/issuer/acme/prepare.go index f9d7a260d..bfaa62d20 100644 --- a/pkg/issuer/acme/prepare.go +++ b/pkg/issuer/acme/prepare.go @@ -313,13 +313,13 @@ func buildInternalChallengeType(cl client.Interface, ch *acme.Challenge, cfg v1a } return v1alpha1.ACMEOrderChallenge{ - URL: ch.URL, - AuthzURL: authzURL, - Type: ch.Type, - Domain: domain, - Token: ch.Token, - Key: key, - Config: cfg, + URL: ch.URL, + AuthzURL: authzURL, + Type: ch.Type, + Domain: domain, + Token: ch.Token, + Key: key, + ACMESolverConfig: cfg, }, nil }