Standardize app configs
Fixed versioning and adjusted some build files to bring them as close to a standard as possible. - Removed centos files - Added version tracking via GITREVCOUNT - Fixed mismatch in plugin name, set to python3-k8sapp-<app> - Standardized plugin debian files (rules, *.install) - Plugin wheels saved to /plugin instead of /plugin/<app> Test Plan: PASS - Build-pkgs -a PASS - Build-image PASS - Install, bootstrap, unlock PASS - app tarball contains wheel file PASS - wheel versioning updated properly Story: 2010542 Task: 47198 Signed-off-by: Leonardo Fagundes Luz Serrano <Leonardo.FagundesLuzSerrano@windriver.com> Change-Id: I1ff25e023777ddec6871b16b1dfac51ad8e5c879
This commit is contained in:
Leonardo Fagundes Luz Serrano
parent
ceec5991db
commit
e8f64b4a16
20
.zuul.yaml
20
.zuul.yaml
@ -32,10 +32,10 @@
|
||||
- starlingx/update
|
||||
- starlingx/utilities
|
||||
files:
|
||||
- python-k8sapp-nginx-ingress-controller/*
|
||||
- python3-k8sapp-nginx-ingress-controller/*
|
||||
vars:
|
||||
tox_envlist: py27
|
||||
tox_extra_args: -c python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini
|
||||
tox_extra_args: -c python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini
|
||||
|
||||
- job:
|
||||
name: k8sapp-nginx-ingress-controller-tox-py39
|
||||
@ -49,11 +49,11 @@
|
||||
- starlingx/update
|
||||
- starlingx/utilities
|
||||
files:
|
||||
- python-k8sapp-nginx-ingress-controller/*
|
||||
- python3-k8sapp-nginx-ingress-controller/*
|
||||
vars:
|
||||
tox_envlist: py39
|
||||
python_version: 3.9
|
||||
tox_extra_args: -c python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini
|
||||
tox_extra_args: -c python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini
|
||||
|
||||
- job:
|
||||
name: k8sapp-nginx-ingress-controller-tox-flake8
|
||||
@ -62,10 +62,10 @@
|
||||
Run flake8 test for k8sapp-nginx-ingress-controller
|
||||
nodeset: ubuntu-focal
|
||||
files:
|
||||
- python-k8sapp-nginx-ingress-controller/*
|
||||
- python3-k8sapp-nginx-ingress-controller/*
|
||||
vars:
|
||||
tox_envlist: flake8
|
||||
tox_extra_args: -c python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini
|
||||
tox_extra_args: -c python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini
|
||||
|
||||
- job:
|
||||
name: k8sapp-nginx-ingress-controller-tox-pylint
|
||||
@ -79,10 +79,10 @@
|
||||
- starlingx/update
|
||||
- starlingx/utilities
|
||||
files:
|
||||
- python-k8sapp-nginx-ingress-controller/*
|
||||
- python3-k8sapp-nginx-ingress-controller/*
|
||||
vars:
|
||||
tox_envlist: pylint
|
||||
tox_extra_args: -c python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini
|
||||
tox_extra_args: -c python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini
|
||||
|
||||
- job:
|
||||
name: k8sapp-nginx-ingress-controller-tox-bandit
|
||||
@ -91,10 +91,10 @@
|
||||
Run bandit test for k8sapp-nginx-ingress-controller
|
||||
nodeset: ubuntu-focal
|
||||
files:
|
||||
- python-k8sapp-nginx-ingress-controller/*
|
||||
- python3-k8sapp-nginx-ingress-controller/*
|
||||
vars:
|
||||
tox_envlist: bandit
|
||||
tox_extra_args: -c python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini
|
||||
tox_extra_args: -c python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini
|
||||
|
||||
- job:
|
||||
name: stx-nginx-ingress-controller-armada-app-upload-git-mirror
|
||||
|
||||
@ -1 +0,0 @@
|
||||
flock
|
||||
@ -1 +0,0 @@
|
||||
stx-nginx-ingress-controller-helm
|
||||
@ -1,2 +0,0 @@
|
||||
stx-nginx-ingress-controller-helm
|
||||
python-k8sapp-nginx-ingress-controller
|
||||
@ -1,2 +0,0 @@
|
||||
stx-nginx-ingress-controller-helm
|
||||
python-k8sapp-nginx-ingress-controller
|
||||
@ -1,2 +0,0 @@
|
||||
helm-charts-ingress-nginx-1.1.1.tar.gz#helm-charts#https://github.com/kubernetes/ingress-nginx/archive/controller-v1.1.1.tar.gz#http##
|
||||
helm-charts-ingress-nginx-0.41.2.tar.gz#helm-charts#https://github.com/kubernetes/ingress-nginx/archive/controller-v0.41.2.tar.gz#http##
|
||||
@ -1,2 +1,2 @@
|
||||
python-k8sapp-nginx-ingress-controller
|
||||
python3-k8sapp-nginx-ingress-controller
|
||||
stx-nginx-ingress-controller-helm
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
SRC_DIR="k8sapp_nginx_ingress_controller"
|
||||
|
||||
TIS_PATCH_VER=PKG_GITREVCOUNT
|
||||
@ -1,52 +0,0 @@
|
||||
%global app_name nginx-ingress-controller
|
||||
%global pypi_name k8sapp-nginx-ingress-controller
|
||||
%global sname k8sapp_nginx_ingress_controller
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: 1.0
|
||||
Release: %{tis_patch_ver}%{?_tis_dist}
|
||||
Summary: StarlingX sysinv extensions: Nginx ingress controller
|
||||
|
||||
License: Apache-2.0
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: python-pbr
|
||||
BuildRequires: python2-pip
|
||||
BuildRequires: python2-wheel
|
||||
|
||||
%description
|
||||
StarlingX sysinv extensions: Nginx ingress controller K8S app
|
||||
|
||||
%prep
|
||||
%setup
|
||||
# Remove bundled egg-info
|
||||
rm -rf %{pypi_name}.egg-info
|
||||
|
||||
%build
|
||||
export PBR_VERSION=%{version}
|
||||
%{__python2} setup.py build
|
||||
|
||||
%py2_build_wheel
|
||||
|
||||
%install
|
||||
export PBR_VERSION=%{version}.%{tis_patch_ver}
|
||||
export SKIP_PIP_INSTALL=1
|
||||
%{__python2} setup.py install --skip-build --root %{buildroot}
|
||||
mkdir -p ${RPM_BUILD_ROOT}/plugins/%{app_name}
|
||||
install -m 644 dist/*.whl ${RPM_BUILD_ROOT}/plugins/%{app_name}/
|
||||
|
||||
%files
|
||||
%{python2_sitelib}/%{sname}
|
||||
%{python2_sitelib}/%{sname}-*.egg-info
|
||||
|
||||
%package wheels
|
||||
Summary: %{name} wheels
|
||||
|
||||
%description wheels
|
||||
Contains python wheels for %{name}
|
||||
|
||||
%files wheels
|
||||
/plugins/*
|
||||
@ -1 +0,0 @@
|
||||
plugins/nginx-ingress-controller/*.whl
|
||||
@ -1,2 +0,0 @@
|
||||
usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller-1.0.0.egg-info/*
|
||||
usr/lib/python3/dist-packages/k8sapp_nginx_ingress_controller/*
|
||||
@ -1,25 +0,0 @@
|
||||
#!/usr/bin/make -f
|
||||
# export DH_VERBOSE = 1
|
||||
|
||||
export APP_NAME=nginx-ingress-controller
|
||||
export PBR_VERSION=1.0.0
|
||||
export PYBUILD_NAME=k8sapp_nginx_ingress_controller
|
||||
export ROOT=debian/tmp
|
||||
|
||||
%:
|
||||
dh $@ --with=python3 --buildsystem=pybuild
|
||||
|
||||
override_dh_auto_install:
|
||||
python3 setup.py install --install-layout=deb --root $(ROOT)
|
||||
python3 setup.py bdist_wheel \
|
||||
--universal \
|
||||
-d $(ROOT)/plugins/$(APP_NAME)
|
||||
|
||||
override_dh_python3:
|
||||
dh_python3 --shebang=/usr/bin/python3
|
||||
|
||||
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
|
||||
override_dh_auto_test:
|
||||
# (tbogue) FIXME
|
||||
PYTHONDIR=$(CURDIR) stestr run || true
|
||||
endif
|
||||
@ -0,0 +1 @@
|
||||
plugins/*.whl
|
||||
@ -0,0 +1 @@
|
||||
usr/lib/python3/dist-packages/k8sapp_*
|
||||
33
python3-k8sapp-nginx-ingress-controller/debian/deb_folder/rules
Executable file
33
python3-k8sapp-nginx-ingress-controller/debian/deb_folder/rules
Executable file
@ -0,0 +1,33 @@
|
||||
#!/usr/bin/make -f
|
||||
# export DH_VERBOSE = 1
|
||||
|
||||
export APP_NAME = nginx-ingress-controller
|
||||
export PYBUILD_NAME = k8sapp_nginx_ingress_controller
|
||||
|
||||
export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
|
||||
export MAJOR = $(shell echo $(DEB_VERSION) | cut -f 1 -d '-')
|
||||
export MINOR_PATCH = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
|
||||
export PBR_VERSION = $(MAJOR).$(MINOR_PATCH)
|
||||
|
||||
export ROOT = $(CURDIR)/debian/tmp
|
||||
export SKIP_PIP_INSTALL = 1
|
||||
|
||||
%:
|
||||
dh $@ --with=python3 --buildsystem=pybuild
|
||||
|
||||
override_dh_auto_install:
|
||||
env | sort
|
||||
|
||||
python3 setup.py install \
|
||||
--install-layout=deb \
|
||||
--root $(ROOT)
|
||||
|
||||
python3 setup.py bdist_wheel \
|
||||
--universal \
|
||||
-d $(ROOT)/plugins
|
||||
|
||||
override_dh_python3:
|
||||
dh_python3 --shebang=/usr/bin/python3
|
||||
|
||||
override_dh_auto_test:
|
||||
PYTHONDIR=$(CURDIR) stestr run
|
||||
@ -4,4 +4,6 @@ debver: 1.0-1
|
||||
src_path: k8sapp_nginx_ingress_controller
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
PKG_GITREVCOUNT: true
|
||||
GITREVCOUNT:
|
||||
SRC_DIR: ${MY_REPO}/stx/nginx-ingress-controller-armada-app
|
||||
BASE_SRCREV: 7d46af2312307344d714ae4e3a184fb577a210e8
|
||||
@ -41,5 +41,5 @@ systemconfig.armada.manifest_ops =
|
||||
systemconfig.app_lifecycle =
|
||||
nginx-ingress-controller = k8sapp_nginx_ingress_controller.lifecycle.lifecycle_nginx_ingress_controller:NginxIngressControllerAppLifecycleOperator
|
||||
|
||||
[wheel]
|
||||
[bdist_wheel]
|
||||
universal = 1
|
||||
@ -1,13 +0,0 @@
|
||||
SRC_DIR="stx-nginx-ingress-controller-helm"
|
||||
|
||||
CHART_TAR_NAME=helm-charts-ingress-nginx
|
||||
|
||||
FLUXCD_NGINX_VERSION=1.1.1
|
||||
FLUXCD_TAR="$CHART_TAR_NAME-$FLUXCD_NGINX_VERSION.tar.gz"
|
||||
|
||||
COPY_LIST=" \
|
||||
${CGCS_BASE}/downloads/$FLUXCD_TAR \
|
||||
$PKG_BASE/$SRC_DIR/files/*.patch \
|
||||
"
|
||||
|
||||
TIS_PATCH_VER=PKG_GITREVCOUNT
|
||||
@ -1,98 +0,0 @@
|
||||
# Application tunables (maps to metadata)
|
||||
%global app_name nginx-ingress-controller
|
||||
%global helm_repo stx-platform
|
||||
%global fluxcd_nginx_version 1.1.1
|
||||
|
||||
# Install location
|
||||
%global app_folder /usr/local/share/applications/helm
|
||||
|
||||
# Build variables
|
||||
%global helm_folder /usr/lib/helm
|
||||
%global toolkit_version 0.1.0
|
||||
|
||||
Summary: StarlingX Nginx Ingress Controller Application FluxCD Helm Charts
|
||||
Name: stx-nginx-ingress-controller-helm
|
||||
Version: 1.1
|
||||
Release: %{tis_patch_ver}%{?_tis_dist}
|
||||
License: Apache-2.0
|
||||
Group: base
|
||||
Packager: Wind River <info@windriver.com>
|
||||
URL: unknown
|
||||
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
Source1: helm-charts-ingress-nginx-%{fluxcd_nginx_version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
Patch01: 0001-add-toleration-fluxcd.patch
|
||||
|
||||
BuildRequires: helm
|
||||
BuildRequires: chartmuseum
|
||||
BuildRequires: python-k8sapp-nginx-ingress-controller
|
||||
BuildRequires: python-k8sapp-nginx-ingress-controller-wheels
|
||||
|
||||
%description
|
||||
StarlingX Nginx Ingress Controller Application FluxCD Helm Charts
|
||||
|
||||
%prep
|
||||
%setup
|
||||
# set up fluxcd tar source
|
||||
cd %{_builddir}
|
||||
/usr/bin/tar xfv %{SOURCE1}
|
||||
cd helm-charts
|
||||
%patch01 -p1
|
||||
|
||||
%build
|
||||
# Host a server for the charts
|
||||
cd %{_builddir}/helm-charts
|
||||
chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="." &
|
||||
sleep 2
|
||||
helm repo add local http://localhost:8879/charts
|
||||
|
||||
# Make Chart
|
||||
cd %{_builddir}/stx-nginx-ingress-controller-helm-%{version}
|
||||
cp files/Makefile %{_builddir}/helm-charts/charts
|
||||
cd %{_builddir}/helm-charts/charts
|
||||
make ingress-nginx
|
||||
|
||||
# Terminate helm server (the last backgrounded task)
|
||||
kill %1
|
||||
|
||||
# Create a chart tarball compliant with sysinv kube-app.py
|
||||
%define app_staging %{_builddir}/staging
|
||||
%define app_tarball_fluxcd %{app_name}-%{version}-%{tis_patch_ver}.tgz
|
||||
|
||||
# Setup staging
|
||||
mkdir -p %{app_staging}
|
||||
cd %{_builddir}/stx-nginx-ingress-controller-helm-%{version}
|
||||
cp files/metadata.yaml %{app_staging}
|
||||
cp -Rv fluxcd-manifests %{app_staging}/
|
||||
mkdir -p %{app_staging}/charts
|
||||
|
||||
cd %{_builddir}/helm-charts
|
||||
cp charts/*.tgz %{app_staging}/charts
|
||||
cd %{app_staging}
|
||||
|
||||
# Populate metadata
|
||||
sed -i 's/@APP_NAME@/%{app_name}/g' %{app_staging}/metadata.yaml
|
||||
sed -i 's/@APP_VERSION@/%{version}-%{tis_patch_ver}/g' %{app_staging}/metadata.yaml
|
||||
sed -i 's/@HELM_REPO@/%{helm_repo}/g' %{app_staging}/metadata.yaml
|
||||
|
||||
# Copy the plugins: installed in the buildroot
|
||||
mkdir -p %{app_staging}/plugins
|
||||
cp /plugins/%{app_name}/*.whl %{app_staging}/plugins
|
||||
|
||||
find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
|
||||
tar -zcf %{_builddir}/%{app_tarball_fluxcd} -C %{app_staging}/ .
|
||||
|
||||
# Cleanup staging
|
||||
rm -fr %{app_staging}
|
||||
|
||||
%install
|
||||
install -d -m 755 %{buildroot}/%{app_folder}
|
||||
install -p -D -m 755 %{_builddir}/%{app_tarball_fluxcd} %{buildroot}/%{app_folder}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{app_folder}/%{app_tarball_fluxcd}
|
||||
@ -58,7 +58,7 @@ override_dh_auto_build:
|
||||
|
||||
# Copy the plugins: installed in the buildroot
|
||||
mkdir -p $(STAGING_FLUXCD)/plugins
|
||||
cp /plugins/$(APP_NAME)/*.whl $(STAGING_FLUXCD)/plugins
|
||||
cp /plugins/*.whl $(STAGING_FLUXCD)/plugins
|
||||
|
||||
cp -R fluxcd-manifests $(STAGING_FLUXCD)/
|
||||
|
||||
|
||||
@ -9,4 +9,6 @@ dl_files:
|
||||
md5sum: 9fa3de1800175a4f7dfa890bf9d376c9
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
PKG_GITREVCOUNT: true
|
||||
GITREVCOUNT:
|
||||
SRC_DIR: ${MY_REPO}/stx/nginx-ingress-controller-armada-app
|
||||
BASE_SRCREV: 7d46af2312307344d714ae4e3a184fb577a210e8
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user