fix: support for multiple kubeContexts

Author: gsquared94

pkg/skaffold/kubernetes/status/status_check.go

@@ -75,7 +75,7 @@ type Config interface {
 	GetNamespaces() []string
 	StatusCheckDeadlineSeconds() int
 	Muted() config.Muted
-	StatusCheck() (*bool, error)
+	StatusCheck() *bool
 }
 
 // Monitor runs status checks for pods and deployments

pkg/skaffold/runner/deployer.go

@@ -46,6 +46,15 @@ func (d *deployerCtx) GetKubeContext() string {
 	return d.RunContext.GetKubeContext()
 }
 
+func (d *deployerCtx) StatusCheck() *bool {
+	// runcontext StatusCheck method returns the value set by the cli flag `--status-check`
+	// which overrides the value set in the individual configs.
+	if cliValue := d.RunContext.StatusCheck(); cliValue != nil {
+		return cliValue
+	}
+	return d.deploy.StatusCheck
+}
+
 // GetDeployer creates a deployer from a given RunContext and deploy pipeline definitions.
 func GetDeployer(runCtx *runcontext.RunContext, provider deploy.ComponentProvider, labels map[string]string) (deploy.Deployer, kubernetes.ImageListMux, error) {
 	var podSelectors kubernetes.ImageListMux

pkg/skaffold/runner/runcontext/context.go

@@ -112,28 +112,6 @@ func (ps Pipelines) TestCases() []*latestV1.TestCase {
 	return tests
 }
 
-func (ps Pipelines) StatusCheck() (*bool, error) {
-	var enabled, disabled bool
-	for _, p := range ps.pipelines {
-		if p.Deploy.StatusCheck != nil {
-			if *p.Deploy.StatusCheck {
-				enabled = true
-			} else {
-				disabled = true
-			}
-			if enabled && disabled {
-				return nil, fmt.Errorf("cannot explicitly enable StatusCheck in one pipeline and explicitly disable it in another pipeline, see https://skaffold.dev/docs/workflows/ci-cd/#waiting-for-skaffold-deployments-using-healthcheck")
-			}
-		}
-	}
-	// set the group status check to disabled if any pipeline has StatusCheck
-	// set to false.
-	if disabled {
-		return util.BoolPtr(false), nil
-	}
-	return util.BoolPtr(true), nil
-}
-
 func (ps Pipelines) StatusCheckDeadlineSeconds() int {
 	c := 0
 	// set the group status check deadline to maximum of any individually specified value
@@ -170,22 +148,6 @@ func (rc *RunContext) Deployers() []latestV1.DeployConfig { return rc.Pipelines.
 
 func (rc *RunContext) TestCases() []*latestV1.TestCase { return rc.Pipelines.TestCases() }
 
-func (rc *RunContext) StatusCheck() (*bool, error) {
-	scOpts := rc.Opts.StatusCheck.Value()
-	scConfig, err := rc.Pipelines.StatusCheck()
-	if err != nil {
-		return nil, err
-	}
-	switch {
-	case scOpts != nil:
-		return util.BoolPtr(*scOpts), nil
-	case scConfig != nil:
-		return util.BoolPtr(*scConfig), nil
-	default:
-		return util.BoolPtr(true), nil
-	}
-}
-
 func (rc *RunContext) StatusCheckDeadlineSeconds() int {
 	return rc.Pipelines.StatusCheckDeadlineSeconds()
 }
@@ -226,6 +188,7 @@ func (rc *RunContext) RenderOnly() bool                              { return rc
 func (rc *RunContext) RenderOutput() string                          { return rc.Opts.RenderOutput }
 func (rc *RunContext) SkipRender() bool                              { return rc.Opts.SkipRender }
 func (rc *RunContext) SkipTests() bool                               { return rc.Opts.SkipTests }
+func (rc *RunContext) StatusCheck() *bool                            { return rc.Opts.StatusCheck.Value() }
 func (rc *RunContext) Tail() bool                                    { return rc.Opts.Tail }
 func (rc *RunContext) Trigger() string                               { return rc.Opts.Trigger }
 func (rc *RunContext) WaitForDeletions() config.WaitForDeletions     { return rc.Opts.WaitForDeletions }

pkg/skaffold/runner/runcontext/context_test.go

@@ -19,8 +19,6 @@ package runcontext
 import (
 	"testing"
 
-	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
@@ -91,60 +89,3 @@ func TestRunContext_UpdateNamespaces(t *testing.T) {
 		})
 	}
 }
-
-func TestPipelines_StatusCheck(t *testing.T) {
-	tests := []struct {
-		description   string
-		statusCheckP1 *bool
-		statusCheckP2 *bool
-		wantEnabled   *bool
-		wantErr       bool
-	}{
-		{
-			description: "both pipelines' statusCheck values are unspecified",
-			wantEnabled: util.BoolPtr(true),
-		},
-		{
-			description:   "one pipeline's statusCheck value is true",
-			statusCheckP1: util.BoolPtr(true),
-			wantEnabled:   util.BoolPtr(true),
-		},
-		{
-			description:   "one pipeline's statusCheck value is false",
-			statusCheckP1: util.BoolPtr(false),
-			wantEnabled:   util.BoolPtr(false),
-		},
-		{
-			description:   "one pipeline's statusCheck value is true, one pipeline's statusCheck value is false",
-			statusCheckP1: util.BoolPtr(true),
-			statusCheckP2: util.BoolPtr(false),
-			wantErr:       true,
-		},
-	}
-	for _, test := range tests {
-		testutil.Run(t, test.description, func(t *testutil.T) {
-			p := &Pipelines{
-				pipelines: []latestV1.Pipeline{
-					{
-						Deploy: latestV1.DeployConfig{
-							StatusCheck: test.statusCheckP1,
-						},
-					},
-					{
-						Deploy: latestV1.DeployConfig{
-							StatusCheck: test.statusCheckP2,
-						},
-					},
-				},
-			}
-			gotEnabled, err := p.StatusCheck()
-			if err != nil && !test.wantErr {
-				t.Errorf("p.StatusCheck() got error %v, want no error", err)
-			}
-			if err == nil && test.wantErr {
-				t.Errorf("p.StatusCheck() got no error, want error")
-			}
-			t.CheckDeepEqual(test.wantEnabled, gotEnabled)
-		})
-	}
-}

pkg/skaffold/status/provider.go

@@ -17,8 +17,6 @@ limitations under the License.
 package status
 
 import (
-	"sync"
-
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/label"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/status"
 )
@@ -29,24 +27,24 @@ type Provider interface {
 }
 
 type fullProvider struct {
-	k8sMonitor Monitor
+	k8sMonitor map[string]Monitor // keyed on KubeContext. TODO: make KubeContext a struct type.
 	labeller   *label.DefaultLabeller
-	once       sync.Once
 }
 
 func NewMonitorProvider(l *label.DefaultLabeller) Provider {
-	return &fullProvider{labeller: l}
+	return &fullProvider{k8sMonitor: make(map[string]Monitor), labeller: l}
 }
 
 func (p *fullProvider) GetKubernetesMonitor(config status.Config) Monitor {
-	enabled, _ := config.StatusCheck()
+	enabled := config.StatusCheck()
 	if enabled != nil && !*enabled { // assume disabled only if explicitly set to false
 		return &NoopMonitor{}
 	}
-	p.once.Do(func() {
-		p.k8sMonitor = status.NewStatusMonitor(config, p.labeller)
-	})
-	return p.k8sMonitor
+	context := config.GetKubeContext()
+	if p.k8sMonitor[context] == nil {
+		p.k8sMonitor[context] = status.NewStatusMonitor(config, p.labeller)
+	}
+	return p.k8sMonitor[context]
 }
 
 func (p *fullProvider) GetNoopMonitor() Monitor {

pkg/skaffold/status/provider_test.go

@@ -59,7 +59,9 @@ type mockConfig struct {
 	statusCheck *bool
 }
 
-func (m mockConfig) StatusCheck() (*bool, error) { return m.statusCheck, nil }
+func (m mockConfig) StatusCheck() *bool { return m.statusCheck }
+
+func (m mockConfig) GetKubeContext() string { return "" }
 
 func (m mockConfig) StatusCheckDeadlineSeconds() int { return 0 }