From 505ad76678ff4f09c2a3fb710ea9b62bd35ba593 Mon Sep 17 00:00:00 2001
From: Anuj Chaudhari <anuj.chaudhari@broadcom.com>
Date: Tue, 17 Sep 2024 14:26:21 -0700
Subject: [PATCH] Make existing RPM package GPG key configurable (#814)

* Make existing RPM package GPG key configurable

* Fix mdlint issue
---
 hack/check/check-mdlint.sh | 2 +-
 hack/rpm/build_package.sh  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hack/check/check-mdlint.sh b/hack/check/check-mdlint.sh
index b2d16c5a8..3f27d449c 100755
--- a/hack/check/check-mdlint.sh
+++ b/hack/check/check-mdlint.sh
@@ -16,6 +16,6 @@ cd "$(dirname "${BASH_SOURCE[0]}")/../.."
 # Additional configuration can be found in the .markdownlintrc file at
 # the root of the repo.
 docker run --rm -v "$(pwd)":/build \
-  gcr.io/cluster-api-provider-vsphere/extra/mdlint:0.23.2 /md/lint \
+  gcr.io/eminent-nation-87317/tanzu-cli/ci-images/mdlint:0.23.2 /md/lint \
   -i docs/cli/commands \
   -i **/CHANGELOG.md .
diff --git a/hack/rpm/build_package.sh b/hack/rpm/build_package.sh
index 9a4d97542..61c6524e9 100755
--- a/hack/rpm/build_package.sh
+++ b/hack/rpm/build_package.sh
@@ -99,6 +99,7 @@ done
 
 # Prepare the existing repository info so we can sync from it
 RPM_METADATA_BASE_URI=${RPM_METADATA_BASE_URI:=https://storage.googleapis.com/tanzu-cli-os-packages}
+RPM_REPO_GPG_PUBLIC_KEY_URI=${RPM_REPO_GPG_PUBLIC_KEY_URI:=https://packages-prod.broadcom.com/tools/keys/VMWARE-PACKAGING-GPG-RSA-KEY.pub}
 if [ "${RPM_METADATA_BASE_URI}" = "new" ]; then
    echo
    echo "Building a brand new repository"
@@ -111,7 +112,7 @@ baseurl=${RPM_METADATA_BASE_URI}/rpm/tanzu-cli
 enabled=1
 gpgcheck=1
 repo_gpgcheck=1
-gpgkey=https://packages-prod.broadcom.com/tools/keys/VMWARE-PACKAGING-GPG-RSA-KEY.pub
+gpgkey=${RPM_REPO_GPG_PUBLIC_KEY_URI}
 EOF
    
    # Sync the metadata so we can update it