mirror of
https://github.com/puppetmaster/typhoon.git
synced 2024-12-25 05:59:34 +01:00
Update systemd services for the v0.17.x hyperkube
* Binary asset locations within the upstream hyperkube image changed https://github.com/kubernetes/kubernetes/pull/84662 * Fix Container Linux and Flatcar Linux kubelet.service (rkt-fly with fairly dated CoreOS kubelet-wrapper) * Fix Fedora CoreOS kubelet.service (podman) * Fix Fedora CoreOS bootstrap.service * Fix delete-node kubectl usage for workers where nodes may delete themselves on shutdown (e.g. preemptible instances)
This commit is contained in:
parent
de36d99afc
commit
ed3550dce1
@ -137,6 +137,7 @@ storage:
|
|||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.17.0
|
KUBELET_IMAGE_TAG=v1.17.0
|
||||||
|
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
|
||||||
- path: /opt/bootstrap/layout
|
- path: /opt/bootstrap/layout
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0544
|
mode: 0544
|
||||||
|
@ -99,6 +99,7 @@ storage:
|
|||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.17.0
|
KUBELET_IMAGE_TAG=v1.17.0
|
||||||
|
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
|
||||||
- path: /etc/sysctl.d/max-user-watches.conf
|
- path: /etc/sysctl.d/max-user-watches.conf
|
||||||
filesystem: root
|
filesystem: root
|
||||||
contents:
|
contents:
|
||||||
@ -119,7 +120,8 @@ storage:
|
|||||||
docker://k8s.gcr.io/hyperkube:v1.17.0 \
|
docker://k8s.gcr.io/hyperkube:v1.17.0 \
|
||||||
--net=host \
|
--net=host \
|
||||||
--dns=host \
|
--dns=host \
|
||||||
--exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
|
-- \
|
||||||
|
kubectl --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
|
||||||
passwd:
|
passwd:
|
||||||
users:
|
users:
|
||||||
- name: core
|
- name: core
|
||||||
|
@ -80,7 +80,7 @@ systemd:
|
|||||||
--volume /var/run:/var/run \
|
--volume /var/run:/var/run \
|
||||||
--volume /var/run/lock:/var/run/lock:z \
|
--volume /var/run/lock:/var/run/lock:z \
|
||||||
--volume /opt/cni/bin:/opt/cni/bin:z \
|
--volume /opt/cni/bin:/opt/cni/bin:z \
|
||||||
k8s.gcr.io/hyperkube:v1.17.0 /hyperkube kubelet \
|
k8s.gcr.io/hyperkube:v1.17.0 kubelet \
|
||||||
--anonymous-auth=false \
|
--anonymous-auth=false \
|
||||||
--authentication-token-webhook \
|
--authentication-token-webhook \
|
||||||
--authorization-mode=Webhook \
|
--authorization-mode=Webhook \
|
||||||
@ -122,8 +122,8 @@ systemd:
|
|||||||
--volume /etc/kubernetes/bootstrap-secrets:/etc/kubernetes/secrets:ro,Z \
|
--volume /etc/kubernetes/bootstrap-secrets:/etc/kubernetes/secrets:ro,Z \
|
||||||
--volume /opt/bootstrap/assets:/assets:ro,Z \
|
--volume /opt/bootstrap/assets:/assets:ro,Z \
|
||||||
--volume /opt/bootstrap/apply:/apply:ro,Z \
|
--volume /opt/bootstrap/apply:/apply:ro,Z \
|
||||||
k8s.gcr.io/hyperkube:v1.17.0 \
|
--entrypoint=/apply \
|
||||||
/apply
|
k8s.gcr.io/hyperkube:v1.17.0
|
||||||
ExecStartPost=/bin/touch /opt/bootstrap/bootstrap.done
|
ExecStartPost=/bin/touch /opt/bootstrap/bootstrap.done
|
||||||
ExecStartPost=-/usr/bin/podman stop bootstrap
|
ExecStartPost=-/usr/bin/podman stop bootstrap
|
||||||
storage:
|
storage:
|
||||||
|
@ -50,7 +50,7 @@ systemd:
|
|||||||
--volume /var/run:/var/run \
|
--volume /var/run:/var/run \
|
||||||
--volume /var/run/lock:/var/run/lock:z \
|
--volume /var/run/lock:/var/run/lock:z \
|
||||||
--volume /opt/cni/bin:/opt/cni/bin:z \
|
--volume /opt/cni/bin:/opt/cni/bin:z \
|
||||||
k8s.gcr.io/hyperkube:v1.17.0 /hyperkube kubelet \
|
k8s.gcr.io/hyperkube:v1.17.0 kubelet \
|
||||||
--anonymous-auth=false \
|
--anonymous-auth=false \
|
||||||
--authentication-token-webhook \
|
--authentication-token-webhook \
|
||||||
--authorization-mode=Webhook \
|
--authorization-mode=Webhook \
|
||||||
|
@ -135,6 +135,7 @@ storage:
|
|||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.17.0
|
KUBELET_IMAGE_TAG=v1.17.0
|
||||||
|
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
|
||||||
- path: /opt/bootstrap/layout
|
- path: /opt/bootstrap/layout
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0544
|
mode: 0544
|
||||||
|
@ -97,6 +97,7 @@ storage:
|
|||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.17.0
|
KUBELET_IMAGE_TAG=v1.17.0
|
||||||
|
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
|
||||||
- path: /etc/sysctl.d/max-user-watches.conf
|
- path: /etc/sysctl.d/max-user-watches.conf
|
||||||
filesystem: root
|
filesystem: root
|
||||||
contents:
|
contents:
|
||||||
@ -117,7 +118,8 @@ storage:
|
|||||||
docker://k8s.gcr.io/hyperkube:v1.17.0 \
|
docker://k8s.gcr.io/hyperkube:v1.17.0 \
|
||||||
--net=host \
|
--net=host \
|
||||||
--dns=host \
|
--dns=host \
|
||||||
--exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname | tr '[:upper:]' '[:lower:]')
|
-- \
|
||||||
|
kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname | tr '[:upper:]' '[:lower:]')
|
||||||
passwd:
|
passwd:
|
||||||
users:
|
users:
|
||||||
- name: core
|
- name: core
|
||||||
|
@ -144,6 +144,7 @@ storage:
|
|||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.17.0
|
KUBELET_IMAGE_TAG=v1.17.0
|
||||||
|
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
|
||||||
- path: /etc/hostname
|
- path: /etc/hostname
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0644
|
mode: 0644
|
||||||
|
@ -92,6 +92,7 @@ storage:
|
|||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.17.0
|
KUBELET_IMAGE_TAG=v1.17.0
|
||||||
|
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
|
||||||
- path: /etc/hostname
|
- path: /etc/hostname
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0644
|
mode: 0644
|
||||||
|
@ -81,7 +81,7 @@ systemd:
|
|||||||
--volume /opt/cni/bin:/opt/cni/bin:z \
|
--volume /opt/cni/bin:/opt/cni/bin:z \
|
||||||
--volume /etc/iscsi:/etc/iscsi \
|
--volume /etc/iscsi:/etc/iscsi \
|
||||||
--volume /sbin/iscsiadm:/sbin/iscsiadm \
|
--volume /sbin/iscsiadm:/sbin/iscsiadm \
|
||||||
k8s.gcr.io/hyperkube:v1.17.0 /hyperkube kubelet \
|
k8s.gcr.io/hyperkube:v1.17.0 kubelet \
|
||||||
--anonymous-auth=false \
|
--anonymous-auth=false \
|
||||||
--authentication-token-webhook \
|
--authentication-token-webhook \
|
||||||
--authorization-mode=Webhook \
|
--authorization-mode=Webhook \
|
||||||
@ -133,8 +133,8 @@ systemd:
|
|||||||
--volume /etc/kubernetes/bootstrap-secrets:/etc/kubernetes/secrets:ro,Z \
|
--volume /etc/kubernetes/bootstrap-secrets:/etc/kubernetes/secrets:ro,Z \
|
||||||
--volume /opt/bootstrap/assets:/assets:ro,Z \
|
--volume /opt/bootstrap/assets:/assets:ro,Z \
|
||||||
--volume /opt/bootstrap/apply:/apply:ro,Z \
|
--volume /opt/bootstrap/apply:/apply:ro,Z \
|
||||||
k8s.gcr.io/hyperkube:v1.17.0 \
|
--entrypoint=/apply \
|
||||||
/apply
|
k8s.gcr.io/hyperkube:v1.17.0
|
||||||
ExecStartPost=/bin/touch /opt/bootstrap/bootstrap.done
|
ExecStartPost=/bin/touch /opt/bootstrap/bootstrap.done
|
||||||
ExecStartPost=-/usr/bin/podman stop bootstrap
|
ExecStartPost=-/usr/bin/podman stop bootstrap
|
||||||
storage:
|
storage:
|
||||||
|
@ -51,7 +51,7 @@ systemd:
|
|||||||
--volume /opt/cni/bin:/opt/cni/bin:z \
|
--volume /opt/cni/bin:/opt/cni/bin:z \
|
||||||
--volume /etc/iscsi:/etc/iscsi \
|
--volume /etc/iscsi:/etc/iscsi \
|
||||||
--volume /sbin/iscsiadm:/sbin/iscsiadm \
|
--volume /sbin/iscsiadm:/sbin/iscsiadm \
|
||||||
k8s.gcr.io/hyperkube:v1.17.0 /hyperkube kubelet \
|
k8s.gcr.io/hyperkube:v1.17.0 kubelet \
|
||||||
--anonymous-auth=false \
|
--anonymous-auth=false \
|
||||||
--authentication-token-webhook \
|
--authentication-token-webhook \
|
||||||
--authorization-mode=Webhook \
|
--authorization-mode=Webhook \
|
||||||
|
@ -141,6 +141,7 @@ storage:
|
|||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.17.0
|
KUBELET_IMAGE_TAG=v1.17.0
|
||||||
|
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
|
||||||
- path: /opt/bootstrap/layout
|
- path: /opt/bootstrap/layout
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0544
|
mode: 0544
|
||||||
|
@ -100,6 +100,7 @@ storage:
|
|||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.17.0
|
KUBELET_IMAGE_TAG=v1.17.0
|
||||||
|
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
|
||||||
- path: /etc/sysctl.d/max-user-watches.conf
|
- path: /etc/sysctl.d/max-user-watches.conf
|
||||||
filesystem: root
|
filesystem: root
|
||||||
contents:
|
contents:
|
||||||
@ -120,4 +121,5 @@ storage:
|
|||||||
docker://k8s.gcr.io/hyperkube:v1.17.0 \
|
docker://k8s.gcr.io/hyperkube:v1.17.0 \
|
||||||
--net=host \
|
--net=host \
|
||||||
--dns=host \
|
--dns=host \
|
||||||
--exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
|
-- \
|
||||||
|
kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
|
||||||
|
@ -136,6 +136,7 @@ storage:
|
|||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.17.0
|
KUBELET_IMAGE_TAG=v1.17.0
|
||||||
|
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
|
||||||
- path: /opt/bootstrap/layout
|
- path: /opt/bootstrap/layout
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0544
|
mode: 0544
|
||||||
|
@ -98,6 +98,7 @@ storage:
|
|||||||
inline: |
|
inline: |
|
||||||
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
|
||||||
KUBELET_IMAGE_TAG=v1.17.0
|
KUBELET_IMAGE_TAG=v1.17.0
|
||||||
|
KUBELET_IMAGE_ARGS="--exec=/usr/local/bin/kubelet"
|
||||||
- path: /etc/sysctl.d/max-user-watches.conf
|
- path: /etc/sysctl.d/max-user-watches.conf
|
||||||
filesystem: root
|
filesystem: root
|
||||||
contents:
|
contents:
|
||||||
@ -118,7 +119,8 @@ storage:
|
|||||||
docker://k8s.gcr.io/hyperkube:v1.17.0 \
|
docker://k8s.gcr.io/hyperkube:v1.17.0 \
|
||||||
--net=host \
|
--net=host \
|
||||||
--dns=host \
|
--dns=host \
|
||||||
--exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
|
-- \
|
||||||
|
kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)
|
||||||
passwd:
|
passwd:
|
||||||
users:
|
users:
|
||||||
- name: core
|
- name: core
|
||||||
|
Loading…
Reference in New Issue
Block a user