upgpkg: kubeadm-bin 1.15.3-1

upstream release

upgpkg: kubelet-bin 1.15.3-1

upstream release

2 files changed, 29 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d59f4f3bdd2..9848ea3be4ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kubelet-bin
 	pkgdesc = Kubernetes.io kubelet binary
-	pkgver = 1.14.1
-	pkgrel = 0
+	pkgver = 1.15.3
+	pkgrel = 1
 	url = http://kubernetes.io
 	arch = x86_64
 	arch = armv7l
@@ -11,14 +11,10 @@ pkgbase = kubelet-bin
 	provides = kubelet
 	conflicts = kubernetes
 	conflicts = kubernetes-bin
-	source_x86_64 = https://packages.cloud.google.com/apt/pool/kubelet_1.14.1-00_amd64_60ce697defdd990aee5e4b40abc7274f71e3aef6d9cc4feab240c8dc5681ed05.deb
-	sha256sums_x86_64 = 60ce697defdd990aee5e4b40abc7274f71e3aef6d9cc4feab240c8dc5681ed05
-	source_armv7l = https://packages.cloud.google.com/apt/pool/kubelet_1.14.1-00_armhf_71907b6dfe6ad148ba073ddb19a5f5218b0c028500ad4c1092971b703680eef1.deb
-	sha256sums_armv7l = 71907b6dfe6ad148ba073ddb19a5f5218b0c028500ad4c1092971b703680eef1
-	source_armv7h = https://packages.cloud.google.com/apt/pool/kubelet_1.14.1-00_armhf_71907b6dfe6ad148ba073ddb19a5f5218b0c028500ad4c1092971b703680eef1.deb
-	sha256sums_armv7h = 71907b6dfe6ad148ba073ddb19a5f5218b0c028500ad4c1092971b703680eef1
-	source_aarch64 = https://packages.cloud.google.com/apt/pool/kubelet_1.14.1-00_arm64_58dab728a2398d686547a18be1d49c7529a08f34c7ba85df142b4319aa1d30b0.deb
-	sha256sums_aarch64 = 58dab728a2398d686547a18be1d49c7529a08f34c7ba85df142b4319aa1d30b0
+	source = https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.15/build/debs/kubelet.service
+	source = https://storage.googleapis.com/kubernetes-release/release/v1.15.3/bin/linux/amd64/kubelet
+	sha256sums = 3ea2a2c44642a584d9ae603fd4dccd401b06bf82338dba893c82a3ed41401a29
+	sha256sums = dc08c9ad350d0046bc2ec910dcd266bd30cb6e7ef1f9170bb8df455d9d083d73
 
 pkgname = kubelet-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 19dc8a4e3917..7e90b1cd335f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,35 @@
-# Maintainer: Wes Jackson <icebal dot 7 at gmail dot com>
+# Maintainer: Paul Nicholson <brenix@gmail.com>
+# Contributor: Wes Jackson <icebal dot 7 at gmail dot com>
 
 pkgname=kubelet-bin
 pkgdesc="Kubernetes.io kubelet binary"
-pkgver=1.14.1
-pkgrel=0
+pkgver=1.15.3
+pkgrel=1
 arch=('x86_64' 'armv7l' 'armv7h' 'aarch64')
 url="http://kubernetes.io"
 license=('apache')
 conflicts=('kubernetes' 'kubernetes-bin')
 provides=('kubelet')
-sha256sums_x86_64=(
-  '60ce697defdd990aee5e4b40abc7274f71e3aef6d9cc4feab240c8dc5681ed05'
-)
-sha256sums_armv7l=(
-  '71907b6dfe6ad148ba073ddb19a5f5218b0c028500ad4c1092971b703680eef1'
-)
-sha256sums_armv7h=(
-  "${sha256sums_armv7l}"
-)
-sha256sums_aarch64=(
-  '58dab728a2398d686547a18be1d49c7529a08f34c7ba85df142b4319aa1d30b0'
-)
-source_x86_64=(
-  "https://packages.cloud.google.com/apt/pool/kubelet_${pkgver}-00_amd64_${sha256sums_x86_64}.deb"
-)
-source_armv7l=(
-  "https://packages.cloud.google.com/apt/pool/kubelet_${pkgver}-00_armhf_${sha256sums_armv7l}.deb"
-)
-source_armv7h=(
-  "https://packages.cloud.google.com/apt/pool/kubelet_${pkgver}-00_armhf_${sha256sums_armv7h}.deb"
-)
-source_aarch64=(
-  "https://packages.cloud.google.com/apt/pool/kubelet_${pkgver}-00_arm64_${sha256sums_aarch64}.deb"
+source=(
+  "https://raw.githubusercontent.com/kubernetes/kubernetes/release-${pkgver%.*}/build/debs/kubelet.service"
 )
+sha256sums=('3ea2a2c44642a584d9ae603fd4dccd401b06bf82338dba893c82a3ed41401a29')
+
+case "$CARCH" in
+	arm*) _pkgarch="arm"
+		sha256sums+=('f041c7e1bad2e335b958ee1968e0f807e97b3995afab938f96d3286d548308c3')
+		;;
+	aarch64) _pkgarch="arm64"
+		sha256sums+=('c0b1c4fba9cdc324b6a882cd9e0cc2e38951928697fb4b2d62e05d687c53112a')
+		;;
+	x86_64) _pkgarch="amd64"
+		sha256sums+=('dc08c9ad350d0046bc2ec910dcd266bd30cb6e7ef1f9170bb8df455d9d083d73')
+		;;
+esac
+
+source+=("https://storage.googleapis.com/kubernetes-release/release/v${pkgver}/bin/linux/${_pkgarch}/kubelet")
 
 package() {
-  tar -vxf data.tar.xz
-  install -D -m0644 "./lib/systemd/system/kubelet.service" "${pkgdir}/usr/lib/systemd/system/kubelet.service"
-  install -D -m0755 "./usr/bin/kubelet" "${pkgdir}/usr/bin/kubelet"
+  install -D -m0644 "kubelet.service" "${pkgdir}/usr/lib/systemd/system/kubelet.service"
+  install -D -m0755 "kubelet" "${pkgdir}/usr/bin/kubelet"
 }