From 628119d50a4682027dd449ead7f83df455cddf75 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 4 Feb 2021 16:35:57 +0100 Subject: [PATCH 1/2] New package: konnectivity-server-0.0.24 --- srcpkgs/konnectivity-server/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/konnectivity-server/template diff --git a/srcpkgs/konnectivity-server/template b/srcpkgs/konnectivity-server/template new file mode 100644 index 000000000000..40ea202ca006 --- /dev/null +++ b/srcpkgs/konnectivity-server/template @@ -0,0 +1,18 @@ +# Template file for 'konnectivity-server' +pkgname=konnectivity-server +version=0.0.24 +revision=1 +wrksrc=apiserver-network-proxy-$version +build_style=go +go_import_path=sigs.k8s.io/apiserver-network-proxy +go_package="${go_import_path}/cmd/server" +short_desc="Official reference implementation of kubernetes server network proxy" +maintainer="Enno Boland " +license="Apache-2.0" +homepage="https://github.com/kubernetes-sigs/apiserver-network-proxy" +distfiles="https://github.com/kubernetes-sigs/apiserver-network-proxy/archive/v$version.tar.gz" +checksum=2cf4189451a711335e84e75ca81f6918c5ef0302df3cb3274d2331aea3afaf45 + +post_install() { + mv $DESTDIR/usr/bin/server $DESTDIR/usr/bin/konnectivity-server +} From 83b687078b948445e39c33c0db5078f14c72acc2 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 4 Feb 2021 13:41:45 +0100 Subject: [PATCH 2/2] New package: k0s-1.22.2.0 --- srcpkgs/k0s/files/k0s-worker.default | 4 +++ srcpkgs/k0s/files/k0s-worker/run | 16 +++++++++++ srcpkgs/k0s/files/k0s.default | 3 +++ srcpkgs/k0s/files/k0s/run | 7 +++++ srcpkgs/k0s/template | 40 ++++++++++++++++++++++++++++ 5 files changed, 70 insertions(+) create mode 100644 srcpkgs/k0s/files/k0s-worker.default create mode 100755 srcpkgs/k0s/files/k0s-worker/run create mode 100644 srcpkgs/k0s/files/k0s.default create mode 100755 srcpkgs/k0s/files/k0s/run create mode 100644 srcpkgs/k0s/template diff --git a/srcpkgs/k0s/files/k0s-worker.default b/srcpkgs/k0s/files/k0s-worker.default new file mode 100644 index 000000000000..ac5abbfb3f5a --- /dev/null +++ b/srcpkgs/k0s/files/k0s-worker.default @@ -0,0 +1,4 @@ +# K0S_CRI_SOCKET=remote:/run/containerd/containerd.sock +# K0S_ENABLE_CLOUD_PROVIDER=true +# K0S_PROFILE=default +# K0S_TOKEN_FILE=/etc/k0s/worker.token diff --git a/srcpkgs/k0s/files/k0s-worker/run b/srcpkgs/k0s/files/k0s-worker/run new file mode 100755 index 000000000000..f49359674f1a --- /dev/null +++ b/srcpkgs/k0s/files/k0s-worker/run @@ -0,0 +1,16 @@ +#!/bin/sh -e +. /etc/default/k0s-worker +case ${K0S_CRI_SOCKET} in + remote:*) + sv check containerd + ;; + docker:*) + sv check docker + ;; +esac + +exec k0s -c "/etc/k0s/k0s.conf" worker \ + ${K0S_CRI_SOCKET:+--cri-socket="$K0S_CRI_SOCKET"} \ + ${K0S_ENABLE_CLOUD_PROVIDER:+--enable-cloud-provider} \ + ${K0S_PROFILE:+--profile="$K0S_PROFILE"} \ + --token-file=${K0S_TOKEN_FILE:-/etc/k0s/worker.token} diff --git a/srcpkgs/k0s/files/k0s.default b/srcpkgs/k0s/files/k0s.default new file mode 100644 index 000000000000..b3db337f0489 --- /dev/null +++ b/srcpkgs/k0s/files/k0s.default @@ -0,0 +1,3 @@ +# K0S_ENABLE_WORKER=false +# K0S_PROFILE=default +# K0S_TOKEN_FILE=/etc/k0s/server.token diff --git a/srcpkgs/k0s/files/k0s/run b/srcpkgs/k0s/files/k0s/run new file mode 100755 index 000000000000..ba65b7c92064 --- /dev/null +++ b/srcpkgs/k0s/files/k0s/run @@ -0,0 +1,7 @@ +#!/bin/sh -e +. /etc/default/k0s + +exec chpst -u _k0s:_k0s k0s -c "/etc/k0s/k0s.conf" server \ + ${K0S_ENABLE_WORKER:+--enable-worker} \ + ${K0S_PROFILE:+--profile="${K0S_PROFILE}"} \ + ${K0S_TOKEN_FILE:+--token-file="${K0S_TOKEN_FILE}"} diff --git a/srcpkgs/k0s/template b/srcpkgs/k0s/template new file mode 100644 index 000000000000..9124cebd8219 --- /dev/null +++ b/srcpkgs/k0s/template @@ -0,0 +1,40 @@ +# Template file for 'k0s' +pkgname=k0s +version=1.22.2.0 +revision=1 +_version=${version%.*}+k0s.${version##*.} +wrksrc="${pkgname}-${_version//+/-}" +build_style=go +go_import_path=github.com/k0sproject/k0s +hostmakedepends="which golangci-lint" +depends="kubernetes containerd konnectivity-server etcd" +short_desc="Zero Friction Kubernetes" +maintainer="Enno Boland " +license="Apache-2.0" +homepage="https://k0sproject.io/" +distfiles="https://github.com/k0sproject/$pkgname/archive/v${_version}.tar.gz" +checksum=42d4f52a5eddd19128648c2c5510217882e0ef0a880181a2a140bc46ed61728d +system_accounts="_k0s" +make_dirs="/var/lib/k0s 0755 _k0s _k0s" +_k0s_homedir="/var/lib/k0s" +_k0s_descr="k0s server user" +conf_files=" + /etc/default/*" +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" k0s" +fi + +pre_build() { + # Make sure files are generated correctly before actually building + make EMBEDDED_BINS_BUILDMODE=none \ + static/gen_manifests.go \ + pkg/assets/zz_generated_offsets_linux.go +} + +post_install() { + vsv k0s + vinstall ${FILESDIR}/k0s.default 644 /etc/default/ k0s + + vsv k0s-worker + vinstall ${FILESDIR}/k0s-worker.default 644 /etc/default/ k0s-worker +}