Use kubelet system container on fedora-atomic

* Use the upstream hyperkube image packaged with the required metadata to be usable as a system container under systemd * Fix port-forward since socat is included
2024-12-24 04:19:33 +01:00 · 2018-04-07 00:47:33 -07:00 · 2018-04-07 00:47:33 -07:00 · 19bc5aea9e
commit 19bc5aea9e
parent 8d7cfc1a45
6 changed files with 67 additions and 146 deletions
--- a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl
+++ b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl
@ -18,13 +18,11 @@ write_files:
      ETCD_PEER_CERT_FILE=/etc/ssl/certs/etcd/peer.crt
      ETCD_PEER_KEY_FILE=/etc/ssl/certs/etcd/peer.key
      ETCD_PEER_CLIENT_CERT_AUTH=true
-  - path: /etc/systemd/system/kubelet.service
+  - path: /etc/systemd/system/kubelet.service.d/10-typhoon.conf
    content: |
      [Unit]
-      Description=Kubelet
      Wants=rpc-statd.service
      [Service]
-      WorkingDirectory=/etc/kubernetes
      ExecStartPre=/bin/mkdir -p /opt/cni/bin
      ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
      ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d
@ -33,14 +31,12 @@ write_files:
      ExecStartPre=/bin/mkdir -p /var/lib/cni
      ExecStartPre=/bin/mkdir -p /var/lib/kubelet/volumeplugins
      ExecStartPre=/usr/bin/bash -c "grep 'certificate-authority-data' /etc/kubernetes/kubeconfig | awk '{print $2}' | base64 -d > /etc/kubernetes/ca.crt"
-      # Atomic's system containers and RPMs are old and unfriendly. Use this.
-      ExecStartPre=/usr/bin/curl -L https://dl.k8s.io/v1.10.0/kubernetes-node-linux-amd64.tar.gz -o kubernetes-node-linux-amd64.tar.gz
-      ExecStartPre=/usr/bin/tar xzf kubernetes-node-linux-amd64.tar.gz -C /usr/local/bin --strip-components=3 kubernetes/node/bin/kubelet 
-      ExecStart=
-      ExecStart=/usr/local/bin/kubelet \
-        --allow-privileged \
+      Restart=always
+      RestartSec=10
+  - path: /etc/kubernetes/kubelet.conf
+    content: |
+      ARGS="--allow-privileged \
        --anonymous-auth=false \
-        --cgroup-driver=systemd \
        --client-ca-file=/etc/kubernetes/ca.crt \
        --cluster_dns=${k8s_dns_service_ip} \
        --cluster_domain=${cluster_domain_suffix} \
@ -53,19 +49,11 @@ write_files:
        --node-labels=node-role.kubernetes.io/controller="true" \
        --pod-manifest-path=/etc/kubernetes/manifests \
        --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
-        --volume-plugin-dir=/var/lib/kubelet/volumeplugins
-      Restart=always
-      RestartSec=10
-      [Install]
-      WantedBy=multi-user.target 
-  - path: /etc/systemd/system/kubelet.path
+        --volume-plugin-dir=/var/lib/kubelet/volumeplugins"
+  - path: /etc/kubernetes/kubeconfig
+    permissions: '0644'
    content: |
-      [Unit]
-      Description=Watch for kubeconfig
-      [Path]
-      PathExists=/etc/kubernetes/kubeconfig
-      [Install]
-      WantedBy=multi-user.target
+      ${kubeconfig}
  - path: /etc/systemd/system/bootkube.service
    content: |
      [Unit]
@ -80,17 +68,6 @@ write_files:
      ExecStartPost=/bin/touch /var/bootkube/init_bootkube.done
      [Install]
      WantedBy=multi-user.target
-  - path: /etc/kubernetes/.keep
-  - path: /etc/kubernetes/kubeconfig
-    permissions: '0644'
-    content: |
-      ${kubeconfig}
-  - path: /etc/selinux/config
-    owner: root:root
-    permissions: '0644'
-    content: |
-      SELINUX=permissive
-      SELINUXTYPE=targeted
  - path: /var/bootkube/.keep
  - path: /usr/local/bin/bootkube-start
    permissions: '0755'
@ -104,13 +81,19 @@ write_files:
        --volume /var/bootkube/assets:/assets:Z \
        --entrypoint=/bootkube \
        quay.io/coreos/bootkube:v0.11.0 start --asset-dir=/assets
+  - path: /etc/selinux/config
+    owner: root:root
+    permissions: '0644'
+    content: |
+      SELINUX=permissive
+      SELINUXTYPE=targeted
 bootcmd:
  - [setenforce, Permissive]
 runcmd:
  - [systemctl, daemon-reload]
  - "atomic install --system --name=etcd quay.io/dghubble/etcd:99f87f9245ef2b2104fe2fc3550c21327b5a980f"
  - [systemctl, start, --no-block, etcd.service]
-  - [systemctl, enable, kubelet.service]
+  - "atomic install --system --name=kubelet quay.io/dghubble/hyper:f384aae1ffb04fbe303ee55d1fa3c09bc72bf146"
  - [systemctl, start, --no-block, kubelet.service]
  - [systemctl, disable, firewalld, --now]
 users:
--- a/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl
+++ b/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl
@ -1,28 +1,22 @@
 #cloud-config
 write_files:
-  - path: /etc/systemd/system/kubelet.service
+  - path: /etc/systemd/system/kubelet.service.d/10-typhoon.conf
    content: |
      [Unit]
-      Description=Kubelet
      Wants=rpc-statd.service
      [Service]
-      WorkingDirectory=/etc/kubernetes
      ExecStartPre=/bin/mkdir -p /opt/cni/bin
      ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
      ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d
-      ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets
-      ExecStartPre=/bin/mkdir -p /etc/kubernetes/inactive-manifests
      ExecStartPre=/bin/mkdir -p /var/lib/cni
      ExecStartPre=/bin/mkdir -p /var/lib/kubelet/volumeplugins
      ExecStartPre=/usr/bin/bash -c "grep 'certificate-authority-data' /etc/kubernetes/kubeconfig | awk '{print $2}' | base64 -d > /etc/kubernetes/ca.crt"
-      # Atomic's system containers and RPMs are old and unfriendly. Use this.
-      ExecStartPre=/usr/bin/curl -L https://dl.k8s.io/v1.10.0/kubernetes-node-linux-amd64.tar.gz -o kubernetes-node-linux-amd64.tar.gz
-      ExecStartPre=/usr/bin/tar xzf kubernetes-node-linux-amd64.tar.gz -C /usr/local/bin --strip-components=3 kubernetes/node/bin/kubelet 
-      ExecStart=
-      ExecStart=/usr/local/bin/kubelet \
-        --allow-privileged \
+      Restart=always
+      RestartSec=10
+  - path: /etc/kubernetes/kubelet.conf
+    content: |
+      ARGS="--allow-privileged \
        --anonymous-auth=false \
-        --cgroup-driver=systemd \
        --client-ca-file=/etc/kubernetes/ca.crt \
        --cluster_dns=${k8s_dns_service_ip} \
        --cluster_domain=${cluster_domain_suffix} \
@ -33,20 +27,7 @@ write_files:
        --network-plugin=cni \
        --node-labels=node-role.kubernetes.io/node \
        --pod-manifest-path=/etc/kubernetes/manifests \
-        --volume-plugin-dir=/var/lib/kubelet/volumeplugins
-      Restart=always
-      RestartSec=10
-      [Install]
-      WantedBy=multi-user.target 
-  - path: /etc/systemd/system/kubelet.path
-    content: |
-      [Unit]
-      Description=Watch for kubeconfig
-      [Path]
-      PathExists=/etc/kubernetes/kubeconfig
-      [Install]
-      WantedBy=multi-user.target
-  - path: /etc/kubernetes/.keep
+        --volume-plugin-dir=/var/lib/kubelet/volumeplugins"
  - path: /etc/kubernetes/kubeconfig
    permissions: '0644'
    content: |
@ -60,9 +41,10 @@ write_files:
 bootcmd:
  - [setenforce, Permissive]
 runcmd:
-  - [systemctl, daemon-reload]
-  - [systemctl, disable, firewalld, --now]
-  - [systemctl, enable, kubelet.service, --now]
+  - systemctl daemon-reload
+  - "atomic install --system --name=kubelet quay.io/dghubble/hyper:f384aae1ffb04fbe303ee55d1fa3c09bc72bf146"
+  - systemctl start --no-block kubelet.service
+  - systemctl disable firewalld --now
 users:
  - default
  - name: fedora
--- a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl
+++ b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl
@ -18,13 +18,11 @@ write_files:
      ETCD_PEER_CERT_FILE=/etc/ssl/certs/etcd/peer.crt
      ETCD_PEER_KEY_FILE=/etc/ssl/certs/etcd/peer.key
      ETCD_PEER_CLIENT_CERT_AUTH=true
-  - path: /etc/systemd/system/kubelet.service
+  - path: /etc/systemd/system/kubelet.service.d/10-typhoon.conf
    content: |
      [Unit]
-      Description=Kubelet
      Wants=rpc-statd.service
      [Service]
-      WorkingDirectory=/etc/kubernetes
      ExecStartPre=/bin/mkdir -p /opt/cni/bin
      ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
      ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d
@ -33,14 +31,12 @@ write_files:
      ExecStartPre=/bin/mkdir -p /var/lib/cni
      ExecStartPre=/bin/mkdir -p /var/lib/kubelet/volumeplugins
      ExecStartPre=/usr/bin/bash -c "grep 'certificate-authority-data' /etc/kubernetes/kubeconfig | awk '{print $2}' | base64 -d > /etc/kubernetes/ca.crt"
-      # Atomic's system containers and RPMs are old and unfriendly. Use this.
-      ExecStartPre=/usr/bin/curl -L https://dl.k8s.io/v1.10.0/kubernetes-node-linux-amd64.tar.gz -o kubernetes-node-linux-amd64.tar.gz
-      ExecStartPre=/usr/bin/tar xzf kubernetes-node-linux-amd64.tar.gz -C /usr/local/bin --strip-components=3 kubernetes/node/bin/kubelet 
-      ExecStart=
-      ExecStart=/usr/local/bin/kubelet \
-        --allow-privileged \
+      Restart=always
+      RestartSec=10
+  - path: /etc/kubernetes/kubelet.conf
+    content: |
+      ARGS="--allow-privileged \
        --anonymous-auth=false \
-        --cgroup-driver=systemd \
        --client-ca-file=/etc/kubernetes/ca.crt \
        --cluster_dns=${k8s_dns_service_ip} \
        --cluster_domain=${cluster_domain_suffix} \
@ -54,11 +50,7 @@ write_files:
        --node-labels=node-role.kubernetes.io/controller="true" \
        --pod-manifest-path=/etc/kubernetes/manifests \
        --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
-        --volume-plugin-dir=/var/lib/kubelet/volumeplugins
-      Restart=always
-      RestartSec=10
-      [Install]
-      WantedBy=multi-user.target 
+        --volume-plugin-dir=/var/lib/kubelet/volumeplugins"
  - path: /etc/systemd/system/kubelet.path
    content: |
      [Unit]
@ -81,7 +73,6 @@ write_files:
      ExecStartPost=/bin/touch /var/bootkube/init_bootkube.done
      [Install]
      WantedBy=multi-user.target
-  - path: /etc/kubernetes/.keep
  - path: /var/bootkube/.keep
  - path: /etc/selinux/config
    owner: root:root
@ -108,6 +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"
  - [systemctl, enable, kubelet.path]
  - [systemctl, start, --no-block, kubelet.path]
  - [systemctl, disable, firewalld, --now]
--- a/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl
+++ b/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl
@ -1,28 +1,22 @@
 #cloud-config
 write_files:
-  - path: /etc/systemd/system/kubelet.service
+  - path: /etc/systemd/system/kubelet.service.d/10-typhoon.conf
    content: |
      [Unit]
-      Description=Kubelet
      Wants=rpc-statd.service
      [Service]
-      WorkingDirectory=/etc/kubernetes
      ExecStartPre=/bin/mkdir -p /opt/cni/bin
      ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
      ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d
-      ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets
-      ExecStartPre=/bin/mkdir -p /etc/kubernetes/inactive-manifests
      ExecStartPre=/bin/mkdir -p /var/lib/cni
      ExecStartPre=/bin/mkdir -p /var/lib/kubelet/volumeplugins
      ExecStartPre=/usr/bin/bash -c "grep 'certificate-authority-data' /etc/kubernetes/kubeconfig | awk '{print $2}' | base64 -d > /etc/kubernetes/ca.crt"
-      # Atomic's system containers and RPMs are old and unfriendly. Use this.
-      ExecStartPre=/usr/bin/curl -L https://dl.k8s.io/v1.10.0/kubernetes-node-linux-amd64.tar.gz -o kubernetes-node-linux-amd64.tar.gz
-      ExecStartPre=/usr/bin/tar xzf kubernetes-node-linux-amd64.tar.gz -C /usr/local/bin --strip-components=3 kubernetes/node/bin/kubelet 
-      ExecStart=
-      ExecStart=/usr/local/bin/kubelet \
-        --allow-privileged \
+      Restart=always
+      RestartSec=10
+  - path: /etc/kubernetes/kubelet.conf
+    content: |
+      ARGS="--allow-privileged \
        --anonymous-auth=false \
-        --cgroup-driver=systemd \
        --client-ca-file=/etc/kubernetes/ca.crt \
        --cluster_dns=${k8s_dns_service_ip} \
        --cluster_domain=${cluster_domain_suffix} \
@ -34,11 +28,7 @@ write_files:
        --network-plugin=cni \
        --node-labels=node-role.kubernetes.io/node \
        --pod-manifest-path=/etc/kubernetes/manifests \
-        --volume-plugin-dir=/var/lib/kubelet/volumeplugins
-      Restart=always
-      RestartSec=10
-      [Install]
-      WantedBy=multi-user.target 
+        --volume-plugin-dir=/var/lib/kubelet/volumeplugins"
  - path: /etc/systemd/system/kubelet.path
    content: |
      [Unit]
@ -47,7 +37,6 @@ write_files:
      PathExists=/etc/kubernetes/kubeconfig
      [Install]
      WantedBy=multi-user.target
-  - path: /etc/kubernetes/.keep
  - path: /etc/selinux/config
    owner: root:root
    permissions: '0644'
@ -59,6 +48,7 @@ bootcmd:
 runcmd:
  - [systemctl, daemon-reload]
  - [hostnamectl, set-hostname, ${domain_name}]
+  - "atomic install --system --name=kubelet quay.io/dghubble/hyper:f384aae1ffb04fbe303ee55d1fa3c09bc72bf146"
  - [systemctl, enable, kubelet.path]
  - [systemctl, start, --no-block, kubelet.path]
  - [systemctl, disable, firewalld, --now]
--- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl
+++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl
@ -26,23 +26,18 @@ write_files:
      Type=oneshot
      Environment=OUTPUT=/run/metadata/digitalocean
      ExecStart=/usr/bin/mkdir -p /run/metadata
-      ExecStart=/usr/bin/bash -c 'echo "DIGITALOCEAN_IPV4_PUBLIC_0=$(curl\
-        --url http://169.254.169.254/metadata/v1/interfaces/public/0/ipv4/address\
-        --retry 10)\nDIGITALOCEAN_IPV4_PRIVATE_0=$(curl\
+      ExecStart=/usr/bin/bash -c 'echo "PRIVATE_IPV4=$(curl\
        --url http://169.254.169.254/metadata/v1/interfaces/private/0/ipv4/address\
        --retry 10)" > $${OUTPUT}'
      [Install]
      WantedBy=multi-user.target
-  - path: /etc/systemd/system/kubelet.service
+  - path: /etc/systemd/system/kubelet.service.d/10-typhoon.conf
    content: |
      [Unit]
-      Description=Kubelet
      Requires=cloud-metadata.service
      After=cloud-metadata.service
      Wants=rpc-statd.service
      [Service]
-      WorkingDirectory=/etc/kubernetes
-      EnvironmentFile=/run/metadata/digitalocean
      ExecStartPre=/bin/mkdir -p /opt/cni/bin
      ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
      ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d
@ -51,20 +46,17 @@ write_files:
      ExecStartPre=/bin/mkdir -p /var/lib/cni
      ExecStartPre=/bin/mkdir -p /var/lib/kubelet/volumeplugins
      ExecStartPre=/usr/bin/bash -c "grep 'certificate-authority-data' /etc/kubernetes/kubeconfig | awk '{print $2}' | base64 -d > /etc/kubernetes/ca.crt"
-      # Atomic's system containers and RPMs are old and unfriendly. Use this.
-      ExecStartPre=/usr/bin/curl -L https://dl.k8s.io/v1.10.0/kubernetes-node-linux-amd64.tar.gz -o kubernetes-node-linux-amd64.tar.gz
-      ExecStartPre=/usr/bin/tar xzf kubernetes-node-linux-amd64.tar.gz -C /usr/local/bin --strip-components=3 kubernetes/node/bin/kubelet 
-      ExecStart=
-      ExecStart=/usr/local/bin/kubelet \
-        --allow-privileged \
+      Restart=always
+      RestartSec=10
+  - path: /etc/kubernetes/kubelet.conf
+    content: |
+      ARGS="--allow-privileged \
        --anonymous-auth=false \
-        --cgroup-driver=systemd \
        --client-ca-file=/etc/kubernetes/ca.crt \
        --cluster_dns=${k8s_dns_service_ip} \
        --cluster_domain=${cluster_domain_suffix} \
        --cni-conf-dir=/etc/kubernetes/cni/net.d \
        --exit-on-lock-contention \
-        --hostname-override=$${DIGITALOCEAN_IPV4_PRIVATE_0} \
        --kubeconfig=/etc/kubernetes/kubeconfig \
        --lock-file=/var/run/lock/kubelet.lock \
        --network-plugin=cni \
@ -72,11 +64,7 @@ write_files:
        --node-labels=node-role.kubernetes.io/controller="true" \
        --pod-manifest-path=/etc/kubernetes/manifests \
        --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
-        --volume-plugin-dir=/var/lib/kubelet/volumeplugins
-      Restart=always
-      RestartSec=10
-      [Install]
-      WantedBy=multi-user.target 
+        --volume-plugin-dir=/var/lib/kubelet/volumeplugins"
  - path: /etc/systemd/system/kubelet.path
    content: |
      [Unit]
@ -99,7 +87,6 @@ write_files:
      ExecStartPost=/bin/touch /var/bootkube/init_bootkube.done
      [Install]
      WantedBy=multi-user.target
-  - path: /etc/kubernetes/.keep
  - path: /var/bootkube/.keep
  - path: /etc/selinux/config
    owner: root:root
@ -126,6 +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"
  - [systemctl, enable, kubelet.path]
  - [systemctl, start, --no-block, kubelet.path]
  - [systemctl, disable, firewalld, --now]
--- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl
+++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl
@ -8,55 +8,41 @@ write_files:
      Type=oneshot
      Environment=OUTPUT=/run/metadata/digitalocean
      ExecStart=/usr/bin/mkdir -p /run/metadata
-      ExecStart=/usr/bin/bash -c 'echo "DIGITALOCEAN_IPV4_PUBLIC_0=$(curl\
-        --url http://169.254.169.254/metadata/v1/interfaces/public/0/ipv4/address\
-        --retry 10)\nDIGITALOCEAN_IPV4_PRIVATE_0=$(curl\
+      ExecStart=/usr/bin/bash -c 'echo "PRIVATE_IPV4=$(curl\
        --url http://169.254.169.254/metadata/v1/interfaces/private/0/ipv4/address\
        --retry 10)" > $${OUTPUT}'
      [Install]
      WantedBy=multi-user.target
-  - path: /etc/systemd/system/kubelet.service
+  - path: /etc/systemd/system/kubelet.service.d/10-typhoon.conf
    content: |
      [Unit]
-      Description=Kubelet
      Requires=cloud-metadata.service
      After=cloud-metadata.service
      Wants=rpc-statd.service
      [Service]
-      WorkingDirectory=/etc/kubernetes
-      EnvironmentFile=/run/metadata/digitalocean
      ExecStartPre=/bin/mkdir -p /opt/cni/bin
      ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
      ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d
-      ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets
-      ExecStartPre=/bin/mkdir -p /etc/kubernetes/inactive-manifests
      ExecStartPre=/bin/mkdir -p /var/lib/cni
      ExecStartPre=/bin/mkdir -p /var/lib/kubelet/volumeplugins
      ExecStartPre=/usr/bin/bash -c "grep 'certificate-authority-data' /etc/kubernetes/kubeconfig | awk '{print $2}' | base64 -d > /etc/kubernetes/ca.crt"
-      # Atomic's system containers and RPMs are old and unfriendly. Use this.
-      ExecStartPre=/usr/bin/curl -L https://dl.k8s.io/v1.10.0/kubernetes-node-linux-amd64.tar.gz -o kubernetes-node-linux-amd64.tar.gz
-      ExecStartPre=/usr/bin/tar xzf kubernetes-node-linux-amd64.tar.gz -C /usr/local/bin --strip-components=3 kubernetes/node/bin/kubelet 
-      ExecStart=
-      ExecStart=/usr/local/bin/kubelet \
-        --allow-privileged \
+      Restart=always
+      RestartSec=10
+  - path: /etc/kubernetes/kubelet.conf
+    content: |
+      ARGS="--allow-privileged \
        --anonymous-auth=false \
-        --cgroup-driver=systemd \
        --client-ca-file=/etc/kubernetes/ca.crt \
        --cluster_dns=${k8s_dns_service_ip} \
        --cluster_domain=${cluster_domain_suffix} \
        --cni-conf-dir=/etc/kubernetes/cni/net.d \
        --exit-on-lock-contention \
-        --hostname-override=$${DIGITALOCEAN_IPV4_PRIVATE_0} \
        --kubeconfig=/etc/kubernetes/kubeconfig \
        --lock-file=/var/run/lock/kubelet.lock \
        --network-plugin=cni \
        --node-labels=node-role.kubernetes.io/node \
        --pod-manifest-path=/etc/kubernetes/manifests \
-        --volume-plugin-dir=/var/lib/kubelet/volumeplugins
-      Restart=always
-      RestartSec=10
-      [Install]
-      WantedBy=multi-user.target 
+        --volume-plugin-dir=/var/lib/kubelet/volumeplugins"
  - path: /etc/systemd/system/kubelet.path
    content: |
      [Unit]
@ -65,7 +51,6 @@ write_files:
      PathExists=/etc/kubernetes/kubeconfig
      [Install]
      WantedBy=multi-user.target
-  - path: /etc/kubernetes/.keep
  - path: /etc/selinux/config
    owner: root:root
    permissions: '0644'
@ -75,11 +60,12 @@ write_files:
 bootcmd:
  - [setenforce, Permissive]
 runcmd:
-  - [systemctl, daemon-reload]
-  - [systemctl, enable, kubelet.path]
-  - [systemctl, enable, cloud-metadata.service]
-  - [systemctl, start, --no-block, kubelet.path]
-  - [systemctl, disable, firewalld, --now]
+  - systemctl daemon-reload
+  - systemctl enable cloud-metadata.service
+  - "atomic install --system --name=kubelet quay.io/dghubble/hyper:f384aae1ffb04fbe303ee55d1fa3c09bc72bf146"
+  - systemctl enable kubelet.path
+  - systemctl start --no-block kubelet.path
+  - systemctl disable firewalld --now
 users:
  - default
  - name: fedora