Remove serviceaccount feature flag for the SA controller.

glide.yaml

@@ -31,7 +31,7 @@ import:
   - tools/cache
   - tools/clientcmd
 - package: github.com/projectcalico/libcalico-go
-  version: 88291609bbefd0fe22982a7a78ec51d63583a651
+  version: 9070d94a5bf7214a417372890fa0ad28eb13e813
 - package: github.com/projectcalico/felix
   version: 518dbc352494a962e46d50f8bfe72a70c86951bf
   subpackages:

main.go

@@ -111,13 +111,8 @@ func main() {
 			nodeController := node.NewNodeController(ctx, k8sClientset, calicoClient)
 			go nodeController.Run(config.NodeWorkers, config.ReconcilerPeriod, stop)
 		case "serviceaccount":
-			if apiconfig.IsAlphaFeatureSet(os.Getenv("ALPHA_FEATURES"), apiconfig.AlphaFeatureSA) {
-				log.Info("Running service accounts profile controller")
-				serviceAccountController := serviceaccount.NewServiceAccountController(ctx, k8sClientset, calicoClient)
-				go serviceAccountController.Run(config.ProfileWorkers, config.ReconcilerPeriod, stop)
-			} else {
-				log.Info("Not running service account profile controller. Not set in ALPHA_FEATURES.")
-			}
+			serviceAccountController := serviceaccount.NewServiceAccountController(ctx, k8sClientset, calicoClient)
+			go serviceAccountController.Run(config.ProfileWorkers, config.ReconcilerPeriod, stop)
 		default:
 			log.Fatalf("Invalid controller '%s' provided. Valid options are workloadendpoint, profile, policy", controllerType)
 		}

pkg/config/config.go

@@ -29,8 +29,7 @@ type Config struct {
 	CompactionPeriod string `default:"10m" split_words:"true"`
 
 	// Which controllers to run.
-	// 'serviceaccount' is not a default yet.
-	EnabledControllers string `default:"policy,namespace,workloadendpoint" split_words:"true"`
+	EnabledControllers string `default:"policy,namespace,workloadendpoint,serviceaccount" split_words:"true"`
 
 	// Number of workers to run for each controller.
 	WorkloadEndpointWorkers int `default:"1" split_words:"true"`

pkg/config/config_test.go

@@ -74,7 +74,7 @@ var _ = Describe("Config", func() {
 		It("shoud return default values", func() {
 			Expect(config.LogLevel).To(Equal("info"))
 			Expect(config.ReconcilerPeriod).To(Equal("5m"))
-			Expect(config.EnabledControllers).To(Equal("policy,namespace,workloadendpoint"))
+			Expect(config.EnabledControllers).To(Equal("policy,namespace,workloadendpoint,serviceaccount"))
 			Expect(config.WorkloadEndpointWorkers).To(Equal(1))
 			Expect(config.ProfileWorkers).To(Equal(1))
 			Expect(config.PolicyWorkers).To(Equal(1))

tests/testutils/policy_controller_utils.go

@@ -32,7 +32,6 @@ func RunPolicyController(etcdIP, kconfigfile string) *containers.Container {
 		"-e", "LOG_LEVEL=debug",
 		"-e", fmt.Sprintf("KUBECONFIG=%s", kconfigfile),
 		"-e", "RECONCILER_PERIOD=10s",
-		"-e", "ALPHA_FEATURES=serviceaccounts",
 		"-v", fmt.Sprintf("%s:%s", kconfigfile, kconfigfile),
 		fmt.Sprintf("%s", os.Getenv("CONTAINER_NAME")))
 }

tests/testutils/utils.go

@@ -75,7 +75,6 @@ func GetCalicoClient(etcdIP string) client.Interface {
 	cfg := apiconfig.NewCalicoAPIConfig()
 	cfg.Spec.DatastoreType = apiconfig.EtcdV3
 	cfg.Spec.EtcdEndpoints = fmt.Sprintf("http://%s:2379", etcdIP)
-	cfg.Spec.AlphaFeatures = "serviceaccounts"
 	client, err := client.New(*cfg)
 
 	Expect(err).NotTo(HaveOccurred())