Merge "stx-nginx-ingress-controller-helm: remove dl_hook"

stx-nginx-ingress-controller-helm/debian/deb_folder/rules

@@ -13,11 +13,13 @@ export APP_VERSION = $(MAJOR).$(MINOR_PATCH)
 export APP_TARBALL = $(APP_NAME)-$(APP_VERSION).tgz
 export HELM_REPO = stx-platform
 export STAGING = staging
+export NGINX_PKG = helm-charts-ingress-nginx-0.41.2.tar.gz
 
 %:
 	dh $@
 
 override_dh_auto_build:
+	tar xfz $(NGINX_PKG)
 	# Move the extracted helm chart files to the top level build directory.
 	# Remove the helm-charts Makefile first so it doesn't overwrite our Makefile.
 	rm helm-charts/Makefile

stx-nginx-ingress-controller-helm/debian/dl_hook

@@ -1,25 +0,0 @@
-#!/bin/bash
-set -x
-
-PKG_BUILD_NAME=$1
-PKG_BUILD_ROOT=$(realpath `pwd`/${PKG_BUILD_NAME})
-PKG_DIR="stx-nginx-ingress-controller-helm"
-STX_BASE=$(realpath ${MY_REPO}/stx)
-SRC=$(realpath ${STX_BASE}/nginx-ingress-controller-armada-app/${PKG_DIR}/${PKG_DIR})
-
-mkdir -p ${PKG_BUILD_ROOT}
-pushd ${PKG_BUILD_ROOT}
-
-# Local mirror workaround until CGCS_BASE mirror is supported.
-STX_MIRROR=$(realpath "/import/mirrors/starlingx")
-
-# Download ingress-nginx helm source package.
-NGINX_PKG="helm-charts-ingress-nginx-0.41.2.tar.gz"
-NGINX_SRC_PATH=$(realpath ${STX_MIRROR}/downloads/${NGINX_PKG})
-cp ${NGINX_SRC_PATH} ${PKG_BUILD_ROOT}
-
-# Extract the ingress-nginx tar file.
-tar xfz ${NGINX_PKG}
-
-# Copy source files to the build directory.
-cp -pr ${SRC}/files/* ${SRC}/manifests/* ${PKG_BUILD_ROOT}

stx-nginx-ingress-controller-helm/debian/meta_data.yaml

@@ -1,7 +1,14 @@
 ---
 debname: stx-nginx-ingress-controller-helm
 debver: 1.0-1
-dl_hook: dl_hook
+src_path: stx-nginx-ingress-controller-helm/files
+src_files:
+  - stx-nginx-ingress-controller-helm/manifests/nginx_ingress_controller_manifest.yaml
+dl_files:
+  helm-charts-ingress-nginx-0.41.2.tar.gz:
+    topdir: helm-charts
+    url: https://github.com/kubernetes/ingress-nginx/archive/controller-v0.41.2.tar.gz
+    md5sum: de3a31c8622c3de6f910617698d14b62
 revision:
   dist: $STX_DIST
   PKG_GITREVCOUNT: true