From 8e0c325a7cb44943448862ad26ebcbc2da09e55e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 25 Dec 2019 04:05:15 -0600 Subject: gn: Update kubernetes packages. --- gn/packages/kubernetes.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gn/packages/kubernetes.scm') diff --git a/gn/packages/kubernetes.scm b/gn/packages/kubernetes.scm index d90b367..01cde49 100644 --- a/gn/packages/kubernetes.scm +++ b/gn/packages/kubernetes.scm @@ -13,7 +13,7 @@ (define-public kubernetes (package (name "kubernetes") - (version "1.16.3") + (version "1.16.4") (source (origin (method git-fetch) (uri (git-reference @@ -22,7 +22,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1v4dhlpvi8gkc26zaxdfypng8b1f2lwm6hjz2amvq8mh49j5x7ld")))) + "0snk4jr5is8rwx0px2kwx802dg770mrgp11irnwy2z50p327jrcs")))) (build-system go-build-system) (arguments `(#:import-path "k8s.io/kubernetes" @@ -101,7 +101,7 @@ deployment, maintenance, and scaling of applications.") (package (inherit kubernetes) (name "kubernetes") - (version "1.15.6") + (version "1.15.7") (source (origin (method git-fetch) (uri (git-reference @@ -110,7 +110,7 @@ deployment, maintenance, and scaling of applications.") (file-name (git-file-name name version)) (sha256 (base32 - "055xizqpg5yjda7b6l1vnajmbfz2ljh2z85r1d63683rqyw2y078")))) + "0xk5cx0ihvnfb3y6s0xhkfyb7a62dy2bkxsarq4wdis5nkc2jdim")))) (propagated-inputs `(("crictl" ,crictl-1.15))))) @@ -118,7 +118,7 @@ deployment, maintenance, and scaling of applications.") (package (inherit kubernetes) (name "kubernetes") - (version "1.14.9") + (version "1.14.10") (source (origin (method git-fetch) (uri (git-reference @@ -127,7 +127,7 @@ deployment, maintenance, and scaling of applications.") (file-name (git-file-name name version)) (sha256 (base32 - "06w2jjd89jjzmc0db1fgwnsyfwjr07chh8q3zvmx5pznprvv485l")))) + "09p3w64f7spcj2mg1gw32g2mwjpii4zmpd2ychazdq7zrc85lxdq")))) (propagated-inputs `(("crictl" ,crictl-1.14))))) -- cgit v1.2.3 From 16ef26bbf0917a101c025702e3cf861e51ebff29 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Dec 2019 04:05:17 -0600 Subject: gn: kubernetes: Patch reference to mount --- gn/packages/kubernetes.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gn/packages/kubernetes.scm') diff --git a/gn/packages/kubernetes.scm b/gn/packages/kubernetes.scm index 01cde49..208cab4 100644 --- a/gn/packages/kubernetes.scm +++ b/gn/packages/kubernetes.scm @@ -8,6 +8,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages linux) #:use-module (gnu packages rsync)) (define-public kubernetes @@ -35,12 +36,18 @@ (for-each make-file-writable (find-files ".")) #t)) (add-before 'build 'prepare-build - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "src/k8s.io/kubernetes" (substitute* '("build/root/Makefile" "build/root/Makefile.generated_files" "build/pause/Makefile") - (("/bin/bash") (which "bash")))) + (("/bin/bash") (which "bash"))) + (substitute* "pkg/util/mount/mount.go" + (("defaultMountCommand.*") + (string-append "defaultMountCommand = \"" + (assoc-ref inputs "util-linux") + "/bin/mount\"\n"))) + ) #t)) (replace 'build (lambda _ @@ -87,7 +94,8 @@ (native-inputs `(("which" ,which))) (inputs - `(("rsync" ,rsync))) + `(("rsync" ,rsync) + ("util-linux" ,util-linux))) (propagated-inputs `(("crictl" ,crictl))) ; Must be the same major+minor version as kubernetes. (home-page "https://kubernetes.io/") -- cgit v1.2.3 From cf4fde729da33aadc017ee2b003368ed01ac3bcf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Dec 2019 04:48:20 -0600 Subject: gn: kubernetes@1.16: Fix version string. --- gn/packages/kubernetes.scm | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) (limited to 'gn/packages/kubernetes.scm') diff --git a/gn/packages/kubernetes.scm b/gn/packages/kubernetes.scm index 208cab4..1c9bef9 100644 --- a/gn/packages/kubernetes.scm +++ b/gn/packages/kubernetes.scm @@ -46,8 +46,27 @@ (("defaultMountCommand.*") (string-append "defaultMountCommand = \"" (assoc-ref inputs "util-linux") - "/bin/mount\"\n"))) - ) + "/bin/mount\"\n")))) + #t)) + (add-before 'build 'fix-version-numbers + (lambda _ + (with-directory-excursion "src/k8s.io/kubernetes" + (substitute* '("cmd/kubeadm/app/version/base.go" + "staging/src/k8s.io/client-go/pkg/version/base.go" + "staging/src/k8s.io/kubectl/pkg/version/base.go" + "staging/src/k8s.io/component-base/version/base.go" + "staging/src/k8s.io/component-base/metrics/version_parser_test.go" + "pkg/version/base.go" + "vendor/k8s.io/client-go/pkg/version/base.go" + "vendor/k8s.io/kubectl/pkg/version/base.go" + "vendor/k8s.io/component-base/metrics/version_parser_test.go") + (("v0.0.0-master\\+\\$Format:\\%h\\$") (string-append "v" ,version)) + (("v0.0.0-master") (string-append "v" ,version)) + (("gitMajor string = \"\"") + (string-append "gitMajor string = \"" ,(version-major version) "\"")) + (("gitMinor string = \"\"") + (string-append "gitMinor string = \"" + ,(string-drop (version-major+minor version) 2) "\"")))) #t)) (replace 'build (lambda _ @@ -119,12 +138,17 @@ deployment, maintenance, and scaling of applications.") (sha256 (base32 "0xk5cx0ihvnfb3y6s0xhkfyb7a62dy2bkxsarq4wdis5nkc2jdim")))) + (arguments + (substitute-keyword-arguments (package-arguments kubernetes) + ((#:phases phases) + `(modify-phases ,phases + (delete 'fix-version-numbers))))) (propagated-inputs `(("crictl" ,crictl-1.15))))) (define-public kubernetes-1.14 (package - (inherit kubernetes) + (inherit kubernetes-1.15) (name "kubernetes") (version "1.14.10") (source (origin @@ -141,7 +165,7 @@ deployment, maintenance, and scaling of applications.") (define-public kubernetes-1.13 (package - (inherit kubernetes) + (inherit kubernetes-1.15) (name "kubernetes") (version "1.13.12") (source (origin -- cgit v1.2.3 From d76e6c198cbed3b5ceaa4eb21c539e22be9f3861 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 3 Jan 2020 02:34:31 -0600 Subject: gn: Fix kubernetes phase order --- gn/packages/kubernetes.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gn/packages/kubernetes.scm') diff --git a/gn/packages/kubernetes.scm b/gn/packages/kubernetes.scm index 1c9bef9..e762895 100644 --- a/gn/packages/kubernetes.scm +++ b/gn/packages/kubernetes.scm @@ -282,7 +282,7 @@ tools for Kubelet CRI.") (replace 'build (lambda _ (invoke "make" "windows"))) ; This is the correct invocation - (add-before 'prepare-source 'update-version + (add-after 'prepare-source 'update-version (lambda _ (substitute* "Makefile" (("^VERSION .*") (string-append "VERSION := " ,version "\n"))) -- cgit v1.2.3