From cfc11f324b470ebae7b3b0c8bafcaa5402e080b3 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Thu, 22 Mar 2018 22:26:15 +0000 Subject: [PATCH] Fix bugs in http challenge solver --- pkg/issuer/acme/http/ingress.go | 8 ++++---- pkg/issuer/acme/http/pod.go | 2 +- pkg/issuer/acme/http/service.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/issuer/acme/http/ingress.go b/pkg/issuer/acme/http/ingress.go index 3fc9fc3d8..9b6db4328 100644 --- a/pkg/issuer/acme/http/ingress.go +++ b/pkg/issuer/acme/http/ingress.go @@ -73,10 +73,10 @@ func (s *Solver) ensureIngress(crt *v1alpha1.Certificate, svcName, domain, token if err != nil { return nil, err } - if len(existingIngresses) > 0 { - errMsg := fmt.Sprintf("multiple challenge solver pods found for certificate '%s/%s'. Cleaning up existing pods.", crt.Namespace, crt.Name) + if len(existingIngresses) > 1 { + errMsg := fmt.Sprintf("multiple challenge solver ingresses found for certificate '%s/%s'. Cleaning up existing pods.", crt.Namespace, crt.Name) glog.Infof(errMsg) - err := s.cleanupPods(crt, domain) + err := s.cleanupIngresses(crt, domain, token) if err != nil { return nil, err } @@ -85,7 +85,7 @@ func (s *Solver) ensureIngress(crt *v1alpha1.Certificate, svcName, domain, token if len(existingIngresses) == 1 { return existingIngresses[0], nil } - glog.Infof("No existing HTTP01 challenge solver pod found for Certificate %q. One will be created.") + glog.Infof("No existing HTTP01 challenge solver ingress found for Certificate %q. One will be created.") return s.createIngress(crt, svcName, domain, token, *httpDomainCfg) } diff --git a/pkg/issuer/acme/http/pod.go b/pkg/issuer/acme/http/pod.go index 9533a657c..167f4b3fb 100644 --- a/pkg/issuer/acme/http/pod.go +++ b/pkg/issuer/acme/http/pod.go @@ -27,7 +27,7 @@ func (s *Solver) ensurePod(crt *v1alpha1.Certificate, domain, token, key string) return nil, err } var pod *corev1.Pod - if len(existingPods) > 0 { + if len(existingPods) > 1 { errMsg := fmt.Sprintf("multiple challenge solver pods found for certificate '%s/%s'. Cleaning up existing pods.", crt.Namespace, crt.Name) glog.Infof(errMsg) err := s.cleanupPods(crt, domain) diff --git a/pkg/issuer/acme/http/service.go b/pkg/issuer/acme/http/service.go index 6468cae65..66e179d64 100644 --- a/pkg/issuer/acme/http/service.go +++ b/pkg/issuer/acme/http/service.go @@ -20,7 +20,7 @@ func (s *Solver) ensureService(crt *v1alpha1.Certificate, domain, token, key str return nil, err } var service *corev1.Service - if len(existingServices) > 0 { + if len(existingServices) > 1 { errMsg := fmt.Sprintf("multiple challenge solver services found for certificate '%s/%s'. Cleaning up existing services.", crt.Namespace, crt.Name) glog.Infof(errMsg) err := s.cleanupServices(crt, domain)