apis: remove a DisableSource that's not needed (#5649)

tilt-dev · Apr 1, 2022 · b924c82 · b924c82
1 parent 1ee7d4f
commit b924c82
Show file tree

Hide file tree

Showing 7 changed files with 565 additions and 641 deletions.
diff --git a/internal/controllers/core/tiltfile/api.go b/internal/controllers/core/tiltfile/api.go
@@ -543,7 +543,6 @@ func toImageMapObjects(tlr *tiltfile.TiltfileLoadResult, disableSources disableS
 				},
 				Spec: iTarget.ImageMapSpec,
 			}
-			im.Spec.DisableSource = disableSources[m.Name]
 			result[name] = im
 		}
 	}

diff --git a/internal/controllers/core/tiltfile/api_test.go b/internal/controllers/core/tiltfile/api_test.go
@@ -253,7 +253,6 @@ func TestDisableObjects(t *testing.T) {
 			name := apis.SanitizeName(SanchoRef.String())
 			var im v1alpha1.ImageMap
 			require.NoError(t, f.Get(types.NamespacedName{Name: name}, &im))
-			require.Equal(t, feDisable, im.Spec.DisableSource)
 
 			var ka v1alpha1.KubernetesApply
 			require.NoError(t, f.Get(types.NamespacedName{Name: "fe"}, &ka))

diff --git a/pkg/apis/core/v1alpha1/generated.pb.go b/pkg/apis/core/v1alpha1/generated.pb.go
diff --git a/pkg/apis/core/v1alpha1/generated.proto b/pkg/apis/core/v1alpha1/generated.proto
diff --git a/pkg/apis/core/v1alpha1/imagemap_types.go b/pkg/apis/core/v1alpha1/imagemap_types.go
@@ -105,11 +105,6 @@ type ImageMapSpec struct {
 	//
 	// +optional
 	OverrideArgs *ImageMapOverrideArgs `json:"overrideArgs,omitempty" protobuf:"bytes,5,opt,name=overrideArgs"`
-
-	// Specifies how to disable this.
-	//
-	// +optional
-	DisableSource *DisableSource `json:"disableSource,omitempty" protobuf:"bytes,6,opt,name=disableSource"`
 }
 
 // ImageMapCommandOverride defines a command to inject when the image

diff --git a/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/openapi/zz_generated.openapi.go b/pkg/openapi/zz_generated.openapi.go