Fix delete-node.service kubectl service exec's

* Fix delete-node service that runs on worker (cloud-only)
shutdown to delete a Kubernetes node. Regressed in #669
(unreleased)
* Use rkt `--exec` to invoke kubectl binary in the kubelet
image
* Use podman `--entrypoint` to invoke the kubectl binary in
the kubelet image
This commit is contained in:
Dalton Hubble 2020-03-28 12:31:39 -07:00
parent a1a5da6bc2
commit fc686c8fc7
5 changed files with 5 additions and 9 deletions

View File

@ -130,8 +130,7 @@ storage:
docker://quay.io/poseidon/kubelet:v1.18.0 \ docker://quay.io/poseidon/kubelet:v1.18.0 \
--net=host \ --net=host \
--dns=host \ --dns=host \
-- \ --exec=/usr/local/bin/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
/usr/local/bin/kubectl --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
passwd: passwd:
users: users:
- name: core - name: core

View File

@ -128,8 +128,7 @@ storage:
docker://quay.io/poseidon/kubelet:v1.18.0 \ docker://quay.io/poseidon/kubelet:v1.18.0 \
--net=host \ --net=host \
--dns=host \ --dns=host \
-- \ --exec=/usr/local/bin/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname | tr '[:upper:]' '[:lower:]')
/usr/local/bin/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname | tr '[:upper:]' '[:lower:]')
passwd: passwd:
users: users:
- name: core - name: core

View File

@ -134,5 +134,4 @@ storage:
docker://quay.io/poseidon/kubelet:v1.18.0 \ docker://quay.io/poseidon/kubelet:v1.18.0 \
--net=host \ --net=host \
--dns=host \ --dns=host \
-- \ --exec=/usr/local/bin/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
/usr/local/bin/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)

View File

@ -128,8 +128,7 @@ storage:
docker://quay.io/poseidon/kubelet:v1.18.0 \ docker://quay.io/poseidon/kubelet:v1.18.0 \
--net=host \ --net=host \
--dns=host \ --dns=host \
-- \ --exec=/usr/local/bin/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
/usr/local/bin/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
passwd: passwd:
users: users:
- name: core - name: core

View File

@ -87,7 +87,7 @@ systemd:
Type=oneshot Type=oneshot
RemainAfterExit=true RemainAfterExit=true
ExecStart=/bin/true ExecStart=/bin/true
ExecStop=/bin/bash -c '/usr/bin/podman run --volume /etc/kubernetes:/etc/kubernetes:ro,z --entrypoint /usr/local/bin/kubectl quay.io/poseidon/kubelet:v1.18.0 kubectl --kubeconfig=/etc/kubernetes/kubeconfig delete node $HOSTNAME' ExecStop=/bin/bash -c '/usr/bin/podman run --volume /etc/kubernetes:/etc/kubernetes:ro,z --entrypoint /usr/local/bin/kubectl quay.io/poseidon/kubelet:v1.18.0 --kubeconfig=/etc/kubernetes/kubeconfig delete node $HOSTNAME'
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
storage: storage: