jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-09-16 09:26:22 +02:00
Code Issues Releases Activity

fix(helmExecute): explicitly set buildDescriptorFile if the chartPath is configured (#4063)

Browse Source 
Co-authored-by: Philipp Stehle <philipp.stehle@sap.com>
This commit is contained in:
Pavel Busko
2022-10-13 11:11:00 +02:00
committed by GitHub
parent 37a3504152
commit cf301a758f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/helmExecute.go
View File

@@ -3,6 +3,7 @@ package cmd
import ( import (
"fmt" "fmt"
"path" "path"
"path/filepath"
"github.com/SAP/jenkins-library/pkg/kubernetes" "github.com/SAP/jenkins-library/pkg/kubernetes"
"github.com/SAP/jenkins-library/pkg/log" "github.com/SAP/jenkins-library/pkg/log"
@@ -44,11 +45,19 @@ func helmExecute(config helmExecuteOptions, telemetryData *telemetry.CustomData,
VersioningScheme: "library", VersioningScheme: "library",
} }
artifact, err := versioning.GetArtifact("helm", "", &artifactOpts, utils) buildDescriptorFile := ""
if helmConfig.ChartPath != "" {
buildDescriptorFile = filepath.Join(helmConfig.ChartPath, "Chart.yaml")
}
artifact, err := versioning.GetArtifact("helm", buildDescriptorFile, &artifactOpts, utils)
if err != nil { if err != nil {
log.Entry().WithError(err).Fatalf("getting artifact information failed: %v", err) log.Entry().WithError(err).Fatalf("getting artifact information failed: %v", err)
} }
artifactInfo, err := artifact.GetCoordinates() artifactInfo, err := artifact.GetCoordinates()
if err != nil {
log.Entry().WithError(err).Fatalf("getting artifact coordinates failed: %v", err)
}
helmConfig.DeploymentName = artifactInfo.ArtifactID helmConfig.DeploymentName = artifactInfo.ArtifactID