Merge pull request #329 from covexo/fix-authenticating-against-wrong-registry-if-internal-exists

Fixed authenticating against wrong url

Author: FabianKramm

pkg/devspace/registry/create.go

@@ -8,7 +8,6 @@ import (
 
 	"k8s.io/client-go/kubernetes"
 
-	"github.com/covexo/devspace/pkg/devspace/config/configutil"
 	"github.com/covexo/devspace/pkg/devspace/config/v1"
 	"github.com/covexo/devspace/pkg/devspace/helm"
 	"github.com/foomo/htpasswd"
@@ -50,16 +49,6 @@ func createRegistry(kubectl *kubernetes.Clientset, helm *helm.ClientWrapper, int
 		}
 	}
 
-	// Get the registry url
-	serviceHostname, err := getRegistryURL(kubectl, registryReleaseNamespace, InternalRegistryName+"-docker-registry")
-	if err != nil {
-		return err
-	}
-
-	// Update config values
-	registryConfig.URL = configutil.String(serviceHostname)
-	registryConfig.Insecure = configutil.Bool(true)
-
 	return nil
 }
 

pkg/devspace/registry/registry.go

@@ -97,6 +97,16 @@ func InitInternalRegistry(kubectl *kubernetes.Clientset, helm *helm.ClientWrappe
 		}
 	}
 
+	// Get the registry url
+	serviceHostname, err := getRegistryURL(kubectl, registryReleaseNamespace, InternalRegistryName+"-docker-registry")
+	if err != nil {
+		return err
+	}
+
+	// Update config values
+	registryConfig.URL = configutil.String(serviceHostname)
+	registryConfig.Insecure = configutil.Bool(true)
+
 	// Wait for registry if it is not ready yet
 	if registryDeployment == nil || registryDeployment.Status.Replicas == 0 || registryDeployment.Status.ReadyReplicas != registryDeployment.Status.Replicas {
 		// Wait till registry is started