diff --git a/.gitignore b/.gitignore index 2b39fa6..e735724 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kubernetes-4c42e13.tar.gz +/kubernetes-2bfa9a1.tar.gz diff --git a/Change-etcd-server-port.patch b/Change-etcd-server-port.patch index 2a8d34b..ba956af 100644 --- a/Change-etcd-server-port.patch +++ b/Change-etcd-server-port.patch @@ -1,6 +1,6 @@ -From 6ff601af2b4d2a684f46984ff68673871a6e0859 Mon Sep 17 00:00:00 2001 +From 23d7f34af3e6974eea43abe1ca9b3054822014cf Mon Sep 17 00:00:00 2001 From: Jan Chaloupka -Date: Fri, 17 Jul 2015 09:35:35 +0200 +Date: Mon, 10 Aug 2015 09:55:49 +0200 Subject: [PATCH] Change etcd server port --- @@ -8,15 +8,15 @@ Subject: [PATCH] Change etcd server port 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/init/systemd/environ/apiserver b/contrib/init/systemd/environ/apiserver -index d0b1900..328b5c4 100644 +index 223b992..ddb5974 100644 --- a/contrib/init/systemd/environ/apiserver +++ b/contrib/init/systemd/environ/apiserver -@@ -14,7 +14,7 @@ KUBE_API_ADDRESS="--address=127.0.0.1" - # KUBELET_PORT="--kubelet_port=10250" +@@ -14,7 +14,7 @@ KUBE_API_ADDRESS="--insecure-bind-address=127.0.0.1" + # KUBELET_PORT="--kubelet-port=10250" # Comma separated list of nodes in the etcd cluster --KUBE_ETCD_SERVERS="--etcd_servers=http://127.0.0.1:4001" -+KUBE_ETCD_SERVERS="--etcd_servers=http://127.0.0.1:2379" +-KUBE_ETCD_SERVERS="--etcd-servers=http://127.0.0.1:4001" ++KUBE_ETCD_SERVERS="--etcd-servers=http://127.0.0.1:2379" # Address range to use for services KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16" diff --git a/kubernetes.spec b/kubernetes.spec index 437bb59..9852588 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -21,7 +21,7 @@ # https://github.com/GoogleCloudPlatform/kubernetes %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path k8s.io/kubernetes -%global commit 4c42e1302d3b351f3cb6074d32aa420bbd45e07d +%global commit 2bfa9a1f98147cfdc2e9f4cf50e2c430518d91eb %global shortcommit %(c=%{commit}; echo ${c:0:7}) #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)" @@ -31,7 +31,7 @@ Name: kubernetes Version: 1.1.0 -Release: 0.3.git%{shortcommit}%{?dist} +Release: 0.4.git%{shortcommit}%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} @@ -183,6 +183,7 @@ Provides: golang(%{import_path}/pkg/kubelet/metrics) = %{version}-%{release} Provides: golang(%{import_path}/pkg/kubelet/network) = %{version}-%{release} Provides: golang(%{import_path}/pkg/kubelet/network/exec) = %{version}-%{release} Provides: golang(%{import_path}/pkg/kubelet/prober) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/kubelet/qos) = %{version}-%{release} Provides: golang(%{import_path}/pkg/kubelet/rkt) = %{version}-%{release} Provides: golang(%{import_path}/pkg/kubelet/types) = %{version}-%{release} Provides: golang(%{import_path}/pkg/kubelet/util) = %{version}-%{release} @@ -195,6 +196,7 @@ Provides: golang(%{import_path}/pkg/probe/http) = %{version}-%{release} Provides: golang(%{import_path}/pkg/probe/tcp) = %{version}-%{release} Provides: golang(%{import_path}/pkg/proxy) = %{version}-%{release} Provides: golang(%{import_path}/pkg/proxy/config) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/proxy/userspace) = %{version}-%{release} Provides: golang(%{import_path}/pkg/registry) = %{version}-%{release} Provides: golang(%{import_path}/pkg/registry/componentstatus) = %{version}-%{release} Provides: golang(%{import_path}/pkg/registry/controller) = %{version}-%{release} @@ -257,7 +259,9 @@ Provides: golang(%{import_path}/pkg/util/iptables) = %{version}-%{release} Provides: golang(%{import_path}/pkg/util/jsonpath) = %{version}-%{release} Provides: golang(%{import_path}/pkg/util/mount) = %{version}-%{release} Provides: golang(%{import_path}/pkg/util/node) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/util/oom) = %{version}-%{release} Provides: golang(%{import_path}/pkg/util/operationmanager) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/util/procfs) = %{version}-%{release} Provides: golang(%{import_path}/pkg/util/proxy) = %{version}-%{release} Provides: golang(%{import_path}/pkg/util/rand) = %{version}-%{release} Provides: golang(%{import_path}/pkg/util/slice) = %{version}-%{release} @@ -397,7 +401,7 @@ Kubernetes client tools like kubectl %build export KUBE_GIT_TREE_STATE="clean" export KUBE_GIT_COMMIT=%{commit} -export KUBE_GIT_VERSION=v1.1.0-alpha.0-1336-g4c42e1302d3b35 +export KUBE_GIT_VERSION=v1.1.0-alpha.0-1464-g2bfa9a1f98147c hack/build-go.sh --use_go_build hack/build-go.sh --use_go_build cmd/kube-version-change @@ -569,6 +573,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun %changelog +* Mon Aug 10 2015 jchaloup - 1.1.0-0.4.git2bfa9a1 +- Bump to upstream 2bfa9a1f98147cfdc2e9f4cf50e2c430518d91eb + related: #1243827 + * Thu Aug 06 2015 jchaloup - 1.1.0-0.3.git4c42e13 - Bump to upstream 4c42e1302d3b351f3cb6074d32aa420bbd45e07d - Change import path prefix to k8s.io/kubernetes diff --git a/sources b/sources index 03a1115..6b63582 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4bbc9e5dc68a00c36db150c4de2d2722 kubernetes-4c42e13.tar.gz +4a34619f65ad10ecd96e810cc476f7a5 kubernetes-2bfa9a1.tar.gz