upgpkg: kind 0.8.0-1

2 files changed, 25 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7ad8772e597..834c687818ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kind
 	pkgdesc = Kubernetes IN Docker - local clusters for testing Kubernetes
-	pkgver = 0.7.0
-	pkgrel = 2
+	pkgver = 0.8.0
+	pkgrel = 1
 	url = https://kind.sigs.k8s.io/
 	arch = x86_64
 	arch = aarch64
@@ -10,10 +10,12 @@ pkgbase = kind
 	arch = armv7h
 	license = Apache
 	makedepends = go
+	makedepends = git
+	makedepends = gzip
 	depends = docker
 	optdepends = kubectl: for managing Kubernetes clusters
-	source = kind-0.7.0.tar.gz::https://github.com/kubernetes-sigs/kind/archive/v0.7.0.tar.gz
-	sha256sums = d2d4f98596b68c449be95a31e9680fbf7ff3503a28a0943f1997eba50de208f9
+	source = kind-0.8.0.tar.gz::https://github.com/kubernetes-sigs/kind/archive/v0.8.0.tar.gz
+	sha256sums = 97c0673bbcb1105c831d7769c05ed7d621da1dc57abc1654166f5b53d16475d1
 
 pkgname = kind
 
diff --git a/PKGBUILD b/PKGBUILD
index 0b142df7024c..1666ebdc771e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,39 @@
 # Maintainer: ml <ml@visu.li>
 pkgname=kind
-pkgver=0.7.0
-pkgrel=2
+pkgver=0.8.0
+pkgrel=1
 pkgdesc='Kubernetes IN Docker - local clusters for testing Kubernetes'
 arch=('x86_64' 'aarch64' 'arm' 'armv6h' 'armv7h')
 url='https://kind.sigs.k8s.io/'
 license=('Apache')
 depends=('docker')
-makedepends=('go')
+optdepends=('podman: to use podman as container engine')
+makedepends=('go' 'git' 'gzip')
 optdepends=('kubectl: for managing Kubernetes clusters')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/kubernetes-sigs/kind/archive/v${pkgver}.tar.gz")
-sha256sums=('d2d4f98596b68c449be95a31e9680fbf7ff3503a28a0943f1997eba50de208f9')
+sha256sums=('97c0673bbcb1105c831d7769c05ed7d621da1dc57abc1654166f5b53d16475d1')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  go mod download
+}
 
 build() {
-  # version.GitCommit is ignored for tagged releases
-  # _commit="$(zcat "${srcdir}/${pkgname}-${pkgver}.tar.gz" | git get-tar-commit-id)"
-  # -ldflags "-X sigs.k8s.io/kind/pkg/cmd/kind/version.GitCommit=${_commit}"
+  local _commit
+  _commit="$(zcat "${pkgname}-${pkgver}.tar.gz" | git get-tar-commit-id)"
   cd "${pkgname}-${pkgver}"
+  export CGO_CFLAGS="$CFLAGS"
+  export CGO_CPPFLAGS="$CPPFLAGS"
+  export CGO_CXXFLAGS="$CXXFLAGS"
   export CGO_LDFLAGS="$LDFLAGS"
-  export GOFLAGS='-buildmode=pie -trimpath -modcacherw'
-  go build -o "$pkgname"
+  export GOFLAGS='-buildmode=pie -trimpath -modcacherw -mod=readonly'
+  go build -o "$pkgname" -ldflags "-X sigs.k8s.io/kind/pkg/cmd/kind/version.GitCommit=${_commit}"
 }
 
 check() {
   cd "${pkgname}-${pkgver}"
+  # CGO_FLAGS might break tests for yay users. TODO: investigate
+  unset CGO_CFLAGS
   go test ./...
 }