Skip to content

Fixed authenticating against wrong url #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FabianKramm merged 2 commits into from
Oct 29, 2018
Merged

Fixed authenticating against wrong url #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41b7fcf
Fixed authenticating against wrong url
Oct 29, 2018
257abce
TestData removed
Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions pkg/devspace/registry/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}

Expand Down
10 changes: 10 additions & 0 deletions pkg/devspace/registry/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down