Update package to support aarch64 + service.env

4 files changed, 37 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc1d6ec2ed09..7ae41ba452a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,23 @@
 pkgbase = k3s-bin
 	pkgdesc = Lightweight Kubernetes
 	pkgver = 0.10.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://k3s.io
 	arch = x86_64
 	arch = armv7h
+	arch = aarch64
 	license = Apache
 	conflicts = k3s-git
-	source = k3s-0.10.1-x86_64::https://github.com/rancher/k3s/releases/download/v0.10.1/k3s
 	source = k3s.service
-	sha256sums = 154c18c8b123e21177e1c41c17044f6525cb0a4700c886cae428fb182c7482e4
-	sha256sums = 34a7f893878c5f72dfc7f89fafde5936f5813179b24f0a7e74f385b024d31d6c
+	source = k3s.service.env
+	sha256sums = f4ae496b69b3dd376a28298df50297728a47761b041be522adf2537aa8a8c3d8
+	sha256sums = 667199fa6b811dde3aef3e626e2695a566ad64c9a03d19d0c94a1f104a7612d0
+	source_x86_64 = k3s-0.10.1-x86_64::https://github.com/rancher/k3s/releases/download/v0.10.1/k3s
+	sha256sums_x86_64 = 154c18c8b123e21177e1c41c17044f6525cb0a4700c886cae428fb182c7482e4
 	source_armv7h = k3s-0.10.1-armv7h::https://github.com/rancher/k3s/releases/download/v0.10.1/k3s-armhf
-	source_armv7h = k3s.service
 	sha256sums_armv7h = 8d7ad36a4c3b6e016a3b665647629750afbacc27fdd8250ec209d04acd9339cc
-	sha256sums_armv7h = 34a7f893878c5f72dfc7f89fafde5936f5813179b24f0a7e74f385b024d31d6c
+	source_aarch64 = k3s-0.10.1-aarch64::https://github.com/rancher/k3s/releases/download/v0.10.1/k3s-arm64
+	sha256sums_aarch64 = 772fd3123dacc830923feeb80504f0503622e299d4a88c43b9aa48f5db95a191
 
 pkgname = k3s-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 14574735537b..e7147aac5fd1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,45 @@
 # Maintainer: duxet <duxetlg@gmail.com>
-
 pkgname=k3s-bin
 pkgver=0.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight Kubernetes"
 url="https://k3s.io"
 license=('Apache')
-arch=('x86_64' 'armv7h')
+arch=('x86_64' 'armv7h' 'aarch64')
 conflicts=('k3s-git')
 
 source=(
-  "k3s-${pkgver}-x86_64::https://github.com/rancher/k3s/releases/download/v${pkgver}/k3s"
   "k3s.service"
+  "k3s.service.env"
+)
+
+source_x86_64=(
+  "k3s-${pkgver}-x86_64::https://github.com/rancher/k3s/releases/download/v${pkgver}/k3s"
 )
 
 source_armv7h=(
   "k3s-${pkgver}-armv7h::https://github.com/rancher/k3s/releases/download/v${pkgver}/k3s-armhf"
-  "k3s.service"
 )
 
-sha256sums=('154c18c8b123e21177e1c41c17044f6525cb0a4700c886cae428fb182c7482e4'
-            '34a7f893878c5f72dfc7f89fafde5936f5813179b24f0a7e74f385b024d31d6c')
-sha256sums_armv7h=('8d7ad36a4c3b6e016a3b665647629750afbacc27fdd8250ec209d04acd9339cc'
-                   '34a7f893878c5f72dfc7f89fafde5936f5813179b24f0a7e74f385b024d31d6c')
+source_aarch64=(
+  "k3s-${pkgver}-aarch64::https://github.com/rancher/k3s/releases/download/v${pkgver}/k3s-arm64"
+)
+
+sha256sums=('f4ae496b69b3dd376a28298df50297728a47761b041be522adf2537aa8a8c3d8'
+            '667199fa6b811dde3aef3e626e2695a566ad64c9a03d19d0c94a1f104a7612d0')
+sha256sums_x86_64=('154c18c8b123e21177e1c41c17044f6525cb0a4700c886cae428fb182c7482e4')
+sha256sums_armv7h=('8d7ad36a4c3b6e016a3b665647629750afbacc27fdd8250ec209d04acd9339cc')
+sha256sums_aarch64=('772fd3123dacc830923feeb80504f0503622e299d4a88c43b9aa48f5db95a191')
+
+
 
 
 package() {
   install -Dm 755 $srcdir/k3s-${pkgver}-${CARCH} $pkgdir/usr/bin/k3s
 
   install -dm 755 $pkgdir/usr/lib/systemd/system
+  install -dm 755 $pkgdir/etc/systemd/system
+
   install -m 644 $srcdir/k3s.service $pkgdir/usr/lib/systemd/system/k3s.service
+  install -m 400 $srcdir/k3s.service.env $pkgdir/etc/systemd/system/k3s.service.env
 }
diff --git a/k3s.service b/k3s.service
index 2c238d0608d7..fe760f49879d 100644
--- a/k3s.service
+++ b/k3s.service
@@ -5,6 +5,9 @@ After=network-online.target
 
 [Service]
 Type=notify
+EnvironmentFile=/etc/systemd/system/k3s.service.env
+ExecStartPre=-/sbin/modprobe br_netfilter
+ExecStartPre=-/sbin/modprobe overlay
 ExecStart=/usr/bin/k3s server
 KillMode=process
 Delegate=yes
@@ -14,6 +17,7 @@ LimitCORE=infinity
 TasksMax=infinity
 TimeoutStartSec=0
 Restart=always
+RestartSec=5s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/k3s.service.env b/k3s.service.env
new file mode 100644
index 000000000000..384209c86070
--- /dev/null
+++ b/k3s.service.env
@@ -0,0 +1,3 @@
+# K3S_URL=
+# K3S_TOKEN=
+# K3S_CLUSTER_SECRET=