From e8f64b4a16f4cf00396eae4de91f34b6ea92bf74 Mon Sep 17 00:00:00 2001 From: Leonardo Fagundes Luz Serrano Date: Wed, 21 Dec 2022 06:42:49 -0300 Subject: [PATCH] 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- - Standardized plugin debian files (rules, *.install) - Plugin wheels saved to /plugin instead of /plugin/ 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 Change-Id: I1ff25e023777ddec6871b16b1dfac51ad8e5c879 --- .zuul.yaml | 20 ++-- centos_build_layer.cfg | 1 - centos_iso_image.inc | 1 - centos_pkg_dirs | 2 - centos_pkg_dirs_containers | 2 - centos_tarball-dl.lst | 2 - debian_pkg_dirs | 2 +- .../centos/build_srpm.data | 3 - ...ython-k8sapp-nginx-ingress-controller.spec | 52 ---------- ...pp-nginx-ingress-controller-wheels.install | 1 - ...n3-k8sapp-nginx-ingress-controller.install | 2 - .../debian/deb_folder/rules | 25 ----- .../debian/deb_folder/changelog | 0 .../debian/deb_folder/control | 0 .../debian/deb_folder/copyright | 0 ...pp-nginx-ingress-controller-wheels.install | 1 + ...n3-k8sapp-nginx-ingress-controller.install | 1 + .../debian/deb_folder/rules | 33 +++++++ .../debian/deb_folder/source/format | 0 .../debian/meta_data.yaml | 4 +- .../.gitignore | 0 .../.stestr.conf | 0 .../k8sapp_nginx_ingress_controller/LICENSE | 0 .../README.rst | 0 .../__init__.py | 0 .../common/__init__.py | 0 .../common/constants.py | 0 .../helm/__init__.py | 0 .../helm/ingress_nginx.py | 0 .../lifecycle/__init__.py | 0 .../lifecycle_nginx_ingress_controller.py | 0 .../operator/__init__.py | 0 .../operator/manifest_nginx.py | 0 .../tests/__init__.py | 0 .../tests/test_plugins.py | 0 .../k8sapp_nginx_ingress_controller/pylint.rc | 0 .../requirements.txt | 0 .../k8sapp_nginx_ingress_controller/setup.cfg | 2 +- .../k8sapp_nginx_ingress_controller/setup.py | 0 .../test-requirements.txt | 0 .../k8sapp_nginx_ingress_controller/tox.ini | 0 .../upper-constraints.txt | 0 .../centos/build_srpm.data | 13 --- .../stx-nginx-ingress-controller-helm.spec | 98 ------------------- .../debian/deb_folder/rules | 2 +- .../debian/meta_data.yaml | 4 +- 46 files changed, 54 insertions(+), 217 deletions(-) delete mode 100644 centos_build_layer.cfg delete mode 100644 centos_iso_image.inc delete mode 100644 centos_pkg_dirs delete mode 100644 centos_pkg_dirs_containers delete mode 100644 centos_tarball-dl.lst delete mode 100644 python-k8sapp-nginx-ingress-controller/centos/build_srpm.data delete mode 100644 python-k8sapp-nginx-ingress-controller/centos/python-k8sapp-nginx-ingress-controller.spec delete mode 100644 python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller-wheels.install delete mode 100644 python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install delete mode 100755 python-k8sapp-nginx-ingress-controller/debian/deb_folder/rules rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/debian/deb_folder/changelog (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/debian/deb_folder/control (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/debian/deb_folder/copyright (100%) create mode 100644 python3-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller-wheels.install create mode 100644 python3-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install create mode 100755 python3-k8sapp-nginx-ingress-controller/debian/deb_folder/rules rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/debian/deb_folder/source/format (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/debian/meta_data.yaml (50%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/.gitignore (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/.stestr.conf (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/LICENSE (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/README.rst (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/__init__.py (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/__init__.py (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/constants.py (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/__init__.py (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/ingress_nginx.py (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/lifecycle/__init__.py (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/lifecycle/lifecycle_nginx_ingress_controller.py (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/__init__.py (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/manifest_nginx.py (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/tests/__init__.py (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/tests/test_plugins.py (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/pylint.rc (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/requirements.txt (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/setup.cfg (99%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/setup.py (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/test-requirements.txt (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/tox.ini (100%) rename {python-k8sapp-nginx-ingress-controller => python3-k8sapp-nginx-ingress-controller}/k8sapp_nginx_ingress_controller/upper-constraints.txt (100%) delete mode 100644 stx-nginx-ingress-controller-helm/centos/build_srpm.data delete mode 100644 stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec diff --git a/.zuul.yaml b/.zuul.yaml index 7f12a75..9358d25 100644 --- a/.zuul.yaml +++ b/.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 diff --git a/centos_build_layer.cfg b/centos_build_layer.cfg deleted file mode 100644 index c581999..0000000 --- a/centos_build_layer.cfg +++ /dev/null @@ -1 +0,0 @@ -flock diff --git a/centos_iso_image.inc b/centos_iso_image.inc deleted file mode 100644 index 3f4c479..0000000 --- a/centos_iso_image.inc +++ /dev/null @@ -1 +0,0 @@ -stx-nginx-ingress-controller-helm diff --git a/centos_pkg_dirs b/centos_pkg_dirs deleted file mode 100644 index d510c12..0000000 --- a/centos_pkg_dirs +++ /dev/null @@ -1,2 +0,0 @@ -stx-nginx-ingress-controller-helm -python-k8sapp-nginx-ingress-controller \ No newline at end of file diff --git a/centos_pkg_dirs_containers b/centos_pkg_dirs_containers deleted file mode 100644 index d510c12..0000000 --- a/centos_pkg_dirs_containers +++ /dev/null @@ -1,2 +0,0 @@ -stx-nginx-ingress-controller-helm -python-k8sapp-nginx-ingress-controller \ No newline at end of file diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst deleted file mode 100644 index 134e394..0000000 --- a/centos_tarball-dl.lst +++ /dev/null @@ -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## diff --git a/debian_pkg_dirs b/debian_pkg_dirs index 9585c57..a2dc44c 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -1,2 +1,2 @@ -python-k8sapp-nginx-ingress-controller +python3-k8sapp-nginx-ingress-controller stx-nginx-ingress-controller-helm diff --git a/python-k8sapp-nginx-ingress-controller/centos/build_srpm.data b/python-k8sapp-nginx-ingress-controller/centos/build_srpm.data deleted file mode 100644 index f6325b9..0000000 --- a/python-k8sapp-nginx-ingress-controller/centos/build_srpm.data +++ /dev/null @@ -1,3 +0,0 @@ -SRC_DIR="k8sapp_nginx_ingress_controller" - -TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/python-k8sapp-nginx-ingress-controller/centos/python-k8sapp-nginx-ingress-controller.spec b/python-k8sapp-nginx-ingress-controller/centos/python-k8sapp-nginx-ingress-controller.spec deleted file mode 100644 index a267b5c..0000000 --- a/python-k8sapp-nginx-ingress-controller/centos/python-k8sapp-nginx-ingress-controller.spec +++ /dev/null @@ -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/* diff --git a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller-wheels.install b/python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller-wheels.install deleted file mode 100644 index bf9ce22..0000000 --- a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller-wheels.install +++ /dev/null @@ -1 +0,0 @@ -plugins/nginx-ingress-controller/*.whl diff --git a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install b/python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install deleted file mode 100644 index 80a08fd..0000000 --- a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install +++ /dev/null @@ -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/* diff --git a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/rules b/python-k8sapp-nginx-ingress-controller/debian/deb_folder/rules deleted file mode 100755 index 606b358..0000000 --- a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/rules +++ /dev/null @@ -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 diff --git a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/changelog b/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/changelog similarity index 100% rename from python-k8sapp-nginx-ingress-controller/debian/deb_folder/changelog rename to python3-k8sapp-nginx-ingress-controller/debian/deb_folder/changelog diff --git a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/control b/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/control similarity index 100% rename from python-k8sapp-nginx-ingress-controller/debian/deb_folder/control rename to python3-k8sapp-nginx-ingress-controller/debian/deb_folder/control diff --git a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/copyright b/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/copyright similarity index 100% rename from python-k8sapp-nginx-ingress-controller/debian/deb_folder/copyright rename to python3-k8sapp-nginx-ingress-controller/debian/deb_folder/copyright diff --git a/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller-wheels.install b/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller-wheels.install new file mode 100644 index 0000000..19a9e4c --- /dev/null +++ b/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller-wheels.install @@ -0,0 +1 @@ +plugins/*.whl diff --git a/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install b/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install new file mode 100644 index 0000000..91d1d9d --- /dev/null +++ b/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/python3-k8sapp-nginx-ingress-controller.install @@ -0,0 +1 @@ +usr/lib/python3/dist-packages/k8sapp_* diff --git a/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/rules b/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/rules new file mode 100755 index 0000000..3315480 --- /dev/null +++ b/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/rules @@ -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 diff --git a/python-k8sapp-nginx-ingress-controller/debian/deb_folder/source/format b/python3-k8sapp-nginx-ingress-controller/debian/deb_folder/source/format similarity index 100% rename from python-k8sapp-nginx-ingress-controller/debian/deb_folder/source/format rename to python3-k8sapp-nginx-ingress-controller/debian/deb_folder/source/format diff --git a/python-k8sapp-nginx-ingress-controller/debian/meta_data.yaml b/python3-k8sapp-nginx-ingress-controller/debian/meta_data.yaml similarity index 50% rename from python-k8sapp-nginx-ingress-controller/debian/meta_data.yaml rename to python3-k8sapp-nginx-ingress-controller/debian/meta_data.yaml index 926d018..d835084 100644 --- a/python-k8sapp-nginx-ingress-controller/debian/meta_data.yaml +++ b/python3-k8sapp-nginx-ingress-controller/debian/meta_data.yaml @@ -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 diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/.gitignore b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/.gitignore similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/.gitignore rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/.gitignore diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/.stestr.conf b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/.stestr.conf similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/.stestr.conf rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/.stestr.conf diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/LICENSE b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/LICENSE similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/LICENSE rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/LICENSE diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/README.rst b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/README.rst similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/README.rst rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/README.rst diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/__init__.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/__init__.py similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/__init__.py rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/__init__.py diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/__init__.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/__init__.py similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/__init__.py rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/__init__.py diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/constants.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/constants.py similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/constants.py rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/common/constants.py diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/__init__.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/__init__.py similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/__init__.py rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/__init__.py diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/ingress_nginx.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/ingress_nginx.py similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/ingress_nginx.py rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/helm/ingress_nginx.py diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/lifecycle/__init__.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/lifecycle/__init__.py similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/lifecycle/__init__.py rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/lifecycle/__init__.py diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/lifecycle/lifecycle_nginx_ingress_controller.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/lifecycle/lifecycle_nginx_ingress_controller.py similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/lifecycle/lifecycle_nginx_ingress_controller.py rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/lifecycle/lifecycle_nginx_ingress_controller.py diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/__init__.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/__init__.py similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/__init__.py rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/__init__.py diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/manifest_nginx.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/manifest_nginx.py similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/manifest_nginx.py rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/operator/manifest_nginx.py diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/tests/__init__.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/tests/__init__.py similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/tests/__init__.py rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/tests/__init__.py diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/tests/test_plugins.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/tests/test_plugins.py similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/tests/test_plugins.py rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/k8sapp_nginx_ingress_controller/tests/test_plugins.py diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/pylint.rc b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/pylint.rc similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/pylint.rc rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/pylint.rc diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/requirements.txt b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/requirements.txt similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/requirements.txt rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/requirements.txt diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg similarity index 99% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg index 8d01509..c206d78 100644 --- a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg +++ b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.cfg @@ -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 diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.py b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.py similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.py rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/setup.py diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/test-requirements.txt b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/test-requirements.txt similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/test-requirements.txt rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/test-requirements.txt diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/tox.ini diff --git a/python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/upper-constraints.txt b/python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/upper-constraints.txt similarity index 100% rename from python-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/upper-constraints.txt rename to python3-k8sapp-nginx-ingress-controller/k8sapp_nginx_ingress_controller/upper-constraints.txt diff --git a/stx-nginx-ingress-controller-helm/centos/build_srpm.data b/stx-nginx-ingress-controller-helm/centos/build_srpm.data deleted file mode 100644 index dd84f12..0000000 --- a/stx-nginx-ingress-controller-helm/centos/build_srpm.data +++ /dev/null @@ -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 diff --git a/stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec b/stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec deleted file mode 100644 index b5926c7..0000000 --- a/stx-nginx-ingress-controller-helm/centos/stx-nginx-ingress-controller-helm.spec +++ /dev/null @@ -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 -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} diff --git a/stx-nginx-ingress-controller-helm/debian/deb_folder/rules b/stx-nginx-ingress-controller-helm/debian/deb_folder/rules index 34f03a9..92470c6 100755 --- a/stx-nginx-ingress-controller-helm/debian/deb_folder/rules +++ b/stx-nginx-ingress-controller-helm/debian/deb_folder/rules @@ -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)/ diff --git a/stx-nginx-ingress-controller-helm/debian/meta_data.yaml b/stx-nginx-ingress-controller-helm/debian/meta_data.yaml index 1157e30..48b62ac 100644 --- a/stx-nginx-ingress-controller-helm/debian/meta_data.yaml +++ b/stx-nginx-ingress-controller-helm/debian/meta_data.yaml @@ -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