Rename nginx helm chart

This commit renames the helm charts for the fluxcd application from
nginx-ingress to ingress-nginx. This keeps it consistent with the
armada version, for potential upgrade issues, and allows the ipfamily
overrides to be generated properly. It also adds an override for the
service name to keep it consistent with the armada helm chart, to
avoid any upgrade issues.

Story: 2009138
Task: 44452
Depends-on: https://review.opendev.org/c/starlingx/ansible-playbooks/+/838591
Signed-off-by: Jerry Sun <jerry.sun@windriver.com>
Change-Id: I0e01214fd91387e313719685447624b0ff5fe7f7
This commit is contained in:
Jerry Sun 2022-04-22 15:16:12 -04:00
parent d9df10820c
commit 35c651d1b5
9 changed files with 23 additions and 40 deletions

View File

@ -1,2 +1 @@
stx-nginx-ingress-controller-helm
stx-nginx-ingress-controller-helm-fluxcd

View File

@ -38,7 +38,8 @@ class IngressNginxHelm(base.BaseHelm):
ip_family
]
}
}
},
'fullnameOverride': 'ic-nginx-ingress-ingress-nginx'
}
}

View File

@ -30,7 +30,7 @@ setup-hooks =
[entry_points]
systemconfig.helm_applications =
inginx-ingress-controller = systemconfig.helm_plugins.nginx_ingress_controller
nginx-ingress-controller = systemconfig.helm_plugins.nginx_ingress_controller
systemconfig.helm_plugins.nginx_ingress_controller =
001_ingress-nginx = k8sapp_nginx_ingress_controller.helm.ingress_nginx:IngressNginxHelm

View File

@ -13,7 +13,8 @@
%global helm_folder /usr/lib/helm
%global toolkit_version 0.1.0
Summary: StarlingX Nginx Ingress Controller Application Armada Helm Charts
Summary: StarlingX Nginx Ingress Controller Application FluxCD Helm Charts
#StarlingX Nginx Ingress Controller Application Armada Helm Charts
Name: stx-nginx-ingress-controller-helm
Version: 1.1
Release: %{tis_patch_ver}%{?_tis_dist}
@ -37,10 +38,10 @@ Source7: kustomization.yaml
Source8: base_helmrepository.yaml
Source9: base_kustomization.yaml
Source10: base_namespace.yaml
Source11: nginx-ingress_helmrelease.yaml
Source12: nginx-ingress_kustomization.yaml
Source13: nginx-ingress_nginx-ingress-static-overrides.yaml
Source14: nginx-ingress_nginx-ingress-system-overrides.yaml
Source11: ingress-nginx_helmrelease.yaml
Source12: ingress-nginx_kustomization.yaml
Source13: ingress-nginx_ingress-nginx-static-overrides.yaml
Source14: ingress-nginx_ingress-nginx-system-overrides.yaml
BuildArch: noarch
@ -53,14 +54,6 @@ BuildRequires: python-k8sapp-nginx-ingress-controller
BuildRequires: python-k8sapp-nginx-ingress-controller-wheels
%description
StarlingX Nginx Ingress Controller Application Armada Helm Charts
%package fluxcd
Summary: StarlingX Nginx Ingress Controller Application FluxCD Helm Charts
Group: base
License: Apache-2.0
%description fluxcd
StarlingX Nginx Ingress Controller Application FluxCD Helm Charts
%prep
@ -99,8 +92,7 @@ kill %1
# Create a chart tarball compliant with sysinv kube-app.py
%define app_staging %{_builddir}/staging
%define app_tarball_armada %{app_name}-%{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
mkdir -p %{app_staging}
@ -121,10 +113,6 @@ sed -i 's/@HELM_REPO@/%{helm_repo}/g' %{app_staging}/metadata.yaml
mkdir -p %{app_staging}/plugins
cp /plugins/%{app_name}/*.whl %{app_staging}/plugins
# package armada
find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
tar -zcf %{_builddir}/%{app_tarball_armada} -C %{app_staging}/ .
# package fluxcd
rm -f %{app_staging}/nginx_ingress_controller_manifest.yaml
rm -f %{app_staging}/charts/*.tgz
@ -134,7 +122,7 @@ fluxcd_dest=%{app_staging}/fluxcd-manifests
mkdir -p $fluxcd_dest
cp %{SOURCE7} %{app_staging}/fluxcd-manifests
cd %{_sourcedir}
directories="base nginx-ingress"
directories="base ingress-nginx"
for dir in $directories;
do
mkdir -p $dir
@ -154,13 +142,8 @@ rm -fr %{app_staging}
%install
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_fluxcd} %{buildroot}/%{app_folder}
%files
%defattr(-,root,root,-)
%{app_folder}/%{app_tarball_armada}
%files fluxcd
%defattr(-,root,root,-)
%{app_folder}/%{app_tarball_fluxcd}

View File

@ -7,11 +7,11 @@
apiVersion: "helm.toolkit.fluxcd.io/v2beta1"
kind: HelmRelease
metadata:
name: nginx-ingress
name: ingress-nginx
labels:
chart_group: nginx-ingress
chart_group: ingress-nginx
spec:
releaseName: ic-nginx-ingress
releaseName: ic-ingress-nginx
chart:
spec:
chart: ingress-nginx
@ -29,8 +29,8 @@ spec:
disableHooks: false
valuesFrom:
- kind: Secret
name: nginx-ingress-static-overrides
valuesKey: nginx-ingress-static-overrides.yaml
name: ingress-nginx-static-overrides
valuesKey: ingress-nginx-static-overrides.yaml
- kind: Secret
name: nginx-ingress-system-overrides
valuesKey: nginx-ingress-system-overrides.yaml
name: ingress-nginx-system-overrides
valuesKey: ingress-nginx-system-overrides.yaml

View File

@ -8,11 +8,11 @@ namespace: kube-system
resources:
- helmrelease.yaml
secretGenerator:
- name: nginx-ingress-static-overrides
- name: ingress-nginx-static-overrides
files:
- nginx-ingress-static-overrides.yaml
- name: nginx-ingress-system-overrides
- ingress-nginx-static-overrides.yaml
- name: ingress-nginx-system-overrides
files:
- nginx-ingress-system-overrides.yaml
- ingress-nginx-system-overrides.yaml
generatorOptions:
disableNameSuffixHash: true

View File

@ -9,4 +9,4 @@ kind: Kustomization
namespace: kube-system
resources:
- base
- nginx-ingress
- ingress-nginx