testing/kubernetes: upgrade to 1.14.0

5 files changed, 26 insertions, 49 deletions

diff --git a/testing/kubernetes/APKBUILD b/testing/kubernetes/APKBUILD
index 970d97ee7f..ded6a72939 100644
--- a/testing/kubernetes/APKBUILD
+++ b/testing/kubernetes/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Tiago Ilieve <tiago.myhro@gmail.com>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=kubernetes
-pkgver=1.13.4
+pkgver=1.14.0
 pkgrel=0
 pkgdesc="Container Cluster Manager for Docker"
 url="https://kubernetes.io/"
@@ -41,9 +41,9 @@ package() {
 	install -d $pkgdir/var/lib/kubelet
 }
 
-sha512sums="aa07877bc141ceedab56d9dd65920d86121724a0d20b86ee4925c88d805df8235162f235a957d24c053a60869ab2084062a1607f43c8eeea736fd72eb328c800  kubernetes-1.13.4.tar.gz
-b7710dfe8a80f495e5eeb1d35d03179466bff4a3208d70591d1a9896709ec7383d17314d58eefc6ce1d6c23bd9b1ddf9b80886a8e39068761dd71f5e04cac1c3  ensure-cgo-usage.patch
-06e3e8626b70077eb693da9c53dca3bc566aea4590a27c5dd3997b6d34abec5bf5d749b7be94b60b83361884c29b3a6dbb56c40b18c008b19e7cbd6e0d5c87e6  make-e2e_node-run-over-distro-bins.patch
-cf6d9a5e873603462f0b8de60d3c72b10cbe68175f621f814cb5a85c11cb18f408639181227dfae6718671109cd198ef8720ee15a7d4132bba691bbd7224860f  make-test-cmd-run-over-hyperkube-based-kubectl.patch
-f60cb7006b85cac00b0f18f87cc9196541e359a82ba37b3e0938d5e9a6e178ef964df0695fff3135d4a6cc4f4d91e963bd184e3af140c7c1072735890ff4351d  remove-apiserver-add-kube-prefix-for-hyperkube.patch"
+sha512sums="dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822  kubernetes-1.14.0.tar.gz
+bfe072d2f53543b8d704319755f3cfe5ed2467b54879e22117a25a9d7d6d4d238356e45824deaf4d18b8e9eb6f34d1de43be4840b9906f7909478ffe9e8a65ff  ensure-cgo-usage.patch
+8faa8f1c777740ed33ac4e46e8e47e9092098b6e672cf57a10caab2212b9b5c6965361fe7107d1311227e6145e2ad312982dc0340feb36b03ebb04e1202366f0  make-e2e_node-run-over-distro-bins.patch
+d2d50f869160c266ec677be58f0401fb6446129de3e194b4c8599a6a8000d42290de553ee07b488fcdda80ffe94c640e0846ffbd7fbca94c5684d5f373e4c9f3  make-test-cmd-run-over-hyperkube-based-kubectl.patch
+100d439c8c5114fc8ac5e2c40f536b89b6165907e94112358365901e57329f5c813c5bf8ea5da5aba71574efb973bc028cafb7b168f50c9fa5a6b019c31c3884  remove-apiserver-add-kube-prefix-for-hyperkube.patch
 8aec0a1cda24fcd7001e34ff6163aee7eaf679dea953068b58df3578c016f70e1406903e032a51519bc16ac0dbe583159d1cf4d504adbb2930d811cc2f762cfe  add-openrc-support.patch"
diff --git a/testing/kubernetes/ensure-cgo-usage.patch b/testing/kubernetes/ensure-cgo-usage.patch
index 2dc19dabaf..a93ea161b0 100644
--- a/testing/kubernetes/ensure-cgo-usage.patch
+++ b/testing/kubernetes/ensure-cgo-usage.patch
@@ -19,15 +19,10 @@ are not enough to ensure its usage in Alpine. This leads to errors like:
 collect2: error: ld returned 1 exit status
 
 ---
- hack/lib/golang.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
-index 9eb52a7d..53282e74 100755
 --- a/hack/lib/golang.sh
 +++ b/hack/lib/golang.sh
-@@ -588,7 +588,7 @@ kube::golang::build_binaries_for_platform() {
-       -gcflags "${gogcflags:-}"
+@@ -611,7 +611,7 @@
+       -asmflags "${goasmflags:-}"
        -ldflags "${goldflags:-}"
      )
 -    CGO_ENABLED=0 kube::golang::build_some_binaries "${statics[@]}"
@@ -35,5 +30,3 @@ index 9eb52a7d..53282e74 100755
    fi
  
    if [[ "${#nonstatics[@]}" != 0 ]]; then
--- 
-2.18.1
diff --git a/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch b/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch
index c2739d6747..2ace6bb637 100644
--- a/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch
+++ b/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch
@@ -1,12 +1,10 @@
-diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
-index 54a8233..2a68768 100755
 --- a/hack/make-rules/test-e2e-node.sh
 +++ b/hack/make-rules/test-e2e-node.sh
-@@ -168,6 +168,6 @@ else
-     --container-runtime-endpoint=${container_runtime_endpoint} \
-     --image-service-endpoint=${image_service_endpoint} \
+@@ -173,6 +173,6 @@
+     --system-spec-name="${system_spec_name}" --extra-envs="${extra_envs}" \
+     --ginkgo-flags="${ginkgoflags}" --test-flags="--container-runtime=${runtime} \
      --alsologtostderr --v 4 --report-dir=${artifacts} --node-name $(hostname) \
--    $test_args" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"
-+    $test_args --k8s-bin-dir /usr/bin" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"
+-    ${test_args}" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"
++    ${test_args} --k8s-bin-dir /usr/bin" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"
    exit $?
  fi
diff --git a/testing/kubernetes/make-test-cmd-run-over-hyperkube-based-kubectl.patch b/testing/kubernetes/make-test-cmd-run-over-hyperkube-based-kubectl.patch
index d9282fc931..92db8937dd 100644
--- a/testing/kubernetes/make-test-cmd-run-over-hyperkube-based-kubectl.patch
+++ b/testing/kubernetes/make-test-cmd-run-over-hyperkube-based-kubectl.patch
@@ -1,8 +1,6 @@
-diff --git a/hack/lib/test.sh b/hack/lib/test.sh
-index 575664a..7318cf9 100644
 --- a/hack/lib/test.sh
 +++ b/hack/lib/test.sh
-@@ -73,10 +73,10 @@ kube::test::object_assert() {
+@@ -73,10 +73,10 @@
    local object=$2
    local request=$3
    local expected=$4
@@ -10,20 +8,8 @@ index 575664a..7318cf9 100644
 +  local get_args=${5:-}
  
    for j in $(seq 1 ${tries}); do
--    res=$(eval kubectl get "${kube_flags[@]}" ${args} $object -o go-template=\"$request\")
-+	res=$(eval kubectl ${args} get "${kube_flags[@]}" ${get_args} $object -o go-template=\"$request\")
-     if [[ "$res" =~ ^$expected$ ]]; then
-         echo -n ${green}
-         echo "$(kube::test::get_caller 3): Successful get $object $request: $res"
-diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
-index 2a68768..54a8233 100755
---- a/hack/make-rules/test-e2e-node.sh
-+++ b/hack/make-rules/test-e2e-node.sh
-@@ -168,6 +168,6 @@ else
-     --container-runtime-endpoint=${container_runtime_endpoint} \
-     --image-service-endpoint=${image_service_endpoint} \
-     --alsologtostderr --v 4 --report-dir=${artifacts} --node-name $(hostname) \
--    $test_args --k8s-bin-dir /usr/bin" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"
-+    $test_args" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"
-   exit $?
- fi
+-    res=$(eval kubectl get "${kube_flags[@]}" ${args} ${object} -o go-template=\"${request}\")
++    res=$(eval kubectl ${args} get "${kube_flags[@]}" ${get_args} ${object} -o go-template=\"${request\}")
+     if [[ "${res}" =~ ^$expected$ ]]; then
+         echo -n "${green}"
+         echo "$(kube::test::get_caller 3): Successful get ${object} ${request}: ${res}"
diff --git a/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch b/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch
index ebdade780a..c336864b07 100644
--- a/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch
+++ b/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch
@@ -1,16 +1,16 @@
 --- build/cmd/hyperkube/main.go.orig
 +++ build/cmd/hyperkube/main.go
-@@ -35,7 +35,6 @@
- 	utilflag "k8s.io/apiserver/pkg/util/flag"
- 	"k8s.io/apiserver/pkg/util/logs"
+@@ -36,7 +36,6 @@
+ 	cliflag "k8s.io/component-base/cli/flag"
+ 	"k8s.io/component-base/logs"
  	cloudcontrollermanager "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
 -	kubeapiserver "k8s.io/kubernetes/cmd/kube-apiserver/app"
  	kubecontrollermanager "k8s.io/kubernetes/cmd/kube-controller-manager/app"
  	kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app"
  	kubescheduler "k8s.io/kubernetes/cmd/kube-scheduler/app"
-@@ -86,12 +85,6 @@
- func NewHyperKubeCommand() (*cobra.Command, []func() *cobra.Command) {
- 	// these have to be functions since the command is polymorphic.  Cobra wants you to be  top level
+@@ -87,12 +86,6 @@
+ func NewHyperKubeCommand(stopCh <-chan struct{}) (*cobra.Command, []func() *cobra.Command) {
+ 	// these have to be functions since the command is polymorphic. Cobra wants you to be top level
  	// command to get executed
 -	apiserver := func() *cobra.Command {
 -		ret := kubeapiserver.NewAPIServerCommand(stopCh)
@@ -21,7 +21,7 @@
  	controller := func() *cobra.Command {
  		ret := kubecontrollermanager.NewControllerManagerCommand()
  		// add back some unfortunate aliases that should be removed
-@@ -115,7 +108,6 @@
+@@ -116,7 +109,6 @@
  	cloudController := func() *cobra.Command { return cloudcontrollermanager.NewCloudControllerManagerCommand() }
  
  	commandFns := []func() *cobra.Command{