Skip to content

Commit

Permalink
- improve service labelSelector
Browse files Browse the repository at this point in the history
- fix opening terminal for service
- use force tiller upgrade
  • Loading branch information
Lukas Gentele committed Nov 5, 2018
1 parent d309a4b commit ea31c74
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkg/devspace/configure/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ func AddPackage(skipQuestion bool, appVersion, chartVersion, deployment string,
err = configutil.AddService(&v1.ServiceConfig{
Name: configutil.String(packageName),
LabelSelector: &map[string]*string{
"chart": configutil.String(packageName),
"app": configutil.String(packageName),
},
})
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions pkg/devspace/helm/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ func (helmClientWrapper *ClientWrapper) InstallChartByPath(releaseName, releaseN
k8shelm.UpdateValueOverrides(overwriteValues),
k8shelm.ReuseValues(false),
k8shelm.UpgradeWait(true),
k8shelm.UpgradeForce(true),
)

if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/devspace/services/terminal.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func StartTerminal(client *kubernetes.Clientset, serviceNameOverride, containerN
// Select pods
namespace := ""
if namespaceOverride == "" {
if service != nil {
if service != nil && service.Namespace != nil {
namespace = *service.Namespace
} else {
if config.DevSpace.Terminal != nil && config.DevSpace.Terminal.Namespace != nil {
Expand Down Expand Up @@ -104,7 +104,7 @@ func StartTerminal(client *kubernetes.Clientset, serviceNameOverride, containerN
// Get container name
containerName := pod.Spec.Containers[0].Name
if containerNameOverride == "" {
if service != nil {
if service != nil && service.ContainerName != nil {
containerName = *service.ContainerName
} else {
if config.DevSpace.Terminal.ContainerName != nil {
Expand Down

0 comments on commit ea31c74

Please sign in to comment.