Added ingress-nginx-helm integration
With the deprecation of the Ingress Helm chart [1], this change replaces it with a community-supported version. This commit introduces the base ingress-nginx-helm package to the project, allowing future updates to be easily integrated The ingress-nginx-helm package was copied from [2] and reviewed based on Starling Packaging Reference doc [3]. [1] https://kubernetes.github.io/ingress-nginx [2] https://opendev.org/starlingx/nginx-ingress-controller-armada-app/src/branch/master/helm-charts/upstream/ingress-nginx-helm [3] https://docs.starlingx.io/developer_resources/packaging_ref.html Test Plan: - PASS: run build-pkgs -c -p ingress-helm-nginx - PASS: run dpkg -c ingress-nginx-helm*.deb - PASS: check if ingress-nginx*.tgz exists - PASS: run dpkg-deb -f ingress-nginx-helm*.deb Version - PASS: check if package version matches Story: 2011303 Task: 51451 Change-Id: I339c4e5f789fe4c627af6cc714156dea1bffe8db Signed-off-by: jbarboza <joaopedro.barbozalioneza@windriver.com>
This commit is contained in:
committed by
Murillo Arantes
parent
0370e49093
commit
95bddda2d0
@@ -2,6 +2,7 @@ openstack-helm
|
|||||||
openstack-helm-infra
|
openstack-helm-infra
|
||||||
python3-k8sapp-openstack
|
python3-k8sapp-openstack
|
||||||
stx-openstack-helm-fluxcd
|
stx-openstack-helm-fluxcd
|
||||||
|
ingress-nginx-helm
|
||||||
upstream/openstack/openstack-pkg-tools
|
upstream/openstack/openstack-pkg-tools
|
||||||
upstream/openstack/python-aodhclient
|
upstream/openstack/python-aodhclient
|
||||||
upstream/openstack/python-barbicanclient
|
upstream/openstack/python-barbicanclient
|
||||||
|
|||||||
23
ingress-nginx-helm/debian/deb_folder/changelog
Normal file
23
ingress-nginx-helm/debian/deb_folder/changelog
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
ingress-nginx-helm (4.11-2) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Improvements on makefiles
|
||||||
|
|
||||||
|
-- jbarboza <joaopedro.barbozalioneza@windriver.com> Wed 04 Dec 2024 14:10:00 -0300
|
||||||
|
|
||||||
|
ingress-nginx-helm (4.11-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* App upversion
|
||||||
|
|
||||||
|
-- amantri <ayyappa.mantri@windriver.com> Thu 03 Oct 2024 10:33:50 AM EDT
|
||||||
|
|
||||||
|
ingress-nginx-helm (4.10-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* App upversion
|
||||||
|
|
||||||
|
-- amantri <ayyappa.mantri@windriver.com> Thu Jun 20 14:17:33 2024 -0400
|
||||||
|
|
||||||
|
ingress-nginx-helm (4.8-2) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Initial release.
|
||||||
|
|
||||||
|
-- Joshua Reed <joshua.reed@windriver.com> Fri, 16 Feb 2024 14:54:00 +0000
|
||||||
15
ingress-nginx-helm/debian/deb_folder/control
Normal file
15
ingress-nginx-helm/debian/deb_folder/control
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
Source: ingress-nginx-helm
|
||||||
|
Section: libs
|
||||||
|
Priority: optional
|
||||||
|
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
||||||
|
Build-Depends: debhelper-compat (= 13),
|
||||||
|
helm
|
||||||
|
Standards-Version: 4.5.1
|
||||||
|
Homepage: https://www.starlingx.io
|
||||||
|
|
||||||
|
Package: ingress-nginx-helm
|
||||||
|
Section: libs
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Description: StarlingX Nginx Helm Charts
|
||||||
|
This package contains helm charts for the Nginx Ingress application.
|
||||||
41
ingress-nginx-helm/debian/deb_folder/copyright
Normal file
41
ingress-nginx-helm/debian/deb_folder/copyright
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||||
|
Upstream-Name: ingress-nginx-helm
|
||||||
|
Source: https://opendev.org/starlingx/openstack-armada-app/
|
||||||
|
|
||||||
|
Files: *
|
||||||
|
Copyright: (c) 2024 Wind River Systems, Inc
|
||||||
|
License: Apache-2
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
.
|
||||||
|
https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
.
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
.
|
||||||
|
On Debian-based systems the full text of the Apache version 2.0 license
|
||||||
|
can be found in `/usr/share/common-licenses/Apache-2.0'.
|
||||||
|
|
||||||
|
# If you want to use GPL v2 or later for the /debian/* files use
|
||||||
|
# the following clauses, or change it to suit. Delete these two lines
|
||||||
|
Files: debian/*
|
||||||
|
Copyright: 2022 Wind River Systems, Inc
|
||||||
|
License: Apache-2
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
.
|
||||||
|
https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
.
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
.
|
||||||
|
On Debian-based systems the full text of the Apache version 2.0 license
|
||||||
|
can be found in `/usr/share/common-licenses/Apache-2.0'.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
usr/lib/helm/*
|
||||||
23
ingress-nginx-helm/debian/deb_folder/rules
Normal file
23
ingress-nginx-helm/debian/deb_folder/rules
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
#!/usr/bin/make -f
|
||||||
|
# export DH_VERBOSE = 1
|
||||||
|
|
||||||
|
export CHART_BASE_VERSION = 4.11.1
|
||||||
|
export PATCH_VERSION = 2
|
||||||
|
export CHART_VERSION = $(CHART_BASE_VERSION)+STX.$(PATCH_VERSION)
|
||||||
|
|
||||||
|
export ROOT = debian/tmp
|
||||||
|
export APP_FOLDER = $(ROOT)/usr/lib/helm
|
||||||
|
|
||||||
|
%:
|
||||||
|
dh $@
|
||||||
|
|
||||||
|
override_dh_auto_build:
|
||||||
|
mv charts/ingress-nginx .
|
||||||
|
make CHART_VERSION=$(CHART_VERSION) ingress-nginx;
|
||||||
|
|
||||||
|
override_dh_auto_install:
|
||||||
|
# Install the app tar file.
|
||||||
|
install -d -m 755 $(APP_FOLDER)
|
||||||
|
install -p -D -m 755 *.tgz $(APP_FOLDER)
|
||||||
|
|
||||||
|
override_dh_auto_test:
|
||||||
1
ingress-nginx-helm/debian/deb_folder/source/format
Normal file
1
ingress-nginx-helm/debian/deb_folder/source/format
Normal file
@@ -0,0 +1 @@
|
|||||||
|
3.0 (quilt)
|
||||||
14
ingress-nginx-helm/debian/meta_data.yaml
Normal file
14
ingress-nginx-helm/debian/meta_data.yaml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
---
|
||||||
|
debname: ingress-nginx-helm
|
||||||
|
debver: 4.11-2
|
||||||
|
src_path: ${MY_REPO}/stx/openstack-armada-app/ingress-nginx-helm
|
||||||
|
dl_path:
|
||||||
|
name: ingress-nginx-helm-chart-4.11.1.tar.gz
|
||||||
|
url: https://github.com/kubernetes/ingress-nginx/archive/refs/tags/helm-chart-4.11.1.tar.gz
|
||||||
|
sha256sum: 1c528e262989f883e101e04bd44e3f3fb432d5df1fdc2f98332ff7ee2bbc8ea4
|
||||||
|
src_files:
|
||||||
|
- ingress-nginx-helm/files/Makefile
|
||||||
|
revision:
|
||||||
|
dist: $STX_DIST
|
||||||
|
SRC_GITREVCOUNT:
|
||||||
|
SRC_BASE_SRCREV: 301e310b67f608c309a34c7431848f680e2ea827
|
||||||
42
ingress-nginx-helm/ingress-nginx-helm/files/Makefile
Normal file
42
ingress-nginx-helm/ingress-nginx-helm/files/Makefile
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
#
|
||||||
|
# Copyright 2019 The Openstack-Helm Authors.
|
||||||
|
#
|
||||||
|
# Copyright (c) 2019,2024 Wind River Systems, Inc.
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
# It's necessary to set this because some environments don't link sh -> bash.
|
||||||
|
|
||||||
|
SHELL := /bin/bash
|
||||||
|
TASK := build
|
||||||
|
|
||||||
|
EXCLUDES := helm-toolkit doc tests tools logs tmp
|
||||||
|
CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
|
||||||
|
|
||||||
|
.PHONY: $(EXCLUDES) $(CHARTS)
|
||||||
|
|
||||||
|
all: $(CHARTS)
|
||||||
|
|
||||||
|
$(CHARTS):
|
||||||
|
@if [ -d $@ ]; then \
|
||||||
|
echo; \
|
||||||
|
echo "===== Processing [$@] chart ====="; \
|
||||||
|
make $(TASK)-$@; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
init-%:
|
||||||
|
if [ -f $*/Makefile ]; then make -C $*; fi
|
||||||
|
|
||||||
|
lint-%: init-%
|
||||||
|
if [ -d $* ]; then helm lint $*; fi
|
||||||
|
|
||||||
|
build-%: lint-%
|
||||||
|
if [ -d $* ]; then helm package --version $(CHART_VERSION) $*; fi
|
||||||
|
|
||||||
|
clean:
|
||||||
|
@echo "Clean all build artifacts"
|
||||||
|
rm -f */templates/_partials.tpl */templates/_globals.tpl
|
||||||
|
rm -rf */charts */tmpcharts
|
||||||
|
|
||||||
|
%:
|
||||||
|
@:
|
||||||
@@ -4,7 +4,8 @@ Priority: optional
|
|||||||
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
|
||||||
Build-Depends: debhelper-compat (= 13),
|
Build-Depends: debhelper-compat (= 13),
|
||||||
helm,
|
helm,
|
||||||
procps
|
procps,
|
||||||
|
ingress-nginx-helm
|
||||||
Standards-Version: 4.5.1
|
Standards-Version: 4.5.1
|
||||||
Homepage: https://www.starlingx.io
|
Homepage: https://www.starlingx.io
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user