Skip to content

Commit 43b1ef7

Browse files
committed
bootkube.sh: do not hide problems with render
1 parent 1c16da0 commit 43b1ef7

File tree

1 file changed

+30
-6
lines changed

1 file changed

+30
-6
lines changed

data/data/bootstrap/files/usr/local/bin/bootkube.sh.template

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@ CLUSTER_BOOTSTRAP_IMAGE=$(podman run --rm ${release} image cluster-bootstrap)
3636

3737
mkdir --parents ./{bootstrap-manifests,manifests}
3838

39-
if [ ! -d cvo-bootstrap ]
39+
if [ ! -f cvo-bootstrap.done ]
4040
then
4141
echo "Rendering Cluster Version Operator Manifests..."
4242

43+
rm -rf cvo-bootstrap
44+
4345
# shellcheck disable=SC2154
4446
podman run \
4547
--volume "$PWD:/assets:z" \
@@ -52,12 +54,16 @@ then
5254
cp cvo-bootstrap/manifests/* manifests/
5355
## FIXME: CVO should use `/etc/kubernetes/bootstrap-secrets/kubeconfig` instead
5456
cp auth/kubeconfig /etc/kubernetes/kubeconfig
57+
58+
touch cvo-bootstrap.done
5559
fi
5660

57-
if [ ! -d config-bootstrap ]
61+
if [ ! -f config-bootstrap.done ]
5862
then
5963
echo "Rendering cluster config manifests..."
6064

65+
rm -rf config-bootstrap
66+
6167
# shellcheck disable=SC2154
6268
podman run \
6369
--volume "$PWD:/assets:z" \
@@ -68,12 +74,16 @@ then
6874
--asset-output-dir=/assets/config-bootstrap
6975

7076
cp config-bootstrap/manifests/* manifests/
77+
78+
touch config-bootstrap.done
7179
fi
7280

73-
if [ ! -d kube-apiserver-bootstrap ]
81+
if [ ! -f kube-apiserver-bootstrap.done ]
7482
then
7583
echo "Rendering Kubernetes API server core manifests..."
7684

85+
rm -rf kube-apiserver-bootstrap
86+
7787
# shellcheck disable=SC2154
7888
podman run \
7989
--volume "$PWD:/assets:z" \
@@ -90,12 +100,16 @@ then
90100
cp kube-apiserver-bootstrap/config /etc/kubernetes/bootstrap-configs/kube-apiserver-config.yaml
91101
cp kube-apiserver-bootstrap/bootstrap-manifests/* bootstrap-manifests/
92102
cp kube-apiserver-bootstrap/manifests/* manifests/
103+
104+
touch kube-apiserver-bootstrap.done
93105
fi
94106

95-
if [ ! -d kube-controller-manager-bootstrap ]
107+
if [ ! -f kube-controller-manager-bootstrap.done ]
96108
then
97109
echo "Rendering Kubernetes Controller Manager core manifests..."
98110

111+
rm -rf kube-controller-manager-bootstrap
112+
99113
# shellcheck disable=SC2154
100114
podman run \
101115
--volume "$PWD:/assets:z" \
@@ -110,12 +124,16 @@ then
110124
cp kube-controller-manager-bootstrap/config /etc/kubernetes/bootstrap-configs/kube-controller-manager-config.yaml
111125
cp kube-controller-manager-bootstrap/bootstrap-manifests/* bootstrap-manifests/
112126
cp kube-controller-manager-bootstrap/manifests/* manifests/
127+
128+
touch kube-controller-manager-bootstrap.done
113129
fi
114130

115-
if [ ! -d kube-scheduler-bootstrap ]
131+
if [ ! -f kube-scheduler-bootstrap.done ]
116132
then
117133
echo "Rendering Kubernetes Scheduler core manifests..."
118134

135+
rm -rf kube-scheduler-bootstrap
136+
119137
# shellcheck disable=SC2154
120138
podman run \
121139
--volume "$PWD:/assets:z" \
@@ -129,12 +147,16 @@ then
129147
cp kube-scheduler-bootstrap/config /etc/kubernetes/bootstrap-configs/kube-scheduler-config.yaml
130148
cp kube-scheduler-bootstrap/bootstrap-manifests/* bootstrap-manifests/
131149
cp kube-scheduler-bootstrap/manifests/* manifests/
150+
151+
touch kube-scheduler-bootstrap.done
132152
fi
133153

134-
if [ ! -d mco-bootstrap ]
154+
if [ ! -f mco-bootstrap.done ]
135155
then
136156
echo "Rendering MCO manifests..."
137157

158+
rm -rf mco-bootstrap
159+
138160
# shellcheck disable=SC2154
139161
podman run \
140162
--user 0 \
@@ -168,6 +190,8 @@ then
168190
mkdir --parents /etc/ssl/mcs/
169191
cp tls/machine-config-server.crt /etc/ssl/mcs/tls.crt
170192
cp tls/machine-config-server.key /etc/ssl/mcs/tls.key
193+
194+
touch mco-bootstrap.done
171195
fi
172196

173197
# We originally wanted to run the etcd cert signer as

0 commit comments

Comments
 (0)