starlingx/integ
Code Issues Proposed changes

Adding Kubernetes packages

Browse Source 
Change-Id: I13aeef0bbb019055d51e43c63fdf3ba0bb0d8775
Signed-off-by: Bart Wensley <barton.wensley@windriver.com>
This commit is contained in:
Shoaib Nasir 2018-05-11 17:22:36 -04:00 committed by Bart Wensley
parent 6e66c1965b
commit 37ef9a2f9e
8 changed files with 91 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kubernetes/docker-ce/centos/build_srpm.data Normal file
View File

@ -0,0 +1,3 @@
VERSION=18.03.1
MODULE=docker-ce
TIS_PATCH_VER=1

36
kubernetes/docker-ce/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch Normal file
View File

@ -0,0 +1,36 @@
commit b86683a477f4d40e09501b6953a89c634bd9de75
Author: Shoaib Nasir <shoaib.nasir@windriver.com>
Date: Mon May 14 15:32:06 2018 -0400
WRS: 0001-Update-package-versioning-for-TIS-format.patch
diff --git a/SPECS/docker-ce.spec b/SPECS/docker-ce.spec
index 82b5042..36d2980 100644
--- a/SPECS/docker-ce.spec
+++ b/SPECS/docker-ce.spec
@@ -1,6 +1,8 @@
+%global _version 18.03.1
+
Name: docker-ce
Version: %{_version}
-Release: %{_release}%{?dist}
+Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: The open-source application container engine
Group: Tools/Docker
License: ASL 2.0
@@ -59,6 +61,7 @@ depending on a particular stack or provider.
%setup -q -c -n src -a 1
%build
+export PBR_VERSION=%{version}
export DOCKER_GITCOMMIT=%{_gitcommit}
mkdir -p /go/src/github.com/docker
rm -f /go/src/github.com/docker/cli
@@ -79,6 +82,7 @@ engine/bundles/dynbinary-daemon/dockerd -v
%install
# install binary
+export PBR_VERSION=%{version}
install -d $RPM_BUILD_ROOT/%{_bindir}
install -p -m 755 cli/build/docker $RPM_BUILD_ROOT/%{_bindir}/docker
install -p -m 755 $(readlink -f engine/bundles/dynbinary-daemon/dockerd) $RPM_BUILD_ROOT/%{_bindir}/dockerd

1
kubernetes/docker-ce/centos/meta_patches/PATCH_ORDER Normal file
View File

@ -0,0 +1 @@
0001-Update-package-versioning-for-TIS-format.patch

1
kubernetes/docker-ce/centos/srpm_path Normal file
View File

@ -0,0 +1 @@
mirror:Source/docker-ce-18.03.1.ce-1.el7.centos.src.rpm

1
kubernetes/kubernetes/centos/build_srpm.data Normal file
View File

@ -0,0 +1 @@
TIS_PATCH_VER=1

47
kubernetes/kubernetes/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch Normal file
View File

@ -0,0 +1,47 @@
commit 7f052d7778c72d41a5a559f9f81617e39ef3016c
Author: Shoaib Nasir <shoaib.nasir@windriver.com>
Date: Mon May 14 16:18:45 2018 -0400
WRS: 0001-Update-package-versioning-for-TIS-format.patch
diff --git a/SPECS/kubernetes.spec b/SPECS/kubernetes.spec
index fd43ef4..ab48da4 100644
--- a/SPECS/kubernetes.spec
+++ b/SPECS/kubernetes.spec
@@ -45,7 +45,7 @@
##############################################
Name: kubernetes
Version: %{kube_version}
-Release: 1%{?dist}
+Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Container cluster management
License: ASL 2.0
URL: https://%{import_path}
@@ -807,9 +807,9 @@ Summary: Kubernetes services for node host
%if 0%{?fedora} >= 27
Requires: (docker or docker-ce)
-Suggests: docker
+Suggests: docker-ce
%else
-Requires: docker
+Requires: docker-ce
%endif
Requires: conntrack-tools
@@ -891,6 +891,7 @@ mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/.
###############
%build
+export PBR_VERSION=%{version}
pushd src/k8s.io/kubernetes/
export KUBE_GIT_TREE_STATE="clean"
export KUBE_GIT_COMMIT=%{commit}
@@ -915,6 +916,7 @@ popd
popd
%install
+export PBR_VERSION=%{version}
pushd src/k8s.io/kubernetes/
. hack/lib/init.sh
kube::golang::setup_env

1
kubernetes/kubernetes/centos/meta_patches/PATCH_ORDER Normal file
View File

@ -0,0 +1 @@
0001-Update-package-versioning-for-TIS-format.patch

1
kubernetes/kubernetes/centos/srpm_path Normal file
View File

@ -0,0 +1 @@
mirror:Source/kubernetes-1.10.0-1.el7.src.rpm