openstack
/
magnum
Code Issues Proposed changes

Use kubelet-wrapper provided by CoreOS 

The kubelet binary and service file from the CoreOS image
has been removed.
As of CoreOS release v962.0.0 following executable script:
/usr/lib/coreos/kubelet-wrapper is included in CoreOS image.
Only need to set KUBELET_VERSION environment variable to
use this script

Change-Id: I7c0bf86c549116fb250f33fe7ee4429553febb6f
Closes-Bug: #1605554
This commit is contained in:
yatin 2016-08-06 17:02:28 +05:30
parent 88c8543567
commit 8cd71a6905
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml
View File

@ -27,7 +27,8 @@ write_files:
CONF_FILE=/etc/systemd/system/kubelet.service
cat > $CONF_FILE <<EOF
[Service]
ExecStart=/usr/bin/kubelet \
Environment=KUBELET_VERSION=${KUBE_VERSION}_coreos.0
ExecStart=/usr/lib/coreos/kubelet-wrapper \
--api_servers=http://127.0.0.1:8080 \
--address=0.0.0.0 \
--register-node=false \

3
magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml
View File

@ -40,7 +40,8 @@ write_files:
CONF_FILE=/etc/systemd/system/kubelet.service
cat > $CONF_FILE <<EOF
[Service]
ExecStart=/usr/bin/kubelet \
Environment=KUBELET_VERSION=${KUBE_VERSION}_coreos.0
ExecStart=/usr/lib/coreos/kubelet-wrapper \
--api_servers=${KUBE_MASTER_URI} \
--address=0.0.0.0 \
--register-node=true \