Update rpm spec and pbr setup configs (#2170)
* Update rpm spec and pbr setup configs * Rename package to kubespray * Do not break Fedora's FHS and install to /usr/share instead * Remove the vendor tag * Update source0 for better artifacts' names * Fix missing files build errors * Make version/release to auto match from git and fit PEP 440 Co-authored-by: Matthias Runge <mrunge@redhat.com> Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru> * Add package paths to roles search in ansible conf Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru> * Poke jinja2 requirements in rpm spec file Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>pull/2177/head
parent
f19c8e8c1d
commit
c116b8022e
|
@ -10,5 +10,5 @@ fact_caching_connection = /tmp
|
|||
stdout_callback = skippy
|
||||
library = ./library
|
||||
callback_whitelist = profile_tasks
|
||||
roles_path = roles:$VIRTUAL_ENV/usr/local/share/kubespray/roles:$VIRTUAL_ENV/usr/local/share/ansible/roles
|
||||
roles_path = roles:$VIRTUAL_ENV/usr/local/share/kubespray/roles:$VIRTUAL_ENV/usr/local/share/ansible/roles:/usr/share/kubespray/roles
|
||||
deprecation_warnings=False
|
||||
|
|
|
@ -1,60 +0,0 @@
|
|||
%global srcname ansible_kubespray
|
||||
|
||||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
Name: ansible-kubespray
|
||||
Version: XXX
|
||||
Release: XXX
|
||||
Summary: Ansible modules for installing Kubernetes
|
||||
|
||||
Group: System Environment/Libraries
|
||||
License: ASL 2.0
|
||||
Vendor: Kubespray <smainklh@gmail.com>
|
||||
Url: https://github.com/kubernetes-incubator/kubespray
|
||||
Source0: https://github.com/kubernetes-incubator/kubespray/archive/%{upstream_version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: git
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: python-d2to1
|
||||
BuildRequires: python-pbr
|
||||
|
||||
Requires: ansible
|
||||
Requires: python-jinja2
|
||||
Requires: python-netaddr
|
||||
|
||||
%description
|
||||
|
||||
Ansible-kubespray is a set of Ansible modules and playbooks for
|
||||
installing a Kubernetes cluster. If you have questions, join us
|
||||
on the https://slack.k8s.io, channel '#kubespray'.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{upstream_version} -S git
|
||||
|
||||
|
||||
%build
|
||||
%{__python2} setup.py build
|
||||
|
||||
|
||||
%install
|
||||
export PBR_VERSION=%{version}
|
||||
export SKIP_PIP_INSTALL=1
|
||||
%{__python2} setup.py install --skip-build --root %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%doc inventory/inventory.example
|
||||
%config /etc/kubespray/ansible.cfg
|
||||
%config /etc/kubespray/inventory/group_vars/all.yml
|
||||
%config /etc/kubespray/inventory/group_vars/k8s-cluster.yml
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info
|
||||
/usr/local/share/kubespray/roles/
|
||||
/usr/local/share/kubespray/playbooks/
|
||||
%defattr(-,root,root)
|
||||
|
||||
|
||||
%changelog
|
|
@ -0,0 +1,61 @@
|
|||
%global srcname kubespray
|
||||
|
||||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
Name: kubespray
|
||||
Version: master
|
||||
Release: %(git describe | sed -r 's/v(\S+-?)-(\S+)-(\S+)/\1.dev\2+\3/')
|
||||
Summary: Ansible modules for installing Kubernetes
|
||||
|
||||
Group: System Environment/Libraries
|
||||
License: ASL 2.0
|
||||
Url: https://github.com/kubernetes-incubator/kubespray
|
||||
Source0: https://github.com/kubernetes-incubator/kubespray/archive/%{upstream_version}.tar.gz#/%{name}-%{release}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: git
|
||||
BuildRequires: python2
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python-d2to1
|
||||
BuildRequires: python2-pbr
|
||||
|
||||
Requires: ansible
|
||||
Requires: python-jinja2 >= 2.10
|
||||
Requires: python-netaddr
|
||||
|
||||
%description
|
||||
|
||||
Ansible-kubespray is a set of Ansible modules and playbooks for
|
||||
installing a Kubernetes cluster. If you have questions, join us
|
||||
on the https://slack.k8s.io, channel '#kubespray'.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{upstream_version} -S git
|
||||
|
||||
|
||||
%build
|
||||
export PBR_VERSION=%{release}
|
||||
%{__python2} setup.py build bdist_rpm
|
||||
|
||||
|
||||
%install
|
||||
export PBR_VERSION=%{release}
|
||||
export SKIP_PIP_INSTALL=1
|
||||
%{__python2} setup.py install --skip-build --root %{buildroot} bdist_rpm
|
||||
|
||||
|
||||
%files
|
||||
%doc %{_docdir}/%{name}/README.md
|
||||
%doc %{_docdir}/%{name}/inventory/inventory.example
|
||||
%config %{_sysconfdir}/%{name}/ansible.cfg
|
||||
%config %{_sysconfdir}/%{name}/inventory/group_vars/all.yml
|
||||
%config %{_sysconfdir}/%{name}/inventory/group_vars/k8s-cluster.yml
|
||||
%license %{_docdir}/%{name}/LICENSE
|
||||
%{python2_sitelib}/%{srcname}-%{release}-py%{python2_version}.egg-info
|
||||
%{_datarootdir}/%{name}/roles/
|
||||
%{_datarootdir}/%{name}/playbooks/
|
||||
%defattr(-,root,root)
|
||||
|
||||
|
||||
%changelog
|
18
setup.cfg
18
setup.cfg
|
@ -1,10 +1,11 @@
|
|||
[metadata]
|
||||
name = ansible-kubespray
|
||||
name = kubespray
|
||||
summary = Ansible modules for installing Kubernetes
|
||||
description-file =
|
||||
README.md
|
||||
author = Kubespray
|
||||
author-email = smainklh@gmail.com
|
||||
license = Apache License (2.0)
|
||||
home-page = https://github.com/kubernetes-incubator/kubespray
|
||||
classifier =
|
||||
License :: OSI Approved :: Apache Software License
|
||||
|
@ -20,20 +21,21 @@ setup-hooks =
|
|||
|
||||
[files]
|
||||
data_files =
|
||||
/usr/local/share/kubespray/playbooks/ =
|
||||
/usr/share/kubespray/playbooks/ =
|
||||
cluster.yml
|
||||
upgrade-cluster.yml
|
||||
scale.yml
|
||||
reset.yml
|
||||
extra_playbooks/upgrade-only-k8s.yml
|
||||
/usr/local/share/kubespray/roles = roles/*
|
||||
doc_files =
|
||||
README.md
|
||||
inventory/inventory.example
|
||||
config_files =
|
||||
/usr/share/kubespray/roles = roles/*
|
||||
/usr/share/doc/kubespray/ =
|
||||
LICENSE
|
||||
README.md
|
||||
/usr/share/doc/kubespray/inventory/ =
|
||||
inventory/inventory.example
|
||||
/etc/kubespray/ =
|
||||
ansible.cfg
|
||||
/etc/kubespray/inventory/ =
|
||||
/etc/kubespray/inventory/group_vars/ =
|
||||
inventory/group_vars/all.yml
|
||||
inventory/group_vars/k8s-cluster.yml
|
||||
|
||||
|
|
Loading…
Reference in New Issue