From 8523a086e27a00dcd2951c38e9f950afc153ded6 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 7 Apr 2018 18:25:48 -0700 Subject: [PATCH] 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 --- aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl | 2 +- aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl | 2 +- bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index ed440a68..16029ea7 100644 --- a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -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: diff --git a/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl b/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl index 84ce54b6..a72597e5 100644 --- a/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl +++ b/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl @@ -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: diff --git a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 853d417f..b4977f97 100644 --- a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -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] diff --git a/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl b/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl index 95850bc4..ed4573a1 100644 --- a/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl +++ b/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl @@ -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] diff --git a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 2d2a7824..78a1a806 100644 --- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -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] diff --git a/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl b/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl index 200251a2..7ac6f9e6 100644 --- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl +++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl @@ -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