Skip to content

Bugfix: ArtifactExist method and Helm chart packaging #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 1, 2020
Merged

Bugfix: ArtifactExist method and Helm chart packaging #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7603f9
storage: change logic of `ArtifactExist` method
hiddeco Sep 1, 2020
2c4dcfe
helmchart: use dir of artifact path on package run
hiddeco Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion controllers/helmchart_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"net/url"
"os"
"path"
"path/filepath"
"strings"
"time"

Expand Down Expand Up @@ -383,7 +384,7 @@ func (r *HelmChartReconciler) reconcileFromGitRepository(ctx context.Context,

// package chart
pkg := action.NewPackage()
pkg.Destination = artifact.Path
pkg.Destination = filepath.Dir(artifact.Path)
_, err = pkg.Run(chartPath, nil)
if err != nil {
err = fmt.Errorf("chart package error: %w", err)
Expand Down
8 changes: 5 additions & 3 deletions controllers/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,14 @@ func (s *Storage) RemoveAllButCurrent(artifact sourcev1.Artifact) error {
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 {
if _, err := os.Stat(artifact.Path); os.IsNotExist(err) {
fi, err := os.Lstat(artifact.Path)
if err != nil {
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
Expand Down