openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 15:47:14 +01:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
John Hixson
2019-07-24 12:17:05 -07:00
parent 40f7fa5ed3
commit 82d81d9f53
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
View File

@@ -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

2
data/data/bootstrap/systemd/units/approve-csr.service
View File

@@ -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

2
data/data/bootstrap/systemd/units/openshift.service
View File

@@ -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