Cleanup dockerRegistry status when buildless enabled (#2116)

Author: MichalKalke

components/operator/controllers/serverless_controller_test.go

@@ -138,11 +138,6 @@ func shouldCreateServerless(h testHelper, serverlessName, serverlessDeploymentNa
 }
 
 func shouldPropagateSpecProperties(h testHelper, expected serverlessData) {
-	Eventually(h.createCheckRegistrySecretFunc(serverlessRegistrySecret, expected.registrySecretData)).
-		WithPolling(time.Second * 2).
-		WithTimeout(time.Second * 10).
-		Should(BeTrue())
-
 	Eventually(h.createCheckOptionalDependenciesFunc(serverlessDeploymentName, expected)).
 		WithPolling(time.Second * 2).
 		WithTimeout(time.Second * 10).

components/operator/controllers/testhelper_test.go

@@ -306,25 +306,6 @@ func (d *registrySecretData) toMap() map[string]string {
 	return result
 }
 
-func (h *testHelper) createCheckRegistrySecretFunc(serverlessRegistrySecret string, expected registrySecretData) func() (bool, error) {
-	return func() (bool, error) {
-		var configurationSecret corev1.Secret
-
-		if ok, err := h.getKubernetesObjectFunc(
-			serverlessRegistrySecret, &configurationSecret); !ok || err != nil {
-			return ok, err
-		}
-		if err := secretContainsSameValues(
-			expected.toMap(), configurationSecret); err != nil {
-			return false, err
-		}
-		if err := secretContainsRequired(configurationSecret); err != nil {
-			return false, err
-		}
-		return true, nil
-	}
-}
-
 func (h *testHelper) createCheckOptionalDependenciesFunc(deploymentName string, expected serverlessData) func() (bool, error) {
 	return func() (bool, error) {
 		var deploy appsv1.Deployment
@@ -369,26 +350,3 @@ func deploymentContainsEnv(deployment appsv1.Deployment, name, value string) err
 
 	return fmt.Errorf("env %s does not exist", name)
 }
-
-func secretContainsRequired(configurationSecret corev1.Secret) error {
-	for _, k := range []string{"username", "password", "registryAddress", "serverAddress"} {
-		_, ok := configurationSecret.Data[k]
-		if !ok {
-			return fmt.Errorf("values not propagated (%s is required)", k)
-		}
-	}
-	return nil
-}
-
-func secretContainsSameValues(expected map[string]string, configurationSecret corev1.Secret) error {
-	for k, expectedV := range expected {
-		v, okV := configurationSecret.Data[k]
-		if okV == false {
-			return fmt.Errorf("values not propagated (%s: nil != %s )", k, expectedV)
-		}
-		if expectedV != string(v) {
-			return fmt.Errorf("values not propagated (%s: %s != %s )", k, string(v), expectedV)
-		}
-	}
-	return nil
-}

components/operator/internal/state/registry.go

@@ -37,6 +37,13 @@ func sFnRegistryConfiguration(ctx context.Context, r *reconciler, s *systemState
 
 func configureRegistry(ctx context.Context, r *reconciler, s *systemState) error {
 
+	//TODO: This is a temporary solution, delete it when legacy serverless is removed
+	if !isLegacyEnabled(s.instance.Annotations) {
+		setK3dRegistryConfig(s)
+		s.instance.Status.DockerRegistry = ""
+		return nil
+	}
+
 	switch {
 	case isRegistrySecretName(s.instance.Spec.DockerRegistry):
 		// case: use secret from secretName field
@@ -131,9 +138,8 @@ func setExternalRegistryConfig(ctx context.Context, r *reconciler, s *systemStat
 }
 
 func setK3dRegistryConfig(s *systemState) {
-	if isLegacyEnabled(s.instance.Annotations) {
-		s.instance.Status.DockerRegistry = v1alpha1.DefaultServerAddress
-	}
+	s.instance.Status.DockerRegistry = v1alpha1.DefaultServerAddress
+
 	s.flagsBuilder.WithRegistryEnableInternal(
 		getEnableInternal(s.instance.Spec.DockerRegistry),
 	).WithRegistryAddresses(