diff options
author | Thomas Scheller | 2021-10-07 18:07:26 +0200 |
---|---|---|
committer | Thomas Scheller | 2021-10-07 18:07:26 +0200 |
commit | 0a44cad9d24302064f5385b553802b207169c7d0 (patch) | |
tree | 181afc7003bba6e7f1d270dbf706204cda6d9bb5 | |
parent | b75c31419b561e5ed01e32e5580124595650217b (diff) | |
download | aur-0a44cad9d24302064f5385b553802b207169c7d0.tar.gz |
Upgrade to k3s-1.20.11+k3s2 and introduce K3S_ARGS env var to set server/agent and additional args
-rw-r--r-- | .SRCINFO | 28 | ||||
-rw-r--r-- | PKGBUILD | 18 | ||||
-rw-r--r-- | k3s.service | 3 | ||||
-rw-r--r-- | k3s.service.env | 3 |
4 files changed, 25 insertions, 27 deletions
@@ -1,32 +1,26 @@ pkgbase = k3s-1.20-bin pkgdesc = Lightweight Kubernetes - pkgver = 1.20.11+k3s1 + pkgver = 1.20.11+k3s2 pkgrel = 1 url = https://k3s.io arch = x86_64 arch = armv7h arch = aarch64 license = Apache - conflicts = k3s-git - conflicts = k3s-bin - conflicts = k3s-1.17-bin - conflicts = k3s-1.18-bin - conflicts = k3s-1.19-bin - conflicts = k3s-1.21-bin - conflicts = k3s-1.22-bin - conflicts = k3s-1.23-bin + provides = k3s + conflicts = k3s backup = etc/systemd/system/k3s.service.env source = k3s.service source = k3s.service.env source = k3s-killall.sh - sha256sums = f4ae496b69b3dd376a28298df50297728a47761b041be522adf2537aa8a8c3d8 - sha256sums = 667199fa6b811dde3aef3e626e2695a566ad64c9a03d19d0c94a1f104a7612d0 + sha256sums = 4f613d87b6fca9b2f2d15700f448538b5537b846405451a1fdc060727445c529 + sha256sums = cde96553e9609791cd9fe1ff33482e33c4cfec22761f7766f5c278a9ce2ec679 sha256sums = a09747c9541cd22df97adcabc44c09d97a4305a9d976e9bf8191849cb1ce30b6 - source_x86_64 = k3s-1.20.11+k3s1-x86_64::https://github.com/rancher/k3s/releases/download/v1.20.11+k3s1/k3s - sha256sums_x86_64 = 153c85a690e76927bb7f76a50c420c4dd2c8c64c0a72a4c20678878c11589f5e - source_armv7h = k3s-1.20.11+k3s1-armv7h::https://github.com/rancher/k3s/releases/download/v1.20.11+k3s1/k3s-armhf - sha256sums_armv7h = 95be9e3e6f969ad1573c82ae8ad0b16748d5cccba351a663d8e6e60dc1163530 - source_aarch64 = k3s-1.20.11+k3s1-aarch64::https://github.com/rancher/k3s/releases/download/v1.20.11+k3s1/k3s-arm64 - sha256sums_aarch64 = 59419e71b98173f8ca3deebedab342fa8017ba12b6ae7465c1298e325f6237e1 + source_x86_64 = k3s-1.20.11+k3s2-x86_64::https://github.com/rancher/k3s/releases/download/v1.20.11+k3s2/k3s + sha256sums_x86_64 = 2d15b2d18a1e6b88743f895e94e61cd5f4cdbd1388f94304807ab1f5d0d7b243 + source_armv7h = k3s-1.20.11+k3s2-armv7h::https://github.com/rancher/k3s/releases/download/v1.20.11+k3s2/k3s-armhf + sha256sums_armv7h = 0659818f1fc55bd0f988b9f6d5f0b92ed4425c6eb48d14370c33f1cb08a6ab92 + source_aarch64 = k3s-1.20.11+k3s2-aarch64::https://github.com/rancher/k3s/releases/download/v1.20.11+k3s2/k3s-arm64 + sha256sums_aarch64 = 1352e7fa60d17364142ba94135cf529ca91fca85a2fa6501a3339984657ea50f pkgname = k3s-1.20-bin @@ -1,13 +1,15 @@ # Maintainer: amiga23 <t.scheller@email.de> +# Contributor: FabioLolix <fabio.loli@disroot.org> # Contributor: duxet <duxetlg@gmail.com> pkgname=k3s-1.20-bin -pkgver=1.20.11+k3s1 +pkgver=1.20.11+k3s2 pkgrel=1 pkgdesc="Lightweight Kubernetes" url="https://k3s.io" license=('Apache') arch=('x86_64' 'armv7h' 'aarch64') -conflicts=('k3s-git' 'k3s-bin' 'k3s-1.17-bin' 'k3s-1.18-bin' 'k3s-1.19-bin' 'k3s-1.21-bin' 'k3s-1.22-bin' 'k3s-1.23-bin') +provides=('k3s') +conflicts=('k3s') backup=("etc/systemd/system/k3s.service.env") @@ -28,12 +30,12 @@ source_armv7h=( source_aarch64=( "k3s-${pkgver}-aarch64::https://github.com/rancher/k3s/releases/download/v${pkgver}/k3s-arm64" ) -sha256sums=('f4ae496b69b3dd376a28298df50297728a47761b041be522adf2537aa8a8c3d8' - '667199fa6b811dde3aef3e626e2695a566ad64c9a03d19d0c94a1f104a7612d0' +sha256sums=('4f613d87b6fca9b2f2d15700f448538b5537b846405451a1fdc060727445c529' + 'cde96553e9609791cd9fe1ff33482e33c4cfec22761f7766f5c278a9ce2ec679' 'a09747c9541cd22df97adcabc44c09d97a4305a9d976e9bf8191849cb1ce30b6') -sha256sums_x86_64=('153c85a690e76927bb7f76a50c420c4dd2c8c64c0a72a4c20678878c11589f5e') -sha256sums_armv7h=('95be9e3e6f969ad1573c82ae8ad0b16748d5cccba351a663d8e6e60dc1163530') -sha256sums_aarch64=('59419e71b98173f8ca3deebedab342fa8017ba12b6ae7465c1298e325f6237e1') +sha256sums_x86_64=('2d15b2d18a1e6b88743f895e94e61cd5f4cdbd1388f94304807ab1f5d0d7b243') +sha256sums_armv7h=('0659818f1fc55bd0f988b9f6d5f0b92ed4425c6eb48d14370c33f1cb08a6ab92') +sha256sums_aarch64=('1352e7fa60d17364142ba94135cf529ca91fca85a2fa6501a3339984657ea50f') package() { @@ -45,5 +47,5 @@ package() { 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 - install -m 700 $srcdir/k3s-killall.sh $pkgdir/usr/bin/k3s-killall.sh + install -m 700 $srcdir/k3s-killall.sh $pkgdir/usr/bin/k3s-killall } diff --git a/k3s.service b/k3s.service index fe760f49879d..6865e1c9c39b 100644 --- a/k3s.service +++ b/k3s.service @@ -5,10 +5,11 @@ After=network-online.target [Service] Type=notify +Environment="K3S_ARGS=server" EnvironmentFile=/etc/systemd/system/k3s.service.env ExecStartPre=-/sbin/modprobe br_netfilter ExecStartPre=-/sbin/modprobe overlay -ExecStart=/usr/bin/k3s server +ExecStart=/usr/bin/k3s $K3S_ARGS KillMode=process Delegate=yes LimitNOFILE=infinity diff --git a/k3s.service.env b/k3s.service.env index 384209c86070..aeda2e3eed59 100644 --- a/k3s.service.env +++ b/k3s.service.env @@ -1,3 +1,4 @@ # K3S_URL= # K3S_TOKEN= -# K3S_CLUSTER_SECRET= +# K3S_NODE_NAME= +# K3S_ARGS= |