Revert "engine/integration: remove k8s events feature flag (#1708)" (#…

…1745) This reverts commit ba7f5ef.
tilt-dev · Jun 13, 2019 · 496687c · 496687c
1 parent 2667f95
commit 496687c
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 15 deletions.
diff --git a/integration/k8s_fixture_test.go b/integration/k8s_fixture_test.go
@@ -195,6 +195,7 @@ func (f *k8sFixture) setupNewKubeConfig() {
 
 	f.tempDir.WriteFile("config", string(current))
 	f.fixture.tiltEnviron["KUBECONFIG"] = f.tempDir.JoinPath("config")
+	f.fixture.tiltEnviron["TILT_K8S_EVENTS"] = "true"
 	f.usingOverriddenConfig = true
 }
 

diff --git a/internal/engine/event_watch_manager.go b/internal/engine/event_watch_manager.go
@@ -22,6 +22,10 @@ func NewEventWatchManager(kClient k8s.Client) *EventWatchManager {
 }
 
 func (m *EventWatchManager) needsWatch(st store.RStore) bool {
+	if !k8sEventsFeatureFlagOn() {
+		return false
+	}
+
 	state := st.RLockState()
 	defer st.RUnlockState()
 

diff --git a/internal/engine/event_watch_manager_test.go b/internal/engine/event_watch_manager_test.go
@@ -3,6 +3,7 @@ package engine
 import (
 	"context"
 	"fmt"
+	"os"
 	"testing"
 	"time"
 
@@ -72,6 +73,10 @@ type ewmFixture struct {
 	cancel     func()
 	store      *store.Store
 	getActions func() []store.Action
+
+	// old value of k8sEventsFeatureFlag env var, for teardown
+	// TODO(maia): remove this when we remove the feature flag
+	oldFeatureFlagVal string
 }
 
 func newEWMFixture(t *testing.T) *ewmFixture {
@@ -81,13 +86,16 @@ func newEWMFixture(t *testing.T) *ewmFixture {
 	ctx, cancel := context.WithCancel(ctx)
 
 	ret := &ewmFixture{
-		kClient: kClient,
-		ewm:     NewEventWatchManager(kClient),
-		ctx:     ctx,
-		cancel:  cancel,
-		t:       t,
+		kClient:           kClient,
+		ewm:               NewEventWatchManager(kClient),
+		ctx:               ctx,
+		cancel:            cancel,
+		t:                 t,
+		oldFeatureFlagVal: os.Getenv(k8sEventsFeatureFlag),
 	}
 
+	os.Setenv(k8sEventsFeatureFlag, "true")
+
 	ret.store, ret.getActions = store.NewStoreForTesting()
 	go ret.store.Loop(ctx)
 
@@ -96,6 +104,8 @@ func newEWMFixture(t *testing.T) *ewmFixture {
 
 func (f *ewmFixture) TearDown() {
 	f.kClient.TearDown()
+
+	_ = os.Setenv(k8sEventsFeatureFlag, f.oldFeatureFlagVal)
 	f.cancel()
 }
 

diff --git a/internal/engine/k8s_events_feature.go b/internal/engine/k8s_events_feature.go
@@ -0,0 +1,12 @@
+package engine
+
+import "os"
+
+// TODO(maia): remove this when feature is merged
+
+const k8sEventsFeatureFlag = "TILT_K8S_EVENTS"
+
+// TEMPORARY: check env to see if feature flag is set
+func k8sEventsFeatureFlagOn() bool {
+	return os.Getenv(k8sEventsFeatureFlag) != ""
+}
diff --git a/internal/engine/uid_map_manager.go b/internal/engine/uid_map_manager.go
@@ -21,6 +21,10 @@ func NewUIDMapManager(kCli k8s.Client) *UIDMapManager {
 }
 
 func (m *UIDMapManager) needsWatch(st store.RStore) bool {
+	if !k8sEventsFeatureFlagOn() {
+		return false
+	}
+
 	state := st.RLockState()
 	defer st.RUnlockState()
 

diff --git a/internal/engine/uid_map_manager_test.go b/internal/engine/uid_map_manager_test.go
@@ -3,6 +3,7 @@ package engine
 import (
 	"context"
 	"fmt"
+	"os"
 	"testing"
 	"time"
 
@@ -173,6 +174,10 @@ type ummFixture struct {
 	cancel     func()
 	store      *store.Store
 	getActions func() []store.Action
+
+	// old value of k8sEventsFeatureFlag env var, for teardown
+	// TODO(maia): remove this when we remove the feature flag
+	oldFeatureFlagVal string
 }
 
 func newUMMFixture(t *testing.T) *ummFixture {
@@ -182,13 +187,16 @@ func newUMMFixture(t *testing.T) *ummFixture {
 	ctx, cancel := context.WithCancel(ctx)
 
 	ret := &ummFixture{
-		kClient: kClient,
-		umm:     NewUIDMapManager(kClient),
-		ctx:     ctx,
-		cancel:  cancel,
-		t:       t,
+		kClient:           kClient,
+		umm:               NewUIDMapManager(kClient),
+		ctx:               ctx,
+		cancel:            cancel,
+		t:                 t,
+		oldFeatureFlagVal: os.Getenv(k8sEventsFeatureFlag),
 	}
 
+	os.Setenv(k8sEventsFeatureFlag, "true")
+
 	ret.store, ret.getActions = store.NewStoreForTesting()
 	go ret.store.Loop(ctx)
 
@@ -197,6 +205,7 @@ func newUMMFixture(t *testing.T) *ummFixture {
 
 func (f *ummFixture) TearDown() {
 	f.kClient.TearDown()
+	_ = os.Setenv(k8sEventsFeatureFlag, f.oldFeatureFlagVal)
 	f.cancel()
 }
 

diff --git a/internal/engine/upper_test.go b/internal/engine/upper_test.go
@@ -1787,7 +1787,7 @@ func TestUpper_PodLogs(t *testing.T) {
 }
 
 func TestK8sEventGlobalLogAndManifestLog(t *testing.T) {
-	f := newTestFixture(t)
+	f := newTestFixture(t).EnableK8sEvents()
 	defer f.TearDown()
 
 	entityUID := "someEntity"
@@ -1845,7 +1845,7 @@ func TestK8sEventGlobalLogAndManifestLog(t *testing.T) {
 }
 
 func TestK8sEventNotLoggedIfNoManifestForUID(t *testing.T) {
-	f := newTestFixture(t)
+	f := newTestFixture(t).EnableK8sEvents()
 	defer f.TearDown()
 
 	entityUID := "someEntity"
@@ -1872,7 +1872,7 @@ func TestK8sEventNotLoggedIfNoManifestForUID(t *testing.T) {
 }
 
 func TestK8sEventDoNotLogNormalEvents(t *testing.T) {
-	f := newTestFixture(t)
+	f := newTestFixture(t).EnableK8sEvents()
 	defer f.TearDown()
 
 	entityUID := "someEntity"
@@ -1916,7 +1916,7 @@ func TestK8sEventDoNotLogNormalEvents(t *testing.T) {
 }
 
 func TestK8sEventLogTimestamp(t *testing.T) {
-	f := newTestFixture(t)
+	f := newTestFixture(t).EnableK8sEvents()
 	defer f.TearDown()
 
 	st := f.store.LockMutableStateForTesting()
@@ -1970,7 +1970,7 @@ func TestK8sEventLogTimestamp(t *testing.T) {
 }
 
 func TestUIDMapDeleteUID(t *testing.T) {
-	f := newTestFixture(t)
+	f := newTestFixture(t).EnableK8sEvents()
 	defer f.TearDown()
 
 	st := f.store.LockMutableStateForTesting()
@@ -2579,6 +2579,11 @@ type testFixture struct {
 	opter                 *testOpter
 	tiltVersionCheckDelay time.Duration
 
+	// old value of k8sEventsFeatureFlag env var, for teardown
+	// if nil, no reset needed.
+	// TODO(maia): rm when we unflag this
+	oldK8sEventsFeatureFlagVal *string
+
 	onchangeCh chan bool
 }
 
@@ -2676,6 +2681,15 @@ func newTestFixture(t *testing.T) *testFixture {
 	return ret
 }
 
+func (f *testFixture) EnableK8sEvents() *testFixture {
+	oldVal := os.Getenv(k8sEventsFeatureFlag)
+	f.oldK8sEventsFeatureFlagVal = &oldVal
+
+	_ = os.Setenv(k8sEventsFeatureFlag, "true")
+
+	return f
+}
+
 func (f *testFixture) Start(manifests []model.Manifest, watchFiles bool, initOptions ...initOption) {
 	f.startWithInitManifests(nil, manifests, watchFiles, initOptions...)
 }
@@ -2958,6 +2972,10 @@ func (f *testFixture) TearDown() {
 	close(f.fsWatcher.events)
 	close(f.fsWatcher.errors)
 
+	if f.oldK8sEventsFeatureFlagVal != nil {
+		_ = os.Setenv(k8sEventsFeatureFlag, *f.oldK8sEventsFeatureFlagVal)
+	}
+
 	f.cancel()
 }