From a6113eb85c19e5ea51323f78c5936ae7abf5af64 Mon Sep 17 00:00:00 2001 From: sharang bhardwaj Date: Fri, 1 Mar 2024 02:06:34 -0500 Subject: [PATCH] Retrieve only the deploy plug-in helm-chart Fetching the deploy plug-in helm-chart by using the command "grep "deployment-manager.tgz" in the directory /usr/local/share/applications/helm/ for the purpose of deploying an upgrade to deploy plug-in. Due to recent developments in the deploy plug-in system-application, a new helm-chart is generated with the naming convention deployment-manager_*tgz. The current retrieval process is obtaining both deploy plug-in and system application helm-charts. To address this, a hyphen ("-") has been added to the grep command ("-deployment-manager") to specifically check for deploy plug-in and exclude the system-application. Test-Plan: PASS: Verify the deploy plug-in helm-chart is retrieved. PASS: Verify the deploy plug-in is refreshed when it is installed Closes-Bug: 2055699 Change-Id: I9d8ae5d491f6a9cacca1e68574c4cb4431264342 Signed-off-by: sharang bhardwaj --- .../controllerconfig/upgrade-scripts/91-upgrade-dm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllerconfig/controllerconfig/upgrade-scripts/91-upgrade-dm.sh b/controllerconfig/controllerconfig/upgrade-scripts/91-upgrade-dm.sh index f24353c177..7a8f402066 100755 --- a/controllerconfig/controllerconfig/upgrade-scripts/91-upgrade-dm.sh +++ b/controllerconfig/controllerconfig/upgrade-scripts/91-upgrade-dm.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2023 Wind River Systems, Inc. +# Copyright (c) 2023-2024 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -19,7 +19,7 @@ function log { } DEPLOY_PLAYBOOK=$(ls /usr/local/share/applications/playbooks/*deployment-manager.yaml 2> /dev/null) -DEPLOY_CHART=$(ls /usr/local/share/applications/helm/*deployment-manager*.tgz 2> /dev/null) +DEPLOY_CHART=$(ls /usr/local/share/applications/helm/*-deployment-manager*.tgz 2> /dev/null) DEPLOY_OVERRIDES=$(ls /usr/local/share/applications/overrides/*deployment-manager-overrides.yaml 2> /dev/null) REFRESH_DM_IMAGES="false"