fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #125 from fluxcd/bugfix/storage-helm

This commit is contained in:
Hidde Beydals 2020-09-01 16:34:56 +02:00 committed by GitHub
parent 0ae11b6d3f 2c4dcfe72d
commit 5e45e54bdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
controllers/helmchart_controller.go
View File

@ -23,6 +23,7 @@ import (
"net/url" "net/url"
"os" "os"
"path" "path"
"path/filepath"
"strings" "strings"
"time" "time"
@ -383,7 +384,7 @@ func (r *HelmChartReconciler) reconcileFromGitRepository(ctx context.Context,
// package chart // package chart
pkg := action.NewPackage() pkg := action.NewPackage()
pkg.Destination = artifact.Path pkg.Destination = filepath.Dir(artifact.Path)
_, err = pkg.Run(chartPath, nil) _, err = pkg.Run(chartPath, nil)
if err != nil { if err != nil {
err = fmt.Errorf("chart package error: %w", err) err = fmt.Errorf("chart package error: %w", err)

8
controllers/storage.go
View File

@ -120,12 +120,14 @@ func (s *Storage) RemoveAllButCurrent(artifact sourcev1.Artifact) error {
return nil return nil
} }
// ArtifactExist returns a boolean indicating whether the artifact file exists in storage // ArtifactExist returns a boolean indicating whether the artifact exists in storage and is a
// regular file.
func (s *Storage) ArtifactExist(artifact sourcev1.Artifact) bool { func (s *Storage) ArtifactExist(artifact sourcev1.Artifact) bool {
if _, err := os.Stat(artifact.Path); os.IsNotExist(err) { fi, err := os.Lstat(artifact.Path)
if err != nil {
return false return false
} }
return true return fi.Mode().IsRegular()
} }
// Archive creates a tar.gz to the artifact path from the given dir excluding any VCS specific // Archive creates a tar.gz to the artifact path from the given dir excluding any VCS specific