From de0f39e5539dd7d191c7cd7df5a60beccd76b982 Mon Sep 17 00:00:00 2001 From: Joakim Ahrlin Date: Mon, 8 Aug 2022 12:52:52 +0200 Subject: [PATCH 1/2] add random suffix to webhooks in CA Injector e2e tests Signed-off-by: Joakim Ahrlin --- test/e2e/suite/serving/cainjector.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/e2e/suite/serving/cainjector.go b/test/e2e/suite/serving/cainjector.go index 9a14b340e..a9d3b4cd8 100644 --- a/test/e2e/suite/serving/cainjector.go +++ b/test/e2e/suite/serving/cainjector.go @@ -18,19 +18,21 @@ package certificate import ( "context" + "fmt" "time" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - admissionreg "k8s.io/api/admissionregistration/v1" corev1 "k8s.io/api/core/v1" apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/rand" "k8s.io/client-go/util/retry" apireg "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" + "sigs.k8s.io/controller-runtime/pkg/client" certmanager "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" v1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" @@ -38,7 +40,6 @@ import ( "github.com/cert-manager/cert-manager/test/e2e/framework" "github.com/cert-manager/cert-manager/test/e2e/util" "github.com/cert-manager/cert-manager/test/unit/gen" - "sigs.k8s.io/controller-runtime/pkg/client" ) type injectableTest struct { @@ -324,9 +325,10 @@ var _ = framework.CertManagerDescribe("CA Injector", func() { injectorContext("validating webhook", &injectableTest{ makeInjectable: func(namePrefix string) client.Object { someURL := "https://localhost:8675" + name := fmt.Sprintf("%s-hook-%s", namePrefix, rand.String(5)) return &admissionreg.ValidatingWebhookConfiguration{ ObjectMeta: metav1.ObjectMeta{ - Name: namePrefix + "-hook", + Name: name, Annotations: map[string]string{ certmanager.WantInjectAnnotation: types.NamespacedName{Name: "serving-certs", Namespace: f.Namespace.Name}.String(), }, @@ -367,9 +369,10 @@ var _ = framework.CertManagerDescribe("CA Injector", func() { injectorContext("mutating webhook", &injectableTest{ makeInjectable: func(namePrefix string) client.Object { someURL := "https://localhost:8675" + name := fmt.Sprintf("%s-hook-%s", namePrefix, rand.String(5)) return &admissionreg.MutatingWebhookConfiguration{ ObjectMeta: metav1.ObjectMeta{ - Name: namePrefix + "-hook", + Name: name, Annotations: map[string]string{ certmanager.WantInjectAnnotation: types.NamespacedName{Name: "serving-certs", Namespace: f.Namespace.Name}.String(), }, From 1501449e3e22820254f8384bd79e0a3a05b001cc Mon Sep 17 00:00:00 2001 From: Joakim Ahrlin Date: Tue, 9 Aug 2022 12:41:31 +0200 Subject: [PATCH 2/2] use GenerateName instead Signed-off-by: Joakim Ahrlin --- test/e2e/suite/serving/cainjector.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/e2e/suite/serving/cainjector.go b/test/e2e/suite/serving/cainjector.go index a9d3b4cd8..460c60dd3 100644 --- a/test/e2e/suite/serving/cainjector.go +++ b/test/e2e/suite/serving/cainjector.go @@ -29,7 +29,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/rand" "k8s.io/client-go/util/retry" apireg "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" "sigs.k8s.io/controller-runtime/pkg/client" @@ -325,10 +324,9 @@ var _ = framework.CertManagerDescribe("CA Injector", func() { injectorContext("validating webhook", &injectableTest{ makeInjectable: func(namePrefix string) client.Object { someURL := "https://localhost:8675" - name := fmt.Sprintf("%s-hook-%s", namePrefix, rand.String(5)) return &admissionreg.ValidatingWebhookConfiguration{ ObjectMeta: metav1.ObjectMeta{ - Name: name, + GenerateName: fmt.Sprintf("%s-hook", namePrefix), Annotations: map[string]string{ certmanager.WantInjectAnnotation: types.NamespacedName{Name: "serving-certs", Namespace: f.Namespace.Name}.String(), }, @@ -369,10 +367,9 @@ var _ = framework.CertManagerDescribe("CA Injector", func() { injectorContext("mutating webhook", &injectableTest{ makeInjectable: func(namePrefix string) client.Object { someURL := "https://localhost:8675" - name := fmt.Sprintf("%s-hook-%s", namePrefix, rand.String(5)) return &admissionreg.MutatingWebhookConfiguration{ ObjectMeta: metav1.ObjectMeta{ - Name: name, + GenerateName: fmt.Sprintf("%s-hook", namePrefix), Annotations: map[string]string{ certmanager.WantInjectAnnotation: types.NamespacedName{Name: "serving-certs", Namespace: f.Namespace.Name}.String(), },