Merge pull request openshift#583 from sttts/sttts-remove-disable-phas…

…e-2-apiserver bootkube: remove apiserver --disable-phase-2 after default change
wking · Oct 31, 2018 · 910c19a · 910c19a
2 parents c9fe6c0 + 0eadafe
commit 910c19a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/pkg/asset/ignition/bootstrap/content/bootkube.go b/pkg/asset/ignition/bootstrap/content/bootkube.go
@@ -76,8 +76,7 @@ then
 		--asset-input-dir=/assets/tls \
 		--asset-output-dir=/assets/kube-apiserver-bootstrap \
 		--config-output-file=/assets/kube-apiserver-bootstrap/config \
-		--config-override-files=/assets/bootkube-config-overrides/kube-apiserver-config-overrides.yaml \
-		--disable-phase-2
+		--config-override-files=/assets/bootkube-config-overrides/kube-apiserver-config-overrides.yaml
 
 	cp kube-apiserver-bootstrap/config /etc/kubernetes/bootstrap-configs/kube-apiserver-config.yaml
 	cp kube-apiserver-bootstrap/bootstrap-manifests/* bootstrap-manifests/