Skip to content

Commit 4c6ec84

Browse files
ainmosnipierreprinetti
authored andcommitted
Add cloud.conf to nodes. (openshift#133)
Previously I forgot to add the cloud.conf to nodes. To rectify this mistake, I made the following changes: * Write the cloud.conf on the nodes. * Write a kubeadm join configuration. * Make kubeadm join using this configuration.
1 parent 11aa7f4 commit 4c6ec84

File tree

2 files changed

+37
-2
lines changed

2 files changed

+37
-2
lines changed

cmd/clusterctl/examples/openstack/centos/provider-components.yaml.template

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,23 @@ data:
186186

187187
install_configure_docker
188188

189+
# Write the cloud.conf so that the kubelet can use it.
190+
echo $OPENSTACK_CLOUD_PROVIDER_CONF | base64 -d > /etc/kubernetes/cloud.conf
191+
192+
# Set up kubeadm config file to pass to kubeadm join.
193+
cat > /etc/kubernetes/kubeadm_config.yaml <<EOF
194+
apiVersion: kubeadm.k8s.io/v1alpha3
195+
kind: JoinConfiguration
196+
nodeRegistration:
197+
kubeletExtraArgs:
198+
cloud-provider: "openstack"
199+
cloud-config: "/etc/kubernetes/cloud.conf"
200+
token: ${TOKEN}
201+
discoveryTokenAPIServers:
202+
- ${MASTER}
203+
discoveryTokenUnsafeSkipCAVerification: true
204+
EOF
205+
189206
cat <<EOF > /etc/default/kubelet
190207
KUBELET_KUBEADM_EXTRA_ARGS=--cgroup-driver=systemd
191208
EOF
@@ -195,7 +212,7 @@ data:
195212
echo '1' > /proc/sys/net/bridge/bridge-nf-call-iptables
196213
echo '1' > /proc/sys/net/ipv4/ip_forward
197214

198-
kubeadm join --token "${TOKEN}" "${MASTER}" --ignore-preflight-errors=all --discovery-token-unsafe-skip-ca-verification
215+
kubeadm join --ignore-preflight-errors=all --config /etc/kubernetes/kubeadm_config.yaml
199216
for tries in $(seq 1 60); do
200217
kubectl --kubeconfig /etc/kubernetes/kubelet.conf annotate --overwrite node $(hostname) machine=${MACHINE} && break
201218
sleep 1

cmd/clusterctl/examples/openstack/ubuntu/provider-components.yaml.template

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,24 @@ data:
223223
apt-get install -y kubelet=${KUBELET} kubeadm=${KUBEADM} kubectl=${KUBECTL}
224224
# kubeadm uses 10th IP as DNS server
225225
CLUSTER_DNS_SERVER=$(prips ${SERVICE_CIDR} | head -n 11 | tail -n 1)
226+
227+
# Write the cloud.conf so that the kubelet can use it.
228+
echo $OPENSTACK_CLOUD_PROVIDER_CONF | base64 -d > /etc/kubernetes/cloud.conf
229+
230+
# Set up kubeadm config file to pass to kubeadm join.
231+
cat > /etc/kubernetes/kubeadm_config.yaml <<EOF
232+
apiVersion: kubeadm.k8s.io/v1alpha3
233+
kind: JoinConfiguration
234+
nodeRegistration:
235+
kubeletExtraArgs:
236+
cloud-provider: "openstack"
237+
cloud-config: "/etc/kubernetes/cloud.conf"
238+
token: ${TOKEN}
239+
discoveryTokenAPIServers:
240+
- ${MASTER}
241+
discoveryTokenUnsafeSkipCAVerification: true
242+
EOF
243+
226244
# Override network args to use kubenet instead of cni, override Kubelet DNS args and
227245
# add cloud provider args.
228246
cat > /etc/systemd/system/kubelet.service.d/20-kubenet.conf <<EOF
@@ -231,7 +249,7 @@ data:
231249
EOF
232250
systemctl daemon-reload
233251
systemctl restart kubelet.service
234-
kubeadm join --token "${TOKEN}" "${MASTER}" --ignore-preflight-errors=all --discovery-token-unsafe-skip-ca-verification
252+
kubeadm join --ignore-preflight-errors=all --config /etc/kubernetes/kubeadm_config.yaml
235253
for tries in $(seq 1 60); do
236254
kubectl --kubeconfig /etc/kubernetes/kubelet.conf annotate --overwrite node $(hostname) machine=${MACHINE} && break
237255
sleep 1

0 commit comments

Comments
 (0)