gerrit.o-ran-sc Code Review - pti/rtp.git/blob

   1 From 55769435d21a5f5b50bdeb478c2f5e6a3496b94a Mon Sep 17 00:00:00 2001
   2 From: Jackie Huang <jackie.huang@windriver.com>
   3 Date: Wed, 8 Feb 2023 06:18:24 -0500
   4 Subject: [PATCH 06/12] kubectl-cert-manager: add dl_files_arm64
   5
   6 The dl_files for arm64 are different whith the ones for x86,
   7 so add dl_files_arm64 for arm64.
   8
   9 Use DEB_HOST_ARCH to replace the hardcoded arch name in the
  10 rules file.
  11
  12 Test Plan:
  13 PASS: build-pkgs on x86-64 host
  14 PASS: build-image on x86-64 host
  15 PASS: build-pkgs on arm64 host
  16 PASS: build-image on arm64 host
  17 PASS: Deploy AIO-SX on x86-64 target
  18 PASS: Deploy AIO-SX on arm64 target
  19 PASS: Deploy AIO-DX on arm64 targets
  20 PASS: Deploy std (2+2+2) on arm64 targets
  21
  22 Story: 2010739
  23 Task: 47981
  24
  25 Depends-On: https://review.opendev.org/c/starlingx/root/+/889686
  26
  27 Change-Id: Ie4f3a5e35f0ce1edead4e4d25548cc9744cf89c7
  28 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  29 ---
  30  .../plugins/kubectl-cert-manager/debian/deb_folder/rules    | 5 +++--
  31  .../plugins/kubectl-cert-manager/debian/meta_data.yaml      | 6 ++++++
  32  2 files changed, 9 insertions(+), 2 deletions(-)
  33
  34 diff --git a/kubernetes/plugins/kubectl-cert-manager/debian/deb_folder/rules b/kubernetes/plugins/kubectl-cert-manager/debian/deb_folder/rules
  35 index 6060bda9..df7e75ae 100644
  36 --- a/kubernetes/plugins/kubectl-cert-manager/debian/deb_folder/rules
  37 +++ b/kubernetes/plugins/kubectl-cert-manager/debian/deb_folder/rules
  38 @@ -2,7 +2,8 @@
  39  # vim: set expandtab!
  40  # export DH_VERBOSE = 1
  41
  42 -export CERT_MANAGER_PKG = kubectl-cert-manager-linux-amd64.tar.gz
  43 +export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
  44 +export CERT_MANAGER_PKG = kubectl-cert-manager-linux-$(DEB_HOST_ARCH).tar.gz
  45  export ROOT = debian/tmp
  46  export SBIN_DIR = $(ROOT)/usr/sbin
  47
  48 @@ -18,4 +19,4 @@ override_dh_auto_install:
  49         install -p -D -m 755 kubectl-cert_manager $(SBIN_DIR)
  50
  51  override_dh_usrlocal:
  52 -       # Do Nothing
  53 \ No newline at end of file
  54 +       # Do Nothing
  55 diff --git a/kubernetes/plugins/kubectl-cert-manager/debian/meta_data.yaml b/kubernetes/plugins/kubectl-cert-manager/debian/meta_data.yaml
  56 index d66447af..5ecf0d34 100644
  57 --- a/kubernetes/plugins/kubectl-cert-manager/debian/meta_data.yaml
  58 +++ b/kubernetes/plugins/kubectl-cert-manager/debian/meta_data.yaml
  59 @@ -8,6 +8,12 @@ dl_files:
  60      url: https://github.com/cert-manager/cert-manager/releases/download/v1.7.1/kubectl-cert_manager-linux-amd64.tar.gz
  61      md5sum: 661909b84c3ef582a0d941f7ff3d9be7
  62      sha256sum: f5a2741db8f5f5db4ab7ad041561b4c541a1ae35923053deadb0afb0e8c16cef
  63 +dl_files_arm64:
  64 +  kubectl-cert-manager-linux-arm64.tar.gz:
  65 +    topdir: null
  66 +    url: https://github.com/cert-manager/cert-manager/releases/download/v1.7.1/kubectl-cert_manager-linux-arm64.tar.gz
  67 +    md5sum: abf045f8a28c7104587a6bfae9fd964c
  68 +    sha256sum: 116b34c2890fed102c743205c52f3c66ded5c44f4ca3594beebe3ba4581bb8f5
  69  revision:
  70    dist: $STX_DIST
  71    GITREVCOUNT:
  72 --
  73 2.30.2
  74