diff --git a/.gitignore b/.gitignore index 7d84bdb..96adc0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kubernetes-dde7222.tar.gz +/kubernetes-769230e.tar.gz diff --git a/0001-golang-1.4-was-happy-with-X-key-val.patch b/0001-golang-1.4-was-happy-with-X-key-val.patch deleted file mode 100644 index 26b450e..0000000 --- a/0001-golang-1.4-was-happy-with-X-key-val.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 3a90386c78145d21d70387689500bfd773b8b4d8 Mon Sep 17 00:00:00 2001 -From: Jan Chaloupka -Date: Fri, 24 Jul 2015 16:56:18 +0200 -Subject: [PATCH] golang 1.4 was happy with -X key val golang 1.5 complains ans - wants -X key=val - ---- - hack/lib/version.sh | 24 +++++++++++++++++++----- - 1 file changed, 19 insertions(+), 5 deletions(-) - -diff --git a/hack/lib/version.sh b/hack/lib/version.sh -index 794ab6f..1e02d7e 100644 ---- a/hack/lib/version.sh -+++ b/hack/lib/version.sh -@@ -99,6 +99,20 @@ kube::version::load_version_vars() { - source "${version_file}" - } - -+# golang 1.5 wants `-X key=val`, but golang 1.4- REQUIRES `-X key val` -+kube::version::ldflag() { -+ local key=${1} -+ local val=${2} -+ -+ GO_VERSION=($(go version)) -+ -+ if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.5') ]]; then -+ echo "-X ${KUBE_GO_PACKAGE}/pkg/version.${key} ${val}" -+ else -+ echo "-X ${KUBE_GO_PACKAGE}/pkg/version.${key}=${val}" -+ fi -+} -+ - # Prints the value that needs to be passed to the -ldflags parameter of go build - # in order to set the Kubernetes based on the git tree status. - kube::version::ldflags() { -@@ -106,18 +120,18 @@ kube::version::ldflags() { - - local -a ldflags=() - if [[ -n ${KUBE_GIT_COMMIT-} ]]; then -- ldflags+=(-X "${KUBE_GO_PACKAGE}/pkg/version.gitCommit" "${KUBE_GIT_COMMIT}") -- ldflags+=(-X "${KUBE_GO_PACKAGE}/pkg/version.gitTreeState" "${KUBE_GIT_TREE_STATE}") -+ ldflags+=($(kube::version::ldflag "gitCommit" "${KUBE_GIT_COMMIT}")) -+ ldflags+=($(kube::version::ldflag "gitTreeState" "${KUBE_GIT_TREE_STATE}")) - fi - - if [[ -n ${KUBE_GIT_VERSION-} ]]; then -- ldflags+=(-X "${KUBE_GO_PACKAGE}/pkg/version.gitVersion" "${KUBE_GIT_VERSION}") -+ ldflags+=($(kube::version::ldflag "gitVersion" "${KUBE_GIT_VERSION}")) - fi - - if [[ -n ${KUBE_GIT_MAJOR-} && -n ${KUBE_GIT_MINOR-} ]]; then - ldflags+=( -- -X "${KUBE_GO_PACKAGE}/pkg/version.gitMajor" "${KUBE_GIT_MAJOR}" -- -X "${KUBE_GO_PACKAGE}/pkg/version.gitMinor" "${KUBE_GIT_MINOR}" -+ $(kube::version::ldflag "gitMajor" "${KUBE_GIT_MAJOR}") -+ $(kube::version::ldflag "gitMinor" "${KUBE_GIT_MINOR}") - ) - fi - --- -1.9.3 - diff --git a/kubernetes.spec b/kubernetes.spec index a910357..fe4bbdf 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -20,7 +20,7 @@ %global repo kubernetes # https://github.com/GoogleCloudPlatform/kubernetes %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit dde72229dc9cbbdacfb2e44b22d9d5b357027020 +%global commit 769230e735993bb0bf924279a40593c147c9a6ab %global shortcommit %(c=%{commit}; echo ${c:0:7}) #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)" @@ -30,7 +30,7 @@ Name: kubernetes Version: 1.0.0 -Release: 0.16.git%{shortcommit}%{?dist} +Release: 0.17.git%{shortcommit}%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} @@ -42,7 +42,6 @@ Patch2: Change-etcd-server-port.patch %if 0%{?with_debug} Patch3: build-with-debug-info.patch %endif -Patch4: 0001-golang-1.4-was-happy-with-X-key-val.patch # It obsoletes cadvisor but needs its source code (literally integrated) Obsoletes: cadvisor @@ -384,7 +383,7 @@ Kubernetes client tools like kubectl %build export KUBE_GIT_TREE_STATE="clean" export KUBE_GIT_COMMIT=%{commit} -export KUBE_GIT_VERSION=v1.0.0-909-gdde72229dc9cbb +export KUBE_GIT_VERSION=v1.0.0-1003-g769230e735993b hack/build-go.sh --use_go_build hack/build-go.sh --use_go_build cmd/kube-version-change @@ -556,6 +555,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun %changelog +* Thu Jul 30 2015 jchaloup - 1.0.0-0.17.git769230e +- Bump to upstream 769230e735993bb0bf924279a40593c147c9a6ab + related: #1243827 + * Wed Jul 29 2015 jchaloup - 1.0.0-0.16.gitdde7222 - Bump to upstream dde72229dc9cbbdacfb2e44b22d9d5b357027020 related: #1243827 diff --git a/sources b/sources index 99bf090..0b87abf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a9b13215ecc37f0e2a5ab764deaab39f kubernetes-dde7222.tar.gz +f9aae3132cf3ab9c08f5efc4641b8aac kubernetes-769230e.tar.gz