data/data/bootstrap: use loopback kubeconfig for API access

jhixson74 · Aug 2, 2019 · 82d81d9 · 82d81d9
1 parent 40f7fa5
commit 82d81d9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
@@ -71,7 +71,7 @@ then
 	cp cvo-bootstrap/bootstrap/* bootstrap-manifests/
 	cp cvo-bootstrap/manifests/* manifests/
 	## FIXME: CVO should use `/etc/kubernetes/bootstrap-secrets/kubeconfig` instead
-	cp auth/kubeconfig /etc/kubernetes/kubeconfig
+	cp auth/kubeconfig-loopback /etc/kubernetes/kubeconfig
 
 	touch cvo-bootstrap.done
 fi

diff --git a/data/data/bootstrap/systemd/units/approve-csr.service b/data/data/bootstrap/systemd/units/approve-csr.service
@@ -4,7 +4,7 @@ Wants=bootkube.service
 After=bootkube.service
 
 [Service]
-ExecStart=/usr/local/bin/approve-csr.sh /opt/openshift/auth/kubeconfig
+ExecStart=/usr/local/bin/approve-csr.sh /opt/openshift/auth/kubeconfig-loopback
 
 Restart=on-failure
 RestartSec=5s

diff --git a/data/data/bootstrap/systemd/units/openshift.service b/data/data/bootstrap/systemd/units/openshift.service
@@ -6,7 +6,7 @@ ConditionPathExists=!/opt/openshift/.openshift.done
 
 [Service]
 WorkingDirectory=/opt/openshift/openshift
-ExecStart=/usr/local/bin/openshift.sh /opt/openshift/auth/kubeconfig
+ExecStart=/usr/local/bin/openshift.sh /opt/openshift/auth/kubeconfig-loopback
 
 Restart=on-failure
 RestartSec=5s