envtest: append flags to defaultKubeAPIServerFlags

This change adds a constructor NewEnvironment() for creating a new k8s
test environment with defaultKubeAPIServerFlags as the default API
server flags and adds a method AppendKubeAPIServerFlags() to append more
flags to the default set of flags.
It also updates all the tests to use NewEnvironment().

Author: darkowlzz

pkg/builder/builder_suite_test.go

@@ -37,7 +37,7 @@ var cfg *rest.Config
 var _ = BeforeSuite(func(done Done) {
 	logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true))
 
-	testenv = &envtest.Environment{}
+	testenv = envtest.NewEnvironment()
 
 	var err error
 	cfg, err = testenv.Start()

pkg/cache/cache_suite_test.go

@@ -39,7 +39,7 @@ var clientset *kubernetes.Clientset
 var _ = BeforeSuite(func(done Done) {
 	logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true))
 
-	testenv = &envtest.Environment{}
+	testenv = envtest.NewEnvironment()
 
 	var err error
 	cfg, err = testenv.Start()

pkg/client/client_suite_test.go

@@ -40,7 +40,7 @@ var clientset *kubernetes.Clientset
 var _ = BeforeSuite(func(done Done) {
 	logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true))
 
-	testenv = &envtest.Environment{}
+	testenv = envtest.NewEnvironment()
 
 	var err error
 	cfg, err = testenv.Start()

pkg/controller/controller_suite_test.go

@@ -39,7 +39,7 @@ var clientset *kubernetes.Clientset
 var _ = BeforeSuite(func(done Done) {
 	logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true))
 
-	testenv = &envtest.Environment{}
+	testenv = envtest.NewEnvironment()
 
 	var err error
 	cfg, err = testenv.Start()

pkg/controller/controllerutil/controllerutil_suite_test.go

@@ -39,7 +39,7 @@ var c client.Client
 var _ = BeforeSuite(func() {
 	var err error
 
-	t = &envtest.Environment{}
+	t = envtest.NewEnvironment()
 
 	cfg, err = t.Start()
 	Expect(err).NotTo(HaveOccurred())

pkg/envtest/envtest_suite_test.go

@@ -33,7 +33,7 @@ var env *Environment
 
 var _ = BeforeSuite(func(done Done) {
 	logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true))
-	env = &Environment{}
+	env = NewEnvironment()
 	_, err := env.Start()
 	Expect(err).NotTo(HaveOccurred())
 

pkg/envtest/server.go

@@ -47,7 +47,6 @@ func defaultAssetPath(binary string) string {
 }
 
 // APIServerDefaultArgs are flags necessary to bring up apiserver.
-// TODO: create test framework interface to append flag to default flags.
 var defaultKubeAPIServerFlags = []string{
 	"--etcd-servers={{ if .EtcdURL }}{{ .EtcdURL.String }}{{ end }}",
 	"--cert-dir={{ .CertDir }}",
@@ -76,6 +75,21 @@ type Environment struct {
 	// existing kubeconfig, instead of trying to stand up a new control plane.
 	// This is useful in cases that need aggregated API servers and the like.
 	UseExistingCluster bool
+
+	// KubeAPIServerFlags is the set of flags passed while starting the api server.
+	KubeAPIServerFlags []string
+}
+
+// NewEnvironment creates a new Kubernetes test environment with default configs.
+func NewEnvironment() *Environment {
+	return &Environment{
+		KubeAPIServerFlags: defaultKubeAPIServerFlags,
+	}
+}
+
+// AppendKubeAPIServerFlags appends additional flags to defaultKubeAPIServerFlags.
+func (te *Environment) AppendKubeAPIServerFlags(flags []string) {
+	te.KubeAPIServerFlags = append(te.KubeAPIServerFlags, flags...)
 }
 
 // Stop stops a running server
@@ -101,7 +115,7 @@ func (te *Environment) Start() (*rest.Config, error) {
 		}
 	} else {
 		te.ControlPlane = integration.ControlPlane{}
-		te.ControlPlane.APIServer = &integration.APIServer{Args: defaultKubeAPIServerFlags}
+		te.ControlPlane.APIServer = &integration.APIServer{Args: te.KubeAPIServerFlags}
 		if os.Getenv(envKubeAPIServerBin) == "" {
 			te.ControlPlane.APIServer.Path = defaultAssetPath("kube-apiserver")
 		}

pkg/internal/controller/controller_suite_test.go

@@ -39,7 +39,7 @@ var clientset *kubernetes.Clientset
 var _ = BeforeSuite(func(done Done) {
 	logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true))
 
-	testenv = &envtest.Environment{}
+	testenv = envtest.NewEnvironment()
 
 	var err error
 	cfg, err = testenv.Start()

pkg/internal/recorder/recorder_suite_test.go

@@ -39,7 +39,7 @@ var clientset *kubernetes.Clientset
 var _ = BeforeSuite(func(done Done) {
 	logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true))
 
-	testenv = &envtest.Environment{}
+	testenv = envtest.NewEnvironment()
 
 	var err error
 	cfg, err = testenv.Start()

pkg/manager/manager_suite_test.go

@@ -39,7 +39,7 @@ var clientset *kubernetes.Clientset
 var _ = BeforeSuite(func(done Done) {
 	logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true))
 
-	testenv = &envtest.Environment{}
+	testenv = envtest.NewEnvironment()
 
 	var err error
 	cfg, err = testenv.Start()

pkg/source/source_suite_test.go

@@ -43,7 +43,7 @@ var _ = BeforeSuite(func(done Done) {
 	stop = make(chan struct{})
 	logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true))
 
-	testenv = &envtest.Environment{}
+	testenv = envtest.NewEnvironment()
 
 	var err error
 	config, err = testenv.Start()