From ea5b85ace98be324ba8f4e5b3aafb89ad291a9de Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 12 2017 14:23:44 +0000 Subject: import kubernetes-1.5.2-0.5.gita552679.el7 --- diff --git a/.gitignore b/.gitignore index c90332d..7a50ac4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/contrib-7fbd252.tar.gz SOURCES/go-bindata-a0ff256.tar.gz SOURCES/kubernetes-43a9be4.tar.gz -SOURCES/ose-c55cf2b.tar.gz +SOURCES/ose-a552679.tar.gz diff --git a/.kubernetes.metadata b/.kubernetes.metadata index c95ef89..40de11d 100644 --- a/.kubernetes.metadata +++ b/.kubernetes.metadata @@ -1,4 +1,4 @@ aeadd20e11fecfec6428039206120bdc91d6ad3c SOURCES/contrib-7fbd252.tar.gz 7d5ccafe85f5c869b7abc6a23e4c193436239468 SOURCES/go-bindata-a0ff256.tar.gz 8a5787aafcce589f332e71c1be4c4bce7133125e SOURCES/kubernetes-43a9be4.tar.gz -b173436cec35e6b947a7546736bce2258954eda0 SOURCES/ose-c55cf2b.tar.gz +8dd92f29744ae83f37fa7ecf605c231bcbd7bb8a SOURCES/ose-a552679.tar.gz diff --git a/SOURCES/fix-rootScopeNaming-generate-selfLink-issue-37686.patch b/SOURCES/fix-rootScopeNaming-generate-selfLink-issue-37686.patch new file mode 100644 index 0000000..ca4b0db --- /dev/null +++ b/SOURCES/fix-rootScopeNaming-generate-selfLink-issue-37686.patch @@ -0,0 +1,28 @@ +From 827c5e021d37202dbf30b0358cc77a9517c31819 Mon Sep 17 00:00:00 2001 +From: Jan Chaloupka +Date: Wed, 18 Jan 2017 09:04:15 +0100 +Subject: [PATCH] fix rootScopeNaming generate selfLink issue #37686 + +--- + src/k8s.io/kubernetes/pkg/apiserver/api_installer.go | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/k8s.io/kubernetes/pkg/apiserver/api_installer.go b/src/k8s.io/kubernetes/pkg/apiserver/api_installer.go +index eaf6e23..c3144c4 100644 +--- a/src/k8s.io/kubernetes/pkg/apiserver/api_installer.go ++++ b/src/k8s.io/kubernetes/pkg/apiserver/api_installer.go +@@ -799,7 +799,10 @@ func (n rootScopeNaming) GenerateLink(req *restful.Request, obj runtime.Object) + return "", err + } + } +- return n.pathPrefix + url.QueryEscape(name) + n.pathSuffix, nil ++ if len(n.pathSuffix) == 0 { ++ return gpath.Join(n.pathPrefix, url.QueryEscape(name)), nil ++ } ++ return gpath.Join(n.pathPrefix, url.QueryEscape(name), n.pathSuffix), nil + } + + // GenerateListLink returns the appropriate path and query to locate a list by its canonical path. +-- +2.7.4 + diff --git a/SPECS/kubernetes.spec b/SPECS/kubernetes.spec index 80a6569..5e72ed4 100644 --- a/SPECS/kubernetes.spec +++ b/SPECS/kubernetes.spec @@ -21,7 +21,7 @@ # https://github.com/openshift/ose %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path k8s.io/kubernetes -%global commit c55cf2b7d8bfeb947f77453415d775d7f71c89c2 +%global commit a55267932d501b9fbd6d73e5ded47d79b5763ce5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global openshift_ip github.com/openshift/origin @@ -57,7 +57,7 @@ %global O4N_GIT_MAJOR_VERSION 3 %global O4N_GIT_MINOR_VERSION 4+ -%global O4N_GIT_VERSION v3.5.0.17 +%global O4N_GIT_VERSION v3.5.0.55 %global K8S_GIT_VERSION v1.5.2-47-g43a9be4 %global kube_version 1.5.2 %global kube_git_version v%{kube_version} @@ -69,7 +69,7 @@ Name: kubernetes Version: %{kube_version} -Release: 0.2.git%{shortcommit}%{?dist} +Release: 0.5.git%{shortcommit}%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} @@ -92,6 +92,8 @@ Patch9: hack-test-cmd.sh.patch Patch13: remove-apiserver-backport-kubectl-add-kube-prefix-fo.patch Patch17: Hyperkube-remove-federation-cmds.patch +Patch18: fix-rootScopeNaming-generate-selfLink-issue-37686.patch + # It obsoletes cadvisor but needs its source code (literally integrated) Obsoletes: cadvisor @@ -207,6 +209,21 @@ cp -r ../%{con_repo}-%{con_commit}/init contrib/. mkdir docs cp -r ../%{k8s_repo}-%{k8s_commit}/docs/admin docs/. cp -r ../%{k8s_repo}-%{k8s_commit}/docs/man docs/. +cp -r ../%{k8s_repo}-%{k8s_commit}/cmd/{gendocs,genkubedocs,genman,genyaml} cmd/. +mkdir -p federation/cmd +cp -r ../%{k8s_repo}-%{k8s_commit}/federation . +#github.com/spf13/cobra/doc +mkdir -p vendor/github.com/spf13 +cp -r ../%{k8s_repo}-%{k8s_commit}/vendor/github.com/spf13/cobra vendor/github.com/spf13/. +#github.com/cpuguy83/go-md2man/md2man +mkdir -p vendor/github.com/cpuguy83 +cp -r ../%{k8s_repo}-%{k8s_commit}/vendor/github.com/cpuguy83/go-md2man vendor/github.com/cpuguy83/. +#github.com/aws/aws-sdk-go/service/route53 +mkdir -p vendor/github.com/aws +cp -r ../%{k8s_repo}-%{k8s_commit}/vendor/github.com/aws/aws-sdk-go vendor/github.com/aws/. +#google.golang.org/api/dns/v1 +mkdir -p vendor/google.golang.org +cp -r ../%{k8s_repo}-%{k8s_commit}/vendor/google.golang.org/api vendor/google.golang.org/. # copy LICENSE and *.md cp ../%{k8s_repo}-%{k8s_commit}/LICENSE . cp ../%{k8s_repo}-%{k8s_commit}/*.md . @@ -240,6 +257,8 @@ cp -r ../%{k8s_repo}-%{k8s_commit}/pkg/version/verflag vendor/k8s.io/kubernetes/ mkdir -p src/k8s.io/kubernetes mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/. +%patch18 -p1 + mkdir -p src/%{bindata_provider_prefix} cp -r ../%{bindata_repo}-%{bindata_commit}/* src/%{bindata_provider_prefix}/. @@ -261,6 +280,7 @@ export GOLDFLAGS='-linkmode=external' make WHAT="--use_go_build cmd/hyperkube cmd/kube-apiserver" # convert md to man +./hack/generate-docs.sh || true pushd docs pushd admin cp kube-apiserver.md kube-controller-manager.md kube-proxy.md kube-scheduler.md kubelet.md .. @@ -456,6 +476,18 @@ fi %systemd_postun %changelog +* Tue Mar 21 2017 Jan Chaloupka - 1.5.2-0.5.gita552679 +- Re-generate man pages + related: #1434371 + +* Tue Mar 21 2017 Jan Chaloupka - 1.5.2-0.4.gita552679 +- Update to ose v3.5.0.55 + resolves: #1434371 + +* Thu Mar 09 2017 Jan Chaloupka - 1.5.2-0.3.gitc55cf2b +- fix rootScopeNaming generate selfLink + resolves: #1430427 + * Mon Feb 06 2017 Jan Chaloupka - 1.5.2-0.2.gitc55cf2b - Fix rpmdiff issues related: #1419726