Merge "armada: remove dl_hook"

kubernetes/armada/debian/deb_folder/patches/0001-Add-Helm-v2-client-initialization.patch

@@ -1,8 +1,7 @@
-From 8c6cc4c0ad5569d7de3615463f7d8c4dd7429e63 Mon Sep 17 00:00:00 2001
+From 0dad89825be15c596d5678d8daafa671f859f4f6 Mon Sep 17 00:00:00 2001
 From: Thiago Brito <thiago.brito@windriver.com>
 Date: Thu, 22 Apr 2021 20:00:51 -0300
-Subject: [PATCH] Add Helm v2 client initialization using tiller
+Subject: [PATCH] Add Helm v2 client initialization
- postStart exec
 
 This adds helm v2 client initialization using the tiller
 container postStart exec to access helm v2 binary.
@@ -36,7 +35,7 @@ Signed-off-by: Thiago Brito <thiago.brito@windriver.com>
  2 files changed, 43 insertions(+)
 
 diff --git a/charts/armada/templates/deployment-api.yaml b/charts/armada/templates/deployment-api.yaml
-index 562e3d0..483ec0b 100644
+index 562e3d0..69036c0 100644
 --- a/charts/armada/templates/deployment-api.yaml
 +++ b/charts/armada/templates/deployment-api.yaml
 @@ -186,6 +186,39 @@ spec:
@@ -109,6 +108,5 @@ index 3a4427e..da45810 100644
              # Should be the `$HOME/.kube` of the `runAsUser` above
              # as this is where tiller's kubernetes client roots its cache dir.
 -- 
-2.17.1
+2.25.1
-
 

kubernetes/armada/debian/deb_folder/patches/0005-Add-toleration-to-armada-api.patch

@@ -1,8 +1,9 @@
-From 8f38dcdc7ba6448487283d14a745b8c299c47a13 Mon Sep 17 00:00:00 2001
+From a2e44bc741366c39ebae7add1564a8ac67f13895 Mon Sep 17 00:00:00 2001
 From: Enzo Candotti <enzo.candotti@windriver.com>
 Date: Wed, 6 Oct 2021 18:25:10 -0300
 Subject: [PATCH] Add toleration to armada-api
 
+Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
 ---
  charts/armada/templates/deployment-api.yaml        | 4 ++++
  charts/armada/templates/tests/test-armada-api.yaml | 4 ++++
@@ -10,10 +11,10 @@ Subject: [PATCH] Add toleration to armada-api
  3 files changed, 10 insertions(+)
 
 diff --git a/charts/armada/templates/deployment-api.yaml b/charts/armada/templates/deployment-api.yaml
-index d4eff7a..1859d99 100644
+index 5c4825c..3ee086a 100644
 --- a/charts/armada/templates/deployment-api.yaml
 +++ b/charts/armada/templates/deployment-api.yaml
-@@ -108,6 +108,10 @@ spec:
+@@ -125,6 +125,10 @@ spec:
        initContainers:
  {{ tuple $envAll "api" $mounts_armada_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
  {{ dict "envAll" $envAll "application" "armada" "container" "armada_api_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
@@ -25,7 +26,7 @@ index d4eff7a..1859d99 100644
          - name: armada-api
  {{ tuple $envAll "api" | include "helm-toolkit.snippets.image" | indent 10 }}
 diff --git a/charts/armada/templates/tests/test-armada-api.yaml b/charts/armada/templates/tests/test-armada-api.yaml
-index a467fc9..2733cfe 100644
+index 895353a..aa9e37a 100644
 --- a/charts/armada/templates/tests/test-armada-api.yaml
 +++ b/charts/armada/templates/tests/test-armada-api.yaml
 @@ -32,6 +32,10 @@ metadata:
@@ -40,10 +41,10 @@ index a467fc9..2733cfe 100644
      {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
    containers:
 diff --git a/charts/armada/values.yaml b/charts/armada/values.yaml
-index e583947..247b15e 100644
+index da45810..3644706 100644
 --- a/charts/armada/values.yaml
 +++ b/charts/armada/values.yaml
-@@ -206,6 +206,8 @@ monitoring:
+@@ -233,6 +233,8 @@ monitoring:
        port: 8000
  
  pod:

kubernetes/armada/debian/deb_folder/patches/series

@@ -1,4 +1,4 @@
-0001-Add-Helm-v2-client-initialization-using-tiller-postS.patch
+0001-Add-Helm-v2-client-initialization.patch
 0002-Tiller-wait-for-postgres-database-ping.patch
 0003-Update-the-liveness-probe-to-verify-postgres-connect.patch
 0004-Update-postgres-liveness-check-to-support-IPv6-addre.patch

kubernetes/armada/debian/dl_hook

@@ -1,23 +0,0 @@
-#!/bin/bash
-set -x
-
-PKG_BUILD_NAME=$1
-PKG="armada"
-PKG_BUILD_ROOT=$(realpath `pwd`/${PKG_BUILD_NAME})
-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 armada helm source package.
-ARMADA_PKG="armada-7ef4b8643b5ec5216a8f6726841e156c0aa54a1a.tar.gz"
-ARMADA_SRC_PATH=$(realpath ${STX_MIRROR}/downloads/${ARMADA_PKG})
-cp ${ARMADA_SRC_PATH} ${PKG_BUILD_ROOT}
-
-# Extract the armada tar file.
-tar xfz ${ARMADA_PKG}
-cp -pr ${PKG}/charts ${PKG_BUILD_ROOT}
-
-rm -rf ${ARMADA_PKG}
-rm -rf ${PKG}

kubernetes/armada/debian/meta_data.yaml

@@ -1,7 +1,10 @@
 ---
 debname: armada
 debver: 0.2.0-0
-dl_hook: dl_hook
+dl_path:
+  name: armada-7ef4b8643b5ec5216a8f6726841e156c0aa54a1a.tar.gz
+  url: https://github.com/airshipit/armada/tarball/7ef4b8643b5ec5216a8f6726841e156c0aa54a1a
+  md5sum: 58e2ee93d7e177e96e2cf0de1873ccce
 revision:
   dist: $STX_DIST
   PKG_GITREVCOUNT: true