Convert to systemd-sysext

.github/workflows/torcx.yml → .github/workflows/sysext.yml

@@ -15,8 +15,8 @@ jobs:
 
       - uses: actions/upload-artifact@v2
         with:
-          name: 'torcx-addons'
-          path: 'torcx.*'
+          name: 'sysext'
+          path: 'sysext.raw'
 
   release:
     if: startsWith(github.ref, 'refs/tags/')
@@ -26,15 +26,15 @@ jobs:
     steps:
       - uses: actions/download-artifact@v2
         with:
-          name: 'torcx-addons'
+          name: 'sysext'
 
       - id: release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
+          tag_name: ${{ github.ref_name }}
+          release_name: Release ${{ github.ref_name }}
           draft: false
           prerelease: false
 
@@ -43,15 +43,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.release.outputs.upload_url }}
-          asset_name: 'torcx.tgz'
-          asset_path: 'torcx.tgz'
-          asset_content_type: application/gzip
-
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.release.outputs.upload_url }}
-          asset_name: 'torcx.squashfs'
-          asset_path: 'torcx.squashfs'
+          asset_name: 'kubernetes-${{ github.ref_name }}.raw'
+          asset_path: 'sysext.raw'
           asset_content_type: application/octet-stream

Makefile

@@ -1,4 +1,4 @@
-build: torcx.tgz torcx.squashfs
+build: sysext.raw
 
 
 cni.tar.gz:
@@ -23,13 +23,10 @@ helm: helm.tar.gz
 	tar -xzf helm.tar.gz
 
 
-torcx: cni kube-node helm
-	mkdir -p rootfs/bin
-	cp -ar kubernetes/node/bin/* rootfs/bin/
-	cp -a linux-amd64/helm rootfs/bin/
+sysext: cni kube-node helm
+	mkdir -p rootfs/usr/bin
+	cp -ar kubernetes/node/bin/* rootfs/usr/bin/
+	cp -a linux-amd64/helm rootfs/usr/bin/
 
-torcx.tgz: torcx
-	tar -C rootfs -czf torcx.tgz .
-
-torcx.squashfs: torcx
-	mksquashfs rootfs torcx.squashfs
+sysext.raw: sysext
+	mksquashfs rootfs sysext.raw -all-root

rootfs/usr/lib/extension-release.d/extension-release.kubernetes

@@ -0,0 +1,3 @@
+ID=flatcar
+SYSEXT_LEVEL=1.0
+ARCHITECTURE=x86-64

rootfs/usr/lib/systemd/system/kube-proxy.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Kubernetes Kube-Proxy Server
+After=network.target
+Requires=network.target
+
+[Service]
+EnvironmentFile=-/etc/default/kubernetes
+ExecStart=/usr/bin/kube-proxy --config=/etc/kubernetes/kube-proxy.yaml \
+  $KUBE_PROXY_OPTIONS
+LimitNOFILE=65536
+
+[Install]
+WantedBy=multi-user.target

rootfs/lib/systemd/system/kubelet.service → rootfs/usr/lib/systemd/system/kubelet.service

@@ -1,21 +1,15 @@
 [Unit]
-Requires=torcx.target
-After=torcx.target
 Description=Kubernetes Kubelet Server
 After=containerd.service
 Requires=containerd.service
-RequiresMountsFor=/opt/cni
 
 [Service]
-EnvironmentFile=/run/metadata/torcx
 EnvironmentFile=-/etc/default/kubernetes
-ExecStart=/usr/bin/env ${TORCX_BINDIR}/kubelet --config=/etc/kubernetes/kubelet.yaml \
+ExecStart=/usr/bin/kubelet --config=/etc/kubernetes/kubelet.yaml \
   --container-runtime=remote \
   --container-runtime-endpoint=unix:///run/docker/libcontainerd/docker-containerd.sock \
   --kubeconfig=/etc/kubernetes/kubelet.kubeconfig \
   $KUBELET_OPTIONS
-Restart=always
-RestartSec=5
 KillMode=process
 
 [Install]

rootfs/usr/lib/systemd/system/multi-user.target.d/10-kubernetes.conf

@@ -0,0 +1,3 @@
+[Unit]
+Upholds=kube-proxy.service
+Upholds=kubelet.service