mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-06 02:34:03 +00:00
Writes to etcd should wait for it to be ready. Flannel is happy now.
This commit is contained in:
parent
9e9b06ce00
commit
3b339653c1
@ -1,5 +1,12 @@
|
|||||||
#cloud-config
|
#cloud-config
|
||||||
|
|
||||||
|
---
|
||||||
|
write_files:
|
||||||
|
- path: /opt/bin/waiter.sh
|
||||||
|
owner: root
|
||||||
|
content: |
|
||||||
|
#! /usr/bin/bash
|
||||||
|
until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done
|
||||||
coreos:
|
coreos:
|
||||||
units:
|
units:
|
||||||
- name: setup-network-environment.service
|
- name: setup-network-environment.service
|
||||||
@ -62,10 +69,29 @@ coreos:
|
|||||||
ExecStart=/usr/bin/fleetd
|
ExecStart=/usr/bin/fleetd
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=10s
|
RestartSec=10s
|
||||||
|
- name: etcd-waiter.service
|
||||||
|
command: start
|
||||||
|
content: |
|
||||||
|
[Unit]
|
||||||
|
Description=etcd waiter
|
||||||
|
Wants=network-online.target
|
||||||
|
Wants=etcd.service
|
||||||
|
After=etcd.service
|
||||||
|
After=network-online.target
|
||||||
|
Before=flannel.service
|
||||||
|
Before=setup-network-environment.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh
|
||||||
|
ExecStart=/usr/bin/bash /opt/bin/waiter.sh
|
||||||
|
RemainAfterExit=true
|
||||||
|
Type=oneshot
|
||||||
- name: flannel.service
|
- name: flannel.service
|
||||||
command: start
|
command: start
|
||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
|
Wants=etcd-waiter.service
|
||||||
|
After=etcd-waiter.service
|
||||||
Requires=etcd.service
|
Requires=etcd.service
|
||||||
After=etcd.service
|
After=etcd.service
|
||||||
After=network-online.target
|
After=network-online.target
|
||||||
|
@ -1,5 +1,12 @@
|
|||||||
#cloud-config
|
#cloud-config
|
||||||
|
|
||||||
|
---
|
||||||
|
write_files:
|
||||||
|
- path: /opt/bin/waiter.sh
|
||||||
|
owner: root
|
||||||
|
content: |
|
||||||
|
#! /usr/bin/bash
|
||||||
|
until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done
|
||||||
hostname: standalone
|
hostname: standalone
|
||||||
coreos:
|
coreos:
|
||||||
units:
|
units:
|
||||||
@ -7,10 +14,29 @@ coreos:
|
|||||||
command: start
|
command: start
|
||||||
- name: fleet.service
|
- name: fleet.service
|
||||||
command: start
|
command: start
|
||||||
|
- name: etcd-waiter.service
|
||||||
|
command: start
|
||||||
|
content: |
|
||||||
|
[Unit]
|
||||||
|
Description=etcd waiter
|
||||||
|
Wants=network-online.target
|
||||||
|
Wants=etcd.service
|
||||||
|
After=etcd.service
|
||||||
|
After=network-online.target
|
||||||
|
Before=flannel.service
|
||||||
|
Before=setup-network-environment.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh
|
||||||
|
ExecStart=/usr/bin/bash /opt/bin/waiter.sh
|
||||||
|
RemainAfterExit=true
|
||||||
|
Type=oneshot
|
||||||
- name: flannel.service
|
- name: flannel.service
|
||||||
command: start
|
command: start
|
||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
|
Wants=etcd-waiter.service
|
||||||
|
After=etcd-waiter.service
|
||||||
Requires=etcd.service
|
Requires=etcd.service
|
||||||
After=etcd.service
|
After=etcd.service
|
||||||
After=network-online.target
|
After=network-online.target
|
||||||
|
Loading…
Reference in New Issue
Block a user