From 37ef9a2f9ed7fc0150c0f7b3da78f3899cdc9974 Mon Sep 17 00:00:00 2001 From: Shoaib Nasir Date: Fri, 11 May 2018 17:22:36 -0400 Subject: [PATCH] Adding Kubernetes packages Change-Id: I13aeef0bbb019055d51e43c63fdf3ba0bb0d8775 Signed-off-by: Bart Wensley --- kubernetes/docker-ce/centos/build_srpm.data | 3 ++ ...te-package-versioning-for-TIS-format.patch | 36 ++++++++++++++ .../docker-ce/centos/meta_patches/PATCH_ORDER | 1 + kubernetes/docker-ce/centos/srpm_path | 1 + kubernetes/kubernetes/centos/build_srpm.data | 1 + ...te-package-versioning-for-TIS-format.patch | 47 +++++++++++++++++++ .../centos/meta_patches/PATCH_ORDER | 1 + kubernetes/kubernetes/centos/srpm_path | 1 + 8 files changed, 91 insertions(+) create mode 100644 kubernetes/docker-ce/centos/build_srpm.data create mode 100644 kubernetes/docker-ce/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch create mode 100644 kubernetes/docker-ce/centos/meta_patches/PATCH_ORDER create mode 100644 kubernetes/docker-ce/centos/srpm_path create mode 100644 kubernetes/kubernetes/centos/build_srpm.data create mode 100644 kubernetes/kubernetes/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch create mode 100644 kubernetes/kubernetes/centos/meta_patches/PATCH_ORDER create mode 100644 kubernetes/kubernetes/centos/srpm_path diff --git a/kubernetes/docker-ce/centos/build_srpm.data b/kubernetes/docker-ce/centos/build_srpm.data new file mode 100644 index 000000000..97226cee4 --- /dev/null +++ b/kubernetes/docker-ce/centos/build_srpm.data @@ -0,0 +1,3 @@ +VERSION=18.03.1 +MODULE=docker-ce +TIS_PATCH_VER=1 diff --git a/kubernetes/docker-ce/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/kubernetes/docker-ce/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch new file mode 100644 index 000000000..569a96d9b --- /dev/null +++ b/kubernetes/docker-ce/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -0,0 +1,36 @@ +commit b86683a477f4d40e09501b6953a89c634bd9de75 +Author: Shoaib Nasir +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 diff --git a/kubernetes/docker-ce/centos/meta_patches/PATCH_ORDER b/kubernetes/docker-ce/centos/meta_patches/PATCH_ORDER new file mode 100644 index 000000000..91f9a80ea --- /dev/null +++ b/kubernetes/docker-ce/centos/meta_patches/PATCH_ORDER @@ -0,0 +1 @@ +0001-Update-package-versioning-for-TIS-format.patch diff --git a/kubernetes/docker-ce/centos/srpm_path b/kubernetes/docker-ce/centos/srpm_path new file mode 100644 index 000000000..5299cbc6a --- /dev/null +++ b/kubernetes/docker-ce/centos/srpm_path @@ -0,0 +1 @@ +mirror:Source/docker-ce-18.03.1.ce-1.el7.centos.src.rpm diff --git a/kubernetes/kubernetes/centos/build_srpm.data b/kubernetes/kubernetes/centos/build_srpm.data new file mode 100644 index 000000000..8aeb55368 --- /dev/null +++ b/kubernetes/kubernetes/centos/build_srpm.data @@ -0,0 +1 @@ +TIS_PATCH_VER=1 diff --git a/kubernetes/kubernetes/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/kubernetes/kubernetes/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch new file mode 100644 index 000000000..0cb35f2c7 --- /dev/null +++ b/kubernetes/kubernetes/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -0,0 +1,47 @@ +commit 7f052d7778c72d41a5a559f9f81617e39ef3016c +Author: Shoaib Nasir +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 diff --git a/kubernetes/kubernetes/centos/meta_patches/PATCH_ORDER b/kubernetes/kubernetes/centos/meta_patches/PATCH_ORDER new file mode 100644 index 000000000..91f9a80ea --- /dev/null +++ b/kubernetes/kubernetes/centos/meta_patches/PATCH_ORDER @@ -0,0 +1 @@ +0001-Update-package-versioning-for-TIS-format.patch diff --git a/kubernetes/kubernetes/centos/srpm_path b/kubernetes/kubernetes/centos/srpm_path new file mode 100644 index 000000000..532fbb5e6 --- /dev/null +++ b/kubernetes/kubernetes/centos/srpm_path @@ -0,0 +1 @@ +mirror:Source/kubernetes-1.10.0-1.el7.src.rpm