Merge pull request #1855 from ecordell/service-duplicate-ownerrefs

Bug 1819457: Services should not have duplicate ownerrefs

Author: openshift-merge-robot

pkg/controller/certs/certs.go

@@ -15,6 +15,18 @@ import (
 	"time"
 )
 
+type CertGenerator interface {
+  Generate(notAfter time.Time, organization string, ca *KeyPair, hosts []string) (*KeyPair, error)
+}
+
+type CertGeneratorFunc func(notAfter time.Time, organization string, ca *KeyPair, hosts []string) (*KeyPair, error)
+
+func (f CertGeneratorFunc) Generate(notAfter time.Time, organization string, ca *KeyPair, hosts []string) (*KeyPair, error)  {
+	return f(notAfter, organization, ca, hosts)
+}
+
+var _ CertGenerator = CertGeneratorFunc(CreateSignedServingPair)
+
 // KeyPair stores an x509 certificate and its ECDSA private key
 type KeyPair struct {
 	Cert *x509.Certificate

pkg/controller/install/certresources.go

@@ -22,6 +22,10 @@ var _ certResource = &apiServiceDescriptionsWithCAPEM{}
 
 var _ certResource = &webhookDescriptionWithCAPEM{}
 
+// TODO: to keep refactoring minimal for backports, this is factored out here so that it can be replaced
+// during tests. but it should be properly injected instead.
+var certGenerator certs.CertGenerator = certs.CertGeneratorFunc(certs.CreateSignedServingPair)
+
 const (
 	// DefaultCertMinFresh is the default min-fresh value - 1 day
 	DefaultCertMinFresh = time.Hour * 24
@@ -256,7 +260,7 @@ func (i *StrategyDeploymentInstaller) installCertRequirementsForDeployment(deplo
 		fmt.Sprintf("%s.%s", service.GetName(), i.owner.GetNamespace()),
 		fmt.Sprintf("%s.%s.svc", service.GetName(), i.owner.GetNamespace()),
 	}
-	servingPair, err := certs.CreateSignedServingPair(rotateAt, Organization, ca, hosts)
+	servingPair, err := certGenerator.Generate(rotateAt, Organization, ca, hosts)
 	if err != nil {
 		logger.Warnf("could not generate signed certs for hosts %v", hosts)
 		return nil, nil, err
@@ -562,6 +566,7 @@ func AddDefaultCertVolumeAndVolumeMounts(depSpec *appsv1.DeploymentSpec, secretN
 	}
 	addCertVolumeAndVolumeMount(depSpec, volume, mount)
 }
+
 func addCertVolumeAndVolumeMount(depSpec *appsv1.DeploymentSpec, volume corev1.Volume, volumeMount corev1.VolumeMount) {
 	replaced := false
 	for i, v := range depSpec.Template.Spec.Volumes {