From 819f1670c1adc623c678ba3d6c14fcb5be746daa Mon Sep 17 00:00:00 2001
From: rvalue <i@rvalue.moe>
Date: Fri, 30 Jun 2023 07:09:56 +0800
Subject: [PATCH] updpatch: kubernetes

---
 kubernetes/add-riscv64-support.patch | 14 ++++-----
 kubernetes/riscv64.patch             | 44 ++++++++++++++--------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/kubernetes/add-riscv64-support.patch b/kubernetes/add-riscv64-support.patch
index 143dba589..4eb900811 100644
--- a/kubernetes/add-riscv64-support.patch
+++ b/kubernetes/add-riscv64-support.patch
@@ -2,23 +2,23 @@ diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
 index a50a64af..326e30fd 100755
 --- a/hack/lib/golang.sh
 +++ b/hack/lib/golang.sh
-@@ -25,6 +25,7 @@ readonly KUBE_SUPPORTED_SERVER_PLATFORMS=(
+@@ -24,6 +24,7 @@ readonly KUBE_GOPATH="${KUBE_OUTPUT}/go"
+ readonly KUBE_SUPPORTED_SERVER_PLATFORMS=(
    linux/amd64
-   linux/arm
    linux/arm64
 +  linux/riscv64
    linux/s390x
    linux/ppc64le
  )
-@@ -34,6 +35,7 @@ readonly KUBE_SUPPORTED_NODE_PLATFORMS=(
+@@ -32,6 +33,7 @@ readonly KUBE_SUPPORTED_SERVER_PLATFORMS
+ readonly KUBE_SUPPORTED_NODE_PLATFORMS=(
    linux/amd64
-   linux/arm
    linux/arm64
 +  linux/riscv64
    linux/s390x
    linux/ppc64le
    windows/amd64
-@@ -46,6 +48,7 @@ readonly KUBE_SUPPORTED_CLIENT_PLATFORMS=(
+@@ -44,6 +46,7 @@ readonly KUBE_SUPPORTED_CLIENT_PLATFORMS
    linux/386
    linux/arm
    linux/arm64
@@ -26,9 +26,9 @@ index a50a64af..326e30fd 100755
    linux/s390x
    linux/ppc64le
    darwin/amd64
-@@ -60,6 +63,7 @@ readonly KUBE_SUPPORTED_TEST_PLATFORMS=(
+@@ -58,6 +61,7 @@ readonly KUBE_SUPPORTED_CLIENT_PLATFORMS
+ readonly KUBE_SUPPORTED_TEST_PLATFORMS=(
    linux/amd64
-   linux/arm
    linux/arm64
 +  linux/riscv64
    linux/s390x
diff --git a/kubernetes/riscv64.patch b/kubernetes/riscv64.patch
index 469b59741..7cb12659f 100644
--- a/kubernetes/riscv64.patch
+++ b/kubernetes/riscv64.patch
@@ -1,36 +1,36 @@
+diff --git PKGBUILD PKGBUILD
+index 2f4aeb3..2768496 100644
 --- PKGBUILD
 +++ PKGBUILD
-@@ -38,6 +38,7 @@ source=(
-   kube-proxy.service
-   kube-scheduler.env
-   kube-scheduler.service
+@@ -32,6 +32,7 @@ makedepends=(
+ source=(
+   https://github.com/$pkgbase/$pkgbase/archive/v$pkgver/$pkgbase-$pkgver.tar.gz
+   $pkgbase-1.24.0-static_cgo_enabled.patch
 +  add-riscv64-support.patch
+   10-kubeadm-kubelet.conf
+   50-kubelet-sysctl.conf
+   kubelet-modules.conf
+@@ -50,6 +51,7 @@ source=(
  )
- sha512sums=('21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62eae76fafb400dddb1fa41a25d96b2e4f193751f0d7362adaf32bae023a105'
+ sha512sums=('51cf0178c8a2a00798cc618c9918f556c418de137566db60a66a0c7556ee625b34cf86b1da241856599784588c0e3e8b81225dca627fea70a87c94adb073bb7a'
              'e98921d111fabf2c353df589dea0fab57b0b174079483b4092741cc50553a3b765cea4c784e42ad9ab90827581cac028af4fc7a2db5acde1877446882393ae78'
-@@ -55,7 +56,8 @@ sha512sums=('21e5feac02be09f42b30c0e3a11855dcdfb5868fa031abd7dc52edc81c615353c62
-             'c5c16d97afc0fa455981a56794547a4e6e8a710b1b686ccf84645c8001a601fa41b624ad0009bf21e56ec2da35874ac7808731b4a5b9b0fd80fc188714708f23'
-             'dd4efa137462905f9e29a99d69b747ae35e58ba8152794bfa417325953dd5059bad96fabfabf73ce1ee2310dc4ab4d1b95c8d931d33b81c67addcb614a51be54'
-             'ba277f765959ddb8aa0dee5a86cd9df1f40fb3f6ea1001f24825dbf21bd9342981d13894301170431729f76e710f70c23481e4061c64be29517ff497490f1ef3'
--            '2c25c0e11a7b2d6d61e03f9afe7ba21f9497495ab02e85f2623ce8c71019fb8a1af16197ab3968d5da050c2188c3e67372aa43322ac91af84f7da61bf73596bc')
-+            '2c25c0e11a7b2d6d61e03f9afe7ba21f9497495ab02e85f2623ce8c71019fb8a1af16197ab3968d5da050c2188c3e67372aa43322ac91af84f7da61bf73596bc'
-+            'faba6b03ea87469a9b4588e6dfcb7a193407759a867b2b6894a6d44c45dff0df72ac1a27abaacd76b393adc317c93e2f0a02e5e29d03a15e13d9d1934936893e')
- b2sums=('663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261cdaf3d86f887ee1ca34bb5c63a803ef4e109b935cde25ec0357dbdd5cd'
++            '93e12931be05ae304cd5ef1e01ac9c3b62875da008c15bdb6fe2bc02e12b02b9189d5d073aa736ecb005c5de04d95febbd238c75dc20b91d783bcd895babbdb2'
+             '5f7132636b6afe9f00dc450c58073c0829942fa44070e7ec5a2c227c485c83f076bdea081d207f926b44d02700be65bf19a61f5d8d1472edd480f980e6ffbc3a'
+             'ed5ba22b37eaa9f4950ff3b57d60dd7866fcd5b8bd5197eab3170470528e8d91379483d3eb724589e695184f9b0ed506ebaee73ecca0dc40afdb5f35e79d178a'
+             'c318b64a03da07dfe435b2d8c368e55b0ab567da78c57ed814a7864fa75aeac52b28cf562b4afd8daa52168af93b318c1fead557ee676e950af25d422c276a17'
+@@ -67,6 +69,7 @@ sha512sums=('51cf0178c8a2a00798cc618c9918f556c418de137566db60a66a0c7556ee625b34c
+             '2c25c0e11a7b2d6d61e03f9afe7ba21f9497495ab02e85f2623ce8c71019fb8a1af16197ab3968d5da050c2188c3e67372aa43322ac91af84f7da61bf73596bc')
+ b2sums=('69aab2d42fdbb5704d6bd248e6ced154664d20d66ad21e7cf3b6ed92a262f4d1a2dc5b22912b6cdca0a40fecdc262ae7124a2969955f234c49c0950ea68f171f'
          '94a21e3923396b5a97a1e713419bab1f897ce8a4eedbbc2c0ed82fd1fd909bb69183c349322d2a774afd26c4beeb9972a57c6d4f67ef527c7e0ca7ea20651d43'
++        '1b7d72d1dd66486ae81bd319ebf4727454f3801d915e6e7868a3e07bc6347337ecedfe91c02b402bd57a584e122f522795beb56e75c473dbe2c37c0ed12580be'
          'dbab30d7e1b566027fec9d6a95dd41ed8f64399c39aac07fb4513ce21050eeeb4a226adfd513f76921c305945dfa4a140602ede574dd5eb4cd287e0f2df21714'
-@@ -72,11 +74,15 @@ b2sums=('663d1fe72e4c80b2946168880e496cae8842f7a884c1a821b0f4f6045dc81eb4313261c
-         '082474a56525f7ea52315fbf9d765081d9f6bbd20ab4213bc2d2a6ddb8a3764987e365f08f157be6deec53f9c1bf2fb6c99595f5649c631e8610fcf81ed61eab'
-         '5ce796468c442d76f311d1c620576dcd2c784fcd40ecaa68ca3a6d7c089e8703506f712ee918f89ddb4debfe061cea3939fa4f2d2a77553dd1cd7aa4fae17729'
-         '4f35d3b5296839dd68885b924a41725a3479c2725c77887038c7d402a6aa754e37fe0d3697e746a1b65a5236f9e927df01e99a66d37d227cb801965575403788'
--        '95a5345e044b8fe9be01fc6230f20b3b12118c6f1fcc3e7ebbfd4d3a3d205dfb492ff0c11397d3dae9abc0cbba83c659ea23803b71c8e240dddc30bf4791dbc5')
-+        '95a5345e044b8fe9be01fc6230f20b3b12118c6f1fcc3e7ebbfd4d3a3d205dfb492ff0c11397d3dae9abc0cbba83c659ea23803b71c8e240dddc30bf4791dbc5'
-+        '4bb18835fe5c411362a2e990298543ee79544bf9d29efdd0d2880665386eee208c39f79a3c2e7166ec496c43c9d4a95be200755900c2a01e568488b25c0ced2a')
- 
+         '27a8dcbbe06fa7aea122fc87ca663710ae2179c995270d94e22c905422e2639f3c9c81eef6723467c76366062381d8bd65e84ef79f47fed7c240973a55f5cb0e'
+         'a03b8a2ce6a606068cad278c6b8039181968c132a935448bf45e1b3668357487da1528569ed582b107db0654a1614b784a73c726729aad42abed18a4c15ce5b6'
+@@ -86,6 +89,8 @@ b2sums=('69aab2d42fdbb5704d6bd248e6ced154664d20d66ad21e7cf3b6ed92a262f4d1a2dc5b2
  prepare() {
    # set static builds CGO_ENABLED=1 for full RELRO
    patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-1.24.0-static_cgo_enabled.patch
 +  # add riscv64 support
-+  # feedback from upstream: https://github.com/kubernetes/kubernetes/pull/86011#issuecomment-633312469
 +  patch -Np1 -d $pkgbase-$pkgver -i ../add-riscv64-support.patch
  }