Merge pull request #9091 from spotinst/feat-addon-featureflag

Spotinst: Allow users to disable the controller add-on
kubernetes · May 12, 2020 · d7d61c6 · d7d61c6
2 parents aca8ac8 + 4f207e4
commit d7d61c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/featureflag/featureflag.go b/pkg/featureflag/featureflag.go
@@ -76,6 +76,8 @@ var (
 	Spotinst = New("Spotinst", Bool(false))
 	// SpotinstOcean toggles the use of Spotinst Ocean instance group implementation.
 	SpotinstOcean = New("SpotinstOcean", Bool(false))
+	// SpotinstController toggles the installation of the Spotinst controller addon.
+	SpotinstController = New("SpotinstController", Bool(true))
 	// VPCSkipEnableDNSSupport if set will make that a VPC does not need DNSSupport enabled.
 	VPCSkipEnableDNSSupport = New("VPCSkipEnableDNSSupport", Bool(false))
 	// VSphereCloudProvider enables the vsphere cloud provider

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@@ -543,7 +543,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 		}
 	}
 
-	if featureflag.Spotinst.Enabled() {
+	if featureflag.Spotinst.Enabled() && featureflag.SpotinstController.Enabled() {
 		key := "spotinst-kubernetes-cluster-controller.addons.k8s.io"
 
 		{
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
-    	if featureflag.Spotinst.Enabled() {
+    	if featureflag.Spotinst.Enabled() && featureflag.SpotinstController.Enabled() {
     		key := "spotinst-kubernetes-cluster-controller.addons.k8s.io"
     		{
@@ Expand Down @@