render: remove phase 2 by default

cmd/cluster-kube-apiserver-operator/render/render.go

@@ -4,12 +4,9 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/golang/glog"
-	"github.com/openshift/library-go/pkg/assets"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
@@ -73,9 +70,10 @@ func (r *renderOpts) AddFlags(fs *pflag.FlagSet) {
 	fs.StringArrayVar(&r.etcdServerURLs, "manifest-etcd-server-urls", r.etcdServerURLs, "The etcd server URL, comma separated.")
 	fs.StringVar(&r.etcdServingCA, "manifest-etcd-serving-ca", r.etcdServingCA, "The etcd serving CA.")
 
+	// TODO: remove when the installer has stopped using it
 	fs.BoolVar(&r.disablePhase2, "disable-phase-2", r.disablePhase2, "Disable rendering of the phase 2 daemonset and dependencies.")
 	fs.MarkHidden("disable-phase-2")
-	fs.MarkDeprecated("disable-phase-2", "Only used temporarily to synchronize roll out of the phase 2 removal.")
+	fs.MarkDeprecated("disable-phase-2", "Only used temporarily to synchronize roll out of the phase 2 removal. Does nothing anymore.")
 }
 
 // Validate verifies the inputs.
@@ -145,20 +143,7 @@ func (r *renderOpts) Run() error {
 		return err
 	}
 
-	var filters []assets.FileInfoPredicate
-	if r.disablePhase2 {
-		filters = append(filters, func(info os.FileInfo) bool {
-			if strings.HasPrefix(info.Name(), "kube-system-") {
-				return false
-			}
-			if info.Name() == "daemonset-kube-apiserver.yaml" {
-				return false
-			}
-			return true
-		})
-	}
-
-	return genericrender.WriteFiles(&r.generic, &renderConfig.FileConfig, renderConfig, filters...)
+	return genericrender.WriteFiles(&r.generic, &renderConfig.FileConfig, renderConfig)
 }
 
 func mustReadTemplateFile(fname string) genericrenderoptions.Template {