From 3dde4ba8ba6a8786d8ec165d234de120e6fea3c0 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 16 Apr 2018 21:42:16 -0700 Subject: [PATCH] Mount host's /etc/os-release in kubelet system containers * Fix `kubectl describe node` to reflect the host's operating system --- 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 +- .../fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index de2a8c05..fe9c7c71 100644 --- a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -111,7 +111,7 @@ runcmd: - "atomic install --system --name=etcd quay.io/dghubble/etcd:0265e6680d2533f3fbf4512af868d29ff07451ca" - [systemctl, start, --no-block, etcd.service] - [systemctl, enable, cloud-metadata.service] - - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:460dc13da365a56c5d5419f4d476fbc9d25e0ad7" + - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:8baca5cbaf7b7ee0710380c7d8897e444ebdcb27" - [systemctl, start, --no-block, kubelet.service] users: - default diff --git a/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl b/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl index f11c3be4..abbc3442 100644 --- a/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl +++ b/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl @@ -59,7 +59,7 @@ bootcmd: runcmd: - [systemctl, daemon-reload] - [systemctl, enable, cloud-metadata.service] - - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:460dc13da365a56c5d5419f4d476fbc9d25e0ad7" + - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:8baca5cbaf7b7ee0710380c7d8897e444ebdcb27" - [systemctl, start, --no-block, kubelet.service] users: - default diff --git a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 7fdc309e..c913fe96 100644 --- a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -101,7 +101,7 @@ runcmd: - "atomic install --system --name=etcd quay.io/dghubble/etcd:0265e6680d2533f3fbf4512af868d29ff07451ca" - [systemctl, start, --no-block, etcd.service] - [hostnamectl, set-hostname, ${domain_name}] - - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:460dc13da365a56c5d5419f4d476fbc9d25e0ad7" + - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:8baca5cbaf7b7ee0710380c7d8897e444ebdcb27" - [systemctl, enable, kubelet.path] - [systemctl, start, --no-block, kubelet.path] users: diff --git a/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl b/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl index dd73425c..d37ac5eb 100644 --- a/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl +++ b/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl @@ -49,7 +49,7 @@ bootcmd: runcmd: - [systemctl, daemon-reload] - [hostnamectl, set-hostname, ${domain_name}] - - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:460dc13da365a56c5d5419f4d476fbc9d25e0ad7" + - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:8baca5cbaf7b7ee0710380c7d8897e444ebdcb27" - [systemctl, enable, kubelet.path] - [systemctl, start, --no-block, kubelet.path] users: diff --git a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 308c21f6..5a2941a9 100644 --- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -115,7 +115,7 @@ runcmd: - "atomic install --system --name=etcd quay.io/dghubble/etcd:0265e6680d2533f3fbf4512af868d29ff07451ca" - [systemctl, start, --no-block, etcd.service] - [systemctl, enable, cloud-metadata.service] - - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:460dc13da365a56c5d5419f4d476fbc9d25e0ad7" + - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:8baca5cbaf7b7ee0710380c7d8897e444ebdcb27" - [systemctl, enable, kubelet.path] - [systemctl, start, --no-block, kubelet.path] users: diff --git a/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl b/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl index 9c64f5fe..0899e5b0 100644 --- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl +++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl @@ -63,7 +63,7 @@ bootcmd: runcmd: - [systemctl, daemon-reload] - [systemctl, enable, cloud-metadata.service] - - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:460dc13da365a56c5d5419f4d476fbc9d25e0ad7" + - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:8baca5cbaf7b7ee0710380c7d8897e444ebdcb27" - [systemctl, enable, kubelet.path] - [systemctl, start, --no-block, kubelet.path] users: diff --git a/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index ada354a0..876f055f 100644 --- a/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -112,7 +112,7 @@ runcmd: - "atomic install --system --name=etcd quay.io/dghubble/etcd:0265e6680d2533f3fbf4512af868d29ff07451ca" - [systemctl, start, --no-block, etcd.service] - [systemctl, enable, cloud-metadata.service] - - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:460dc13da365a56c5d5419f4d476fbc9d25e0ad7" + - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:8baca5cbaf7b7ee0710380c7d8897e444ebdcb27" - [systemctl, start, --no-block, kubelet.service] users: - default diff --git a/google-cloud/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl b/google-cloud/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl index 2a97dcce..65e7d3d2 100644 --- a/google-cloud/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl +++ b/google-cloud/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl @@ -60,7 +60,7 @@ bootcmd: runcmd: - [systemctl, daemon-reload] - [systemctl, enable, cloud-metadata.service] - - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:460dc13da365a56c5d5419f4d476fbc9d25e0ad7" + - "atomic install --system --name=kubelet quay.io/dghubble/kubelet:8baca5cbaf7b7ee0710380c7d8897e444ebdcb27" - [systemctl, start, --no-block, kubelet.service] users: - default