remove unused registry test helpers

Author: anoipm

components/operator/controllers/serverless_controller_test.go

@@ -26,20 +26,10 @@ var _ = Describe("Serverless controller", func() {
 		var (
 			serverlessDataDefault = serverlessData{
 				TraceCollectorURL: ptr.To[string](v1alpha1.EndpointDisabled),
-				EnableInternal:    ptr.To[bool](v1alpha1.DefaultEnableInternal),
-				registrySecretData: registrySecretData{
-					ServerAddress:   ptr.To[string](v1alpha1.DefaultServerAddress),
-					RegistryAddress: ptr.To[string](v1alpha1.DefaultRegistryAddress),
-				},
 			}
 			serverlessDataWithChangedDependencies = serverlessData{
 				EventPublisherProxyURL: ptr.To[string]("test-eventing-address"),
 				TraceCollectorURL:      ptr.To[string]("test-tracing-address"),
-				EnableInternal:         ptr.To[bool](v1alpha1.DefaultEnableInternal),
-				registrySecretData: registrySecretData{
-					ServerAddress:   ptr.To[string](v1alpha1.DefaultServerAddress),
-					RegistryAddress: ptr.To[string](v1alpha1.DefaultRegistryAddress),
-				},
 			}
 		)
 

components/operator/controllers/testhelper_test.go

@@ -14,7 +14,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 )
@@ -185,24 +184,6 @@ func (h *testHelper) createNamespace() {
 	By(fmt.Sprintf("Namespace created: %s", h.namespaceName))
 }
 
-func (h *testHelper) createSecret(name string, data map[string]string) {
-	By(fmt.Sprintf("Creating secret: %s/%s", h.namespaceName, name))
-	secret := corev1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      name,
-			Namespace: h.namespaceName,
-		},
-		StringData: data,
-	}
-	Expect(k8sClient.Create(h.ctx, &secret)).To(Succeed())
-	By(fmt.Sprintf("Secret created: %s/%s", h.namespaceName, name))
-}
-
-func (h *testHelper) createRegistrySecret(name string, data registrySecretData) {
-	secretData := data.toMap()
-	h.createSecret(name, secretData)
-}
-
 func (h *testHelper) createGetKubernetesObjectFunc(objectName string, obj client.Object) func() (bool, error) {
 	return func() (bool, error) {
 		return h.getKubernetesObjectFunc(objectName, obj)
@@ -264,22 +245,6 @@ func (h *testHelper) getServerlessStatus(serverlessName string) (v1alpha1.Server
 type serverlessData struct {
 	EventPublisherProxyURL *string
 	TraceCollectorURL      *string
-	EnableInternal         *bool
-	registrySecretData
-}
-
-func (d *serverlessData) toServerlessSpec(secretName string) v1alpha1.ServerlessSpec {
-	result := v1alpha1.ServerlessSpec{
-		Eventing: getEndpoint(d.EventPublisherProxyURL),
-		Tracing:  getEndpoint(d.TraceCollectorURL),
-		DockerRegistry: &v1alpha1.DockerRegistry{
-			EnableInternal: d.EnableInternal,
-		},
-	}
-	if secretName != "" {
-		result.DockerRegistry.SecretName = ptr.To[string](secretName)
-	}
-	return result
 }
 
 func getEndpoint(url *string) *v1alpha1.Endpoint {
@@ -289,30 +254,6 @@ func getEndpoint(url *string) *v1alpha1.Endpoint {
 	return nil
 }
 
-type registrySecretData struct {
-	Username        *string
-	Password        *string
-	ServerAddress   *string
-	RegistryAddress *string
-}
-
-func (d *registrySecretData) toMap() map[string]string {
-	result := map[string]string{}
-	if d.Username != nil {
-		result["username"] = *d.Username
-	}
-	if d.Password != nil {
-		result["password"] = *d.Password
-	}
-	if d.ServerAddress != nil {
-		result["serverAddress"] = *d.ServerAddress
-	}
-	if d.RegistryAddress != nil {
-		result["registryAddress"] = *d.RegistryAddress
-	}
-	return result
-}
-
 func (h *testHelper) createCheckOptionalDependenciesFunc(_ string, expected serverlessData) func() (bool, error) {
 	return func() (bool, error) {
 		var cm corev1.ConfigMap