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

[David Runge]

    Date: Thursday, December 9, 2021 @ 18:16:13
  Author: dvzrv
Revision: 1065859

upgpkg: kubernetes 1.23.0-1: Upgrade to 1.23.0.

Update patch for setting gotags.
Turn sed for CGO_ENABLED on static builds into a patch.
Create and install fish completion for kubectl.

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

--------------------------------------------+
 PKGBUILD                                   |   23 ++++++++++++++---------
 kubernetes-1.20.0-gotags.patch             |   12 ------------
 kubernetes-1.23.0-gotags.patch             |   12 ++++++++++++
 kubernetes-1.23.0-static_cgo_enabled.patch |   14 ++++++++++++++
 4 files changed, 40 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-09 18:10:49 UTC (rev 1065858)
+++ PKGBUILD	2021-12-09 18:16:13 UTC (rev 1065859)
@@ -3,7 +3,7 @@
 
 pkgbase=kubernetes
 pkgname=(kube-apiserver kube-controller-manager kube-proxy kube-scheduler kubectl kubelet kubeadm)
-pkgver=1.22.4
+pkgver=1.23.0
 pkgrel=1
 pkgdesc="Production-Grade Container Scheduling and Management"
 arch=(x86_64)
@@ -14,7 +14,8 @@
 iptables-nft socat rsync)
 source=(
   "https://github.com/kubernetes/kubernetes/archive/v${pkgver}/kubernetes-${pkgver}.tar.gz"
-  "${pkgbase}-1.20.0-gotags.patch"
+  "${pkgbase}-1.23.0-gotags.patch"
+  "${pkgbase}-1.23.0-static_cgo_enabled.patch"
   "10-kubeadm-kubelet.conf"
   "50-kubelet-sysctl.conf"
   "kubelet-modules.conf"
@@ -31,8 +32,9 @@
   "kube-scheduler.env"
   "kube-scheduler.service"
 )
-sha512sums=('b2b8060d031dac83c65e634ad14b804010036a7d74161dd37349f39974d862b10b48423c2dcb4e9ca9e775c94dbe9595d49e57c98a2e6a8d8335cb235ba342e0'
-            'a2c97738fb49c0e30eee44b6404af083bbaddbafb8a3fa92493802065f4ac06f0c09d50437a9fdda345e0365de984d9bc768fb9300a40c716e6dec53bd57b6de'
+sha512sums=('a80c5416a29818d2535d1dd2e8bbb3f70c7674d218ccbfbffb5b1c6c632875ba6c960326d311f560ba91e38ff082c6beeb03dfeab9119f63a081af4df8041dd7'
+            'da59a9d6e3fd9625d2803e441f6f06c8b272ee5a220eb32426f09245e62c5f19bda324a752ead05111471f7ccd11fe9777630ae9b7ae387fcd94f65a7f1ed5b8'
+            'affcabbceadddb3f4178b9fba3e15f06bc6a21a6aa1c7b37c48defd1a81f674bc20198458ca7afdf1d979e2175d12648a70bb29d78ddaf7f5897241cd8d56dbe'
             '5f7132636b6afe9f00dc450c58073c0829942fa44070e7ec5a2c227c485c83f076bdea081d207f926b44d02700be65bf19a61f5d8d1472edd480f980e6ffbc3a'
             'ed5ba22b37eaa9f4950ff3b57d60dd7866fcd5b8bd5197eab3170470528e8d91379483d3eb724589e695184f9b0ed506ebaee73ecca0dc40afdb5f35e79d178a'
             'c318b64a03da07dfe435b2d8c368e55b0ab567da78c57ed814a7864fa75aeac52b28cf562b4afd8daa52168af93b318c1fead557ee676e950af25d422c276a17'
@@ -48,8 +50,9 @@
             'dd4efa137462905f9e29a99d69b747ae35e58ba8152794bfa417325953dd5059bad96fabfabf73ce1ee2310dc4ab4d1b95c8d931d33b81c67addcb614a51be54'
             'ba277f765959ddb8aa0dee5a86cd9df1f40fb3f6ea1001f24825dbf21bd9342981d13894301170431729f76e710f70c23481e4061c64be29517ff497490f1ef3'
             '2c25c0e11a7b2d6d61e03f9afe7ba21f9497495ab02e85f2623ce8c71019fb8a1af16197ab3968d5da050c2188c3e67372aa43322ac91af84f7da61bf73596bc')
-b2sums=('3e0b87add2b02e653edb6bb17db076cdaec625536ebab66239e4433c759efbc51ac0222898760f95e1154d7c3532c03565a54181015ddfb910ee55d963086c79'
-        'a84c41a2b2be6ab0f5f6c3ede13b28456deb7098421a6f1af0e72e53a9214efa30a59709c5b1e6c35031c4dfd15e786a691b69e592796d769cf057fb1d21379a'
+b2sums=('3233f84a0628b7a3d0409b3f57f4e9a0a317f089d13d61a91af91b0736c978a8c2479b62164cbf5b0213a36ae63d7cb221e9ba91d9f29eb8599a1c396dce4fbc'
+        '1f6e88cc5817584c72fd2166d50217f06bf29c66b9317c7b9d1a331d8a8192ad189bdfb0e3f0c467916432e9e6a54891753324cfb9ac12396aee66a65dd851da'
+        'b06a21c5d4c349c8e9756022681085dc8a6bc4211a8e4700ccf10757a72a0da5e455f36adccfb41c1dd0d61d1df073c2a09e2074e10664f6de37a722c6d1401a'
         'dbab30d7e1b566027fec9d6a95dd41ed8f64399c39aac07fb4513ce21050eeeb4a226adfd513f76921c305945dfa4a140602ede574dd5eb4cd287e0f2df21714'
         '27a8dcbbe06fa7aea122fc87ca663710ae2179c995270d94e22c905422e2639f3c9c81eef6723467c76366062381d8bd65e84ef79f47fed7c240973a55f5cb0e'
         'a03b8a2ce6a606068cad278c6b8039181968c132a935448bf45e1b3668357487da1528569ed582b107db0654a1614b784a73c726729aad42abed18a4c15ce5b6'
@@ -69,9 +72,9 @@
 prepare() {
   cd "${pkgbase}-${pkgver}"
   # the -tags can only be a space separated list
-  patch -Np1 -i ../"${pkgbase}-1.20.0-gotags.patch"
-  # set CGO_ENABLED
-  sed -E 's/(CGO_ENABLED)=0/\1=1/g' -i hack/lib/golang.sh
+  patch -Np1 -i ../"${pkgbase}-1.23.0-gotags.patch"
+  # set static builds CGO_ENABLED=1 for full RELRO
+  patch -Np1 -i ../"${pkgbase}-1.23.0-static_cgo_enabled.patch"
 }
 
 build() {
@@ -92,6 +95,7 @@
     "_output/bin/${_binary}" completion bash > "_output/${_binary}"
     "_output/bin/${_binary}" completion zsh > "_output/_${_binary}"
   done
+  _output/bin/kubectl completion zsh > _output/kubectl.fish
 
   # docs
   hack/update-generated-docs.sh
@@ -126,6 +130,7 @@
   # shell completion
   install -vDm 644 "_output/${pkgname}" -t "$pkgdir/usr/share/bash-completion/completions/"
   install -vDm 644 "_output/_${pkgname}" -t "$pkgdir/usr/share/zsh/site-functions/"
+  install -vDm 644 "_output/${pkgname}.fish" -t "$pkgdir/usr/share/fish/vendor_completions.d/"
 }
 
 package_kubelet() {

Deleted: kubernetes-1.20.0-gotags.patch
===================================================================
--- kubernetes-1.20.0-gotags.patch	2021-12-09 18:10:49 UTC (rev 1065858)
+++ kubernetes-1.20.0-gotags.patch	2021-12-09 18:16:13 UTC (rev 1065859)
@@ -1,12 +0,0 @@
-diff -ruN a/hack/lib/golang.sh b/hack/lib/golang.sh
---- a/hack/lib/golang.sh	2020-12-04 22:45:25.000000000 +0100
-+++ b/hack/lib/golang.sh	2020-12-12 19:15:53.971460223 +0100
-@@ -793,7 +793,7 @@
- 
-     # extract tags if any specified in GOFLAGS
-     # shellcheck disable=SC2001
--    gotags="selinux,notest,$(echo "${GOFLAGS:-}" | sed -e 's|.*-tags=\([^-]*\).*|\1|')"
-+    gotags="selinux notest $(echo "${GOFLAGS:-}" | sed -e 's|.*-tags=\([^-]*\).*|\1|')"
- 
-     local -a targets=()
-     local arg

Added: kubernetes-1.23.0-gotags.patch
===================================================================
--- kubernetes-1.23.0-gotags.patch	                        (rev 0)
+++ kubernetes-1.23.0-gotags.patch	2021-12-09 18:16:13 UTC (rev 1065859)
@@ -0,0 +1,12 @@
+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

Added: kubernetes-1.23.0-static_cgo_enabled.patch
===================================================================
--- kubernetes-1.23.0-static_cgo_enabled.patch	                        (rev 0)
+++ kubernetes-1.23.0-static_cgo_enabled.patch	2021-12-09 18:16:13 UTC (rev 1065859)
@@ -0,0 +1,14 @@
+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