mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #4425 from pires/fix_flannel_key_etcd
Fixes #4309 #4362
This commit is contained in:
commit
76ed22ab07
@ -103,7 +103,7 @@ coreos:
|
|||||||
ExecStartPre=-/usr/bin/mkdir -p /opt/bin
|
ExecStartPre=-/usr/bin/mkdir -p /opt/bin
|
||||||
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/flanneld
|
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/flanneld
|
||||||
ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
|
ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
|
||||||
ExecStartPre=/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
|
ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
|
||||||
ExecStart=/opt/bin/flanneld
|
ExecStart=/opt/bin/flanneld
|
||||||
- name: kube-apiserver.service
|
- name: kube-apiserver.service
|
||||||
command: start
|
command: start
|
||||||
|
@ -103,7 +103,7 @@ coreos:
|
|||||||
ExecStartPre=-/usr/bin/mkdir -p /opt/bin
|
ExecStartPre=-/usr/bin/mkdir -p /opt/bin
|
||||||
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/flanneld
|
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/flanneld
|
||||||
ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
|
ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
|
||||||
ExecStartPre=/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
|
ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
|
||||||
ExecStart=/opt/bin/flanneld
|
ExecStart=/opt/bin/flanneld
|
||||||
- name: kube-apiserver.service
|
- name: kube-apiserver.service
|
||||||
command: start
|
command: start
|
||||||
|
Loading…
Reference in New Issue
Block a user