starlingx/metrics-server-armada-app
Code Issues Proposed changes

CentOS & Debian: Use FluxCD by default

Browse Source 
This commit switches metrics-server to use the fluxcd app
by default on Debian and also preserves the armada app on
the build for future tests.

TEST PLAN
PASS Install new package and verify apps
PASS Upload
PASS Apply
PASS Verify resources
PASS Remove
PASS Delete

Story: 2009138
Task: 45587

Signed-off-by: Luiz Felipe Kina <LuizFelipe.EiskeKina@windriver.com>
Change-Id: I70887c63f4edffd2e6e880b86f5e7bcdcc89fdb2
This commit is contained in:
Luiz Felipe Kina 2022-06-13 12:41:05 -04:00
parent 465dd726a5
commit 440d4cf4a7
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
stx-metrics-server-helm/centos/stx-metrics-server-helm.spec
View File

@ -23,15 +23,15 @@ BuildRequires: chartmuseum
BuildRequires: metrics-server-helm BuildRequires: metrics-server-helm
%description %description
StarlingX Metrics Server Armada Helm Charts StarlingX Metrics Server FluxCD Helm Charts
%package fluxcd %package armada
Summary: StarlingX Metrics Server Controller Application FluxCD Helm Charts Summary: StarlingX Metrics Server Controller Application Armada Helm Charts
Group: base Group: base
License: Apache-2.0 License: Apache-2.0
%description fluxcd %description armada
StarlingX Metrics Server Controller Application FluxCD Helm Charts StarlingX Metrics Server Controller Application Armada Helm Charts
%prep %prep
%setup %setup
@ -52,8 +52,8 @@ kill %1
# Create a chart tarball compliant with sysinv kube-app.py # Create a chart tarball compliant with sysinv kube-app.py
%define app_staging %{_builddir}/staging %define app_staging %{_builddir}/staging
%define app_tarball_armada %{app_name}-%{version}-%{tis_patch_ver}.tgz %define app_tarball_armada %{app_name}-armada-%{version}-%{tis_patch_ver}.tgz
%define app_tarball_fluxcd %{app_name}-fluxcd-%{version}-%{tis_patch_ver}.tgz %define app_tarball_fluxcd %{app_name}-%{version}-%{tis_patch_ver}.tgz
# Setup staging # Setup staging
mkdir -p %{app_staging} mkdir -p %{app_staging}
@ -88,11 +88,11 @@ install -d -m 755 %{buildroot}/%{app_folder}
install -p -D -m 755 %{_builddir}/%{app_tarball_armada} %{buildroot}/%{app_folder} install -p -D -m 755 %{_builddir}/%{app_tarball_armada} %{buildroot}/%{app_folder}
install -p -D -m 755 %{_builddir}/%{app_tarball_fluxcd} %{buildroot}/%{app_folder} install -p -D -m 755 %{_builddir}/%{app_tarball_fluxcd} %{buildroot}/%{app_folder}
%files %files armada
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{app_folder}/%{app_tarball_armada} %{app_folder}/%{app_tarball_armada}
%files fluxcd %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{app_folder}/%{app_tarball_fluxcd} %{app_folder}/%{app_tarball_fluxcd}

4
stx-metrics-server-helm/debian/deb_folder/rules
View File

@ -10,8 +10,8 @@ export MINOR_PATCH = $(shell echo $(DEB_VERSION) | cut -f 2 -d '.')
export APP_NAME = metrics-server export APP_NAME = metrics-server
export APP_VERSION = $(MAJOR).$(MINOR_PATCH) export APP_VERSION = $(MAJOR).$(MINOR_PATCH)
export APP_TARBALL_ARMADA = $(APP_NAME)-$(APP_VERSION).tgz export APP_TARBALL_ARMADA = $(APP_NAME)-armada-$(APP_VERSION).tgz
export APP_TARBALL_FLUXCD = $(APP_NAME)-fluxcd-$(APP_VERSION).tgz export APP_TARBALL_FLUXCD = $(APP_NAME)-$(APP_VERSION).tgz
export HELM_REPO = stx-platform export HELM_REPO = stx-platform
export STAGING_ARMADA = staging-armada export STAGING_ARMADA = staging-armada
export STAGING_FLUXCD = staging-fluxcd export STAGING_FLUXCD = staging-fluxcd