Skip to content

fix: honor HELM_IGNORE_RELEASE during cleanup #862

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

Open
sean0407 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: honor HELM_IGNORE_RELEASE during cleanup #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions pkg/addon-operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,7 @@ func (op *AddonOperator) WithLeaderElector(config *leaderelection.LeaderElection
// Returns an error if any initialization step fails.
func (op *AddonOperator) Setup() error {
// Helm client factory.
helmClient, err := helm.InitHelmClientFactory(&helm.Options{
Namespace: op.DefaultNamespace,
HistoryMax: app.Helm3HistoryMax,
Timeout: app.Helm3Timeout,
Logger: op.Logger.Named("helm"),
MetricStorage: op.MetricStorage,
}, op.CRDExtraLabels)
helmClient, err := helm.InitHelmClientFactory(op.helmOptions(), op.CRDExtraLabels)
if err != nil {
return fmt.Errorf("initialize Helm: %s", err)
}
Expand Down Expand Up @@ -395,6 +389,17 @@ func (op *AddonOperator) Setup() error {
return nil
}

func (op *AddonOperator) helmOptions() *helm.Options {
return &helm.Options{
Namespace: op.DefaultNamespace,
HistoryMax: app.Helm3HistoryMax,
Timeout: app.Helm3Timeout,
HelmIgnoreRelease: app.HelmIgnoreRelease,
Logger: op.Logger.Named("helm"),
MetricStorage: op.MetricStorage,
}
}

func ensureTempDirectory(inDir string) (string, error) {
// No path to temporary dir, use default temporary dir.
if inDir == "" {
Expand Down
13 changes: 13 additions & 0 deletions pkg/addon-operator/operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"sigs.k8s.io/yaml"

"github.com/flant/addon-operator/pkg/addon-operator/converge"
"github.com/flant/addon-operator/pkg/app"
mockhelm "github.com/flant/addon-operator/pkg/helm/test/mock"
mockhelmresmgr "github.com/flant/addon-operator/pkg/helm_resources_manager/test/mock"
. "github.com/flant/addon-operator/pkg/hook/types"
Expand Down Expand Up @@ -172,6 +173,18 @@ func assembleTestAddonOperator(t *testing.T, configPath string) (*AddonOperator,
return op, result
}

func TestHelmOptionsIncludeIgnoredRelease(t *testing.T) {
g := NewWithT(t)
previous := app.HelmIgnoreRelease
app.HelmIgnoreRelease = "release-to-ignore"
t.Cleanup(func() { app.HelmIgnoreRelease = previous })

op := &AddonOperator{Logger: log.NewNop()}
options := op.helmOptions()

g.Expect(options.HelmIgnoreRelease).To(Equal("release-to-ignore"))
}

func convergeDone(op *AddonOperator) func(g Gomega) bool {
return func(g Gomega) bool {
if op.IsStartupConvergeDone() {
Expand Down