Fix kubelet system container to mount CNI plugins
* Mount /opt/cni/bin in kubelet system container so CNI plugin binaries can be found. Before, flannel worked because the kubelet falls back to flannel plugin baked into the hyperkube (undesired) * Move the CNI bin install location later, since /opt changes may be lost between ostree rebases
This commit is contained in:
parent
19bc5aea9e
commit
8523a086e2
|
@ -93,7 +93,7 @@ runcmd:
|
|||
- [systemctl, daemon-reload]
|
||||
- "atomic install --system --name=etcd quay.io/dghubble/etcd:99f87f9245ef2b2104fe2fc3550c21327b5a980f"
|
||||
- [systemctl, start, --no-block, etcd.service]
|
||||
- "atomic install --system --name=kubelet quay.io/dghubble/hyper:f384aae1ffb04fbe303ee55d1fa3c09bc72bf146"
|
||||
- "atomic install --system --name=kubelet quay.io/dghubble/kubelet:d97cd9265ef6f6d0d9aab54ad9f66d4f5daaf397"
|
||||
- [systemctl, start, --no-block, kubelet.service]
|
||||
- [systemctl, disable, firewalld, --now]
|
||||
users:
|
||||
|
|
|
@ -42,7 +42,7 @@ bootcmd:
|
|||
- [setenforce, Permissive]
|
||||
runcmd:
|
||||
- systemctl daemon-reload
|
||||
- "atomic install --system --name=kubelet quay.io/dghubble/hyper:f384aae1ffb04fbe303ee55d1fa3c09bc72bf146"
|
||||
- "atomic install --system --name=kubelet quay.io/dghubble/kubelet:d97cd9265ef6f6d0d9aab54ad9f66d4f5daaf397"
|
||||
- systemctl start --no-block kubelet.service
|
||||
- systemctl disable firewalld --now
|
||||
users:
|
||||
|
|
|
@ -99,7 +99,7 @@ runcmd:
|
|||
- "atomic install --system --name=etcd quay.io/dghubble/etcd:99f87f9245ef2b2104fe2fc3550c21327b5a980f"
|
||||
- [systemctl, start, --no-block, etcd.service]
|
||||
- [hostnamectl, set-hostname, ${domain_name}]
|
||||
- "atomic install --system --name=kubelet quay.io/dghubble/hyper:f384aae1ffb04fbe303ee55d1fa3c09bc72bf146"
|
||||
- "atomic install --system --name=kubelet quay.io/dghubble/kubelet:d97cd9265ef6f6d0d9aab54ad9f66d4f5daaf397"
|
||||
- [systemctl, enable, kubelet.path]
|
||||
- [systemctl, start, --no-block, kubelet.path]
|
||||
- [systemctl, disable, firewalld, --now]
|
||||
|
|
|
@ -48,7 +48,7 @@ bootcmd:
|
|||
runcmd:
|
||||
- [systemctl, daemon-reload]
|
||||
- [hostnamectl, set-hostname, ${domain_name}]
|
||||
- "atomic install --system --name=kubelet quay.io/dghubble/hyper:f384aae1ffb04fbe303ee55d1fa3c09bc72bf146"
|
||||
- "atomic install --system --name=kubelet quay.io/dghubble/kubelet:d97cd9265ef6f6d0d9aab54ad9f66d4f5daaf397"
|
||||
- [systemctl, enable, kubelet.path]
|
||||
- [systemctl, start, --no-block, kubelet.path]
|
||||
- [systemctl, disable, firewalld, --now]
|
||||
|
|
|
@ -113,7 +113,7 @@ runcmd:
|
|||
- "atomic install --system --name=etcd quay.io/dghubble/etcd:99f87f9245ef2b2104fe2fc3550c21327b5a980f"
|
||||
- [systemctl, start, --no-block, etcd.service]
|
||||
- [systemctl, enable, cloud-metadata.service]
|
||||
- "atomic install --system --name=kubelet quay.io/dghubble/hyper:f384aae1ffb04fbe303ee55d1fa3c09bc72bf146"
|
||||
- "atomic install --system --name=kubelet quay.io/dghubble/kubelet:d97cd9265ef6f6d0d9aab54ad9f66d4f5daaf397"
|
||||
- [systemctl, enable, kubelet.path]
|
||||
- [systemctl, start, --no-block, kubelet.path]
|
||||
- [systemctl, disable, firewalld, --now]
|
||||
|
|
|
@ -62,7 +62,7 @@ bootcmd:
|
|||
runcmd:
|
||||
- systemctl daemon-reload
|
||||
- systemctl enable cloud-metadata.service
|
||||
- "atomic install --system --name=kubelet quay.io/dghubble/hyper:f384aae1ffb04fbe303ee55d1fa3c09bc72bf146"
|
||||
- "atomic install --system --name=kubelet quay.io/dghubble/kubelet:d97cd9265ef6f6d0d9aab54ad9f66d4f5daaf397"
|
||||
- systemctl enable kubelet.path
|
||||
- systemctl start --no-block kubelet.path
|
||||
- systemctl disable firewalld --now
|
||||
|
|
Loading…
Reference in New Issue