[arch-commits] Commit in kubernetes/trunk (4 files)

[David Runge]

    Date: Wednesday, May 4, 2022 @ 15:38:20
  Author: dvzrv
Revision: 1194430

upgpkg: kubernetes 1.24.0-1: Upgrade to 1.24.0.

Remove now unneeded patch for gotags.
Update patch for setting CGO_ENABLED=1.
Remove docker from kubelet optdepends (support has been removed by upstream).

Added:
  kubernetes/trunk/kubernetes-1.24.0-static_cgo_enabled.patch
Modified:
  kubernetes/trunk/PKGBUILD
Deleted:
  kubernetes/trunk/kubernetes-1.23.0-gotags.patch
  kubernetes/trunk/kubernetes-1.23.0-static_cgo_enabled.patch

--------------------------------------------+
 PKGBUILD                                   |   22 ++++++++--------------
 kubernetes-1.23.0-gotags.patch             |   12 ------------
 kubernetes-1.23.0-static_cgo_enabled.patch |   14 --------------
 kubernetes-1.24.0-static_cgo_enabled.patch |   12 ++++++++++++
 4 files changed, 20 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-04 14:31:13 UTC (rev 1194429)
+++ PKGBUILD	2022-05-04 15:38:20 UTC (rev 1194430)
@@ -12,8 +12,8 @@
   kubelet
   kubernetes-control-plane-common
 )
-pkgver=1.23.6
-pkgrel=2
+pkgver=1.24.0
+pkgrel=1
 pkgdesc="Production-Grade Container Scheduling and Management"
 arch=(x86_64)
 url="https://kubernetes.io/"
@@ -22,8 +22,7 @@
 socat rsync)
 source=(
   https://github.com/$pkgbase/$pkgbase/archive/v$pkgver/$pkgbase-$pkgver.tar.gz
-  $pkgbase-1.23.0-gotags.patch
-  $pkgbase-1.23.0-static_cgo_enabled.patch
+  $pkgbase-1.24.0-static_cgo_enabled.patch
   10-kubeadm-kubelet.conf
   50-kubelet-sysctl.conf
   kubelet-modules.conf
@@ -40,9 +39,8 @@
   kube-scheduler.env
   kube-scheduler.service
 )
-sha512sums=('b351556267c21a6691bced0c837e259425bb3a9f47e0dfe995e27c8d78a48eaa29dca34928ec5898cbe59e80976a6b76ae3e85aeb4eeb79339ecf19c94a9dab7'
-            'da59a9d6e3fd9625d2803e441f6f06c8b272ee5a220eb32426f09245e62c5f19bda324a752ead05111471f7ccd11fe9777630ae9b7ae387fcd94f65a7f1ed5b8'
-            'affcabbceadddb3f4178b9fba3e15f06bc6a21a6aa1c7b37c48defd1a81f674bc20198458ca7afdf1d979e2175d12648a70bb29d78ddaf7f5897241cd8d56dbe'
+sha512sums=('7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0'
+            'e98921d111fabf2c353df589dea0fab57b0b174079483b4092741cc50553a3b765cea4c784e42ad9ab90827581cac028af4fc7a2db5acde1877446882393ae78'
             '5f7132636b6afe9f00dc450c58073c0829942fa44070e7ec5a2c227c485c83f076bdea081d207f926b44d02700be65bf19a61f5d8d1472edd480f980e6ffbc3a'
             'ed5ba22b37eaa9f4950ff3b57d60dd7866fcd5b8bd5197eab3170470528e8d91379483d3eb724589e695184f9b0ed506ebaee73ecca0dc40afdb5f35e79d178a'
             'c318b64a03da07dfe435b2d8c368e55b0ab567da78c57ed814a7864fa75aeac52b28cf562b4afd8daa52168af93b318c1fead557ee676e950af25d422c276a17'
@@ -58,9 +56,8 @@
             'dd4efa137462905f9e29a99d69b747ae35e58ba8152794bfa417325953dd5059bad96fabfabf73ce1ee2310dc4ab4d1b95c8d931d33b81c67addcb614a51be54'
             'ba277f765959ddb8aa0dee5a86cd9df1f40fb3f6ea1001f24825dbf21bd9342981d13894301170431729f76e710f70c23481e4061c64be29517ff497490f1ef3'
             '2c25c0e11a7b2d6d61e03f9afe7ba21f9497495ab02e85f2623ce8c71019fb8a1af16197ab3968d5da050c2188c3e67372aa43322ac91af84f7da61bf73596bc')
-b2sums=('2b0d3001bb344a0d22ca9f6e8582cd0528652bb9c4698989425ee7ebf35514d9a05ecd5f55da2198e0543cc870620d2a796977adbc275e0aa97521f90dfbf325'
-        '1f6e88cc5817584c72fd2166d50217f06bf29c66b9317c7b9d1a331d8a8192ad189bdfb0e3f0c467916432e9e6a54891753324cfb9ac12396aee66a65dd851da'
-        'b06a21c5d4c349c8e9756022681085dc8a6bc4211a8e4700ccf10757a72a0da5e455f36adccfb41c1dd0d61d1df073c2a09e2074e10664f6de37a722c6d1401a'
+b2sums=('eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915'
+        '94a21e3923396b5a97a1e713419bab1f897ce8a4eedbbc2c0ed82fd1fd909bb69183c349322d2a774afd26c4beeb9972a57c6d4f67ef527c7e0ca7ea20651d43'
         'dbab30d7e1b566027fec9d6a95dd41ed8f64399c39aac07fb4513ce21050eeeb4a226adfd513f76921c305945dfa4a140602ede574dd5eb4cd287e0f2df21714'
         '27a8dcbbe06fa7aea122fc87ca663710ae2179c995270d94e22c905422e2639f3c9c81eef6723467c76366062381d8bd65e84ef79f47fed7c240973a55f5cb0e'
         'a03b8a2ce6a606068cad278c6b8039181968c132a935448bf45e1b3668357487da1528569ed582b107db0654a1614b784a73c726729aad42abed18a4c15ce5b6'
@@ -78,10 +75,8 @@
         '95a5345e044b8fe9be01fc6230f20b3b12118c6f1fcc3e7ebbfd4d3a3d205dfb492ff0c11397d3dae9abc0cbba83c659ea23803b71c8e240dddc30bf4791dbc5')
 
 prepare() {
-  # the -tags can only be a space separated list
-  patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-1.23.0-gotags.patch
   # set static builds CGO_ENABLED=1 for full RELRO
-  patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-1.23.0-static_cgo_enabled.patch
+  patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-1.24.0-static_cgo_enabled.patch
 }
 
 build() {
@@ -148,7 +143,6 @@
   optdepends=(
     'containerd: for using the containerd container runtime'
     'cri-o: for using the cri-o container runtime'
-    'docker: for using the docker container runtime'
   )
   backup=(etc/$pkgbase/$pkgname.env)
   install=$pkgname.install

Deleted: kubernetes-1.23.0-gotags.patch
===================================================================
--- kubernetes-1.23.0-gotags.patch	2022-05-04 14:31:13 UTC (rev 1194429)
+++ kubernetes-1.23.0-gotags.patch	2022-05-04 15:38:20 UTC (rev 1194430)
@@ -1,12 +0,0 @@
-diff -ruN a/hack/lib/golang.sh b/hack/lib/golang.sh
---- a/hack/lib/golang.sh	2021-12-07 19:08:39.000000000 +0100
-+++ b/hack/lib/golang.sh	2021-12-08 23:59:38.948699522 +0100
-@@ -808,7 +808,7 @@
- 
-     # extract tags if any specified in GOFLAGS
-     # shellcheck disable=SC2001
--    gotags="selinux,notest,$(echo "${GOFLAGS:-}" | sed -ne 's|.*-tags=\([^-]*\).*|\1|p')"
-+    gotags="selinux notest $(echo "${GOFLAGS:-}" | sed -ne 's|.*-tags=\([^-]*\).*|\1|p')"
- 
-     local -a targets=()
-     local arg

Deleted: kubernetes-1.23.0-static_cgo_enabled.patch
===================================================================
--- kubernetes-1.23.0-static_cgo_enabled.patch	2022-05-04 14:31:13 UTC (rev 1194429)
+++ kubernetes-1.23.0-static_cgo_enabled.patch	2022-05-04 15:38:20 UTC (rev 1194430)
@@ -1,14 +0,0 @@
-diff -ruN a/hack/lib/golang.sh b/hack/lib/golang.sh
---- a/hack/lib/golang.sh	2021-12-07 19:08:39.000000000 +0100
-+++ b/hack/lib/golang.sh	2021-12-09 18:53:23.588259078 +0100
-@@ -718,8 +718,8 @@
-       -ldflags "${goldflags:-}"
-       -tags "${gotags:-}"
-     )
--    V=1 kube::log::info "> static build CGO_ENABLED=0: ${statics[*]}"
--    CGO_ENABLED=0 kube::golang::build_some_binaries "${statics[@]}"
-+    V=1 kube::log::info "> static build CGO_ENABLED=1: ${statics[*]}"
-+    CGO_ENABLED=1 kube::golang::build_some_binaries "${statics[@]}"
-   fi
- 
-   if [[ "${#nonstatics[@]}" != 0 ]]; then

Added: kubernetes-1.24.0-static_cgo_enabled.patch
===================================================================
--- kubernetes-1.24.0-static_cgo_enabled.patch	                        (rev 0)
+++ kubernetes-1.24.0-static_cgo_enabled.patch	2022-05-04 15:38:20 UTC (rev 1194430)
@@ -0,0 +1,12 @@
+diff -ruN a/hack/lib/golang.sh b/hack/lib/golang.sh
+--- a/hack/lib/golang.sh	2022-05-03 15:36:49.000000000 +0200
++++ b/hack/lib/golang.sh	2022-05-04 17:12:45.197255145 +0200
+@@ -713,7 +713,7 @@
+       -ldflags="${goldflags}"
+       -tags="${gotags:-}"
+     )
+-    CGO_ENABLED=0 kube::golang::build_some_binaries "${statics[@]}"
++    CGO_ENABLED=1 kube::golang::build_some_binaries "${statics[@]}"
+   fi
+ 
+   if [[ "${#nonstatics[@]}" != 0 ]]; then