In default buildless mode do not use default registry (#2113)

Author: MichalKalke

components/operator/internal/state/registry.go

@@ -131,12 +131,14 @@ func setExternalRegistryConfig(ctx context.Context, r *reconciler, s *systemStat
 }
 
 func setK3dRegistryConfig(s *systemState) {
-	s.instance.Status.DockerRegistry = v1alpha1.DefaultServerAddress
+	if isLegacyEnabled(s.instance.Annotations) {
+		s.instance.Status.DockerRegistry = v1alpha1.DefaultServerAddress
+	}
 	s.flagsBuilder.WithRegistryEnableInternal(
 		getEnableInternal(s.instance.Spec.DockerRegistry),
 	).WithRegistryAddresses(
 		v1alpha1.DefaultRegistryAddress,
-		s.instance.Status.DockerRegistry,
+		v1alpha1.DefaultServerAddress,
 	)
 }
 

components/operator/internal/state/registry_test.go

@@ -167,6 +167,9 @@ func Test_sFnRegistryConfiguration(t *testing.T) {
 			instance: v1alpha1.Serverless{
 				ObjectMeta: metav1.ObjectMeta{
 					Namespace: "some-namespace",
+					Annotations: map[string]string{
+						buildlessModeAnnotation: buildlessModeDisabled,
+					},
 				},
 				Spec: v1alpha1.ServerlessSpec{
 					DockerRegistry: &v1alpha1.DockerRegistry{