Skip to content

fix: make createNamespace and replace optional in helm install options #1812

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
gianlucam76 merged 1 commit into from
May 26, 2026
Merged

fix: make createNamespace and replace optional in helm install options #1812

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
4 changes: 2 additions & 2 deletions api/v1beta1/spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,12 @@ type HelmInstallOptions struct {
// Create the release namespace if not present. Defaults to true
// +kubebuilder:default:=true
// +optional
CreateNamespace bool `json:"createNamespace,omitempty"`
CreateNamespace *bool `json:"createNamespace,omitempty"`

// Replaces if set indicates to replace an older release with this one
// +kubebuilder:default:=true
// +optional
Replace bool `json:"replace,omitempty"`
Replace *bool `json:"replace,omitempty"`

// prevent hooks from running during install. If set to true, overrides
// DisableHooks in HelmOptions. Use this one when you want to selective
Expand Down
17 changes: 13 additions & 4 deletions api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions controllers/handlers_helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3904,8 +3904,8 @@ func getTakeOwnershipHelmValue(options *configv1beta1.HelmOptions, isUpgrade boo
}

func getCreateNamespaceHelmValue(options *configv1beta1.HelmOptions) bool {
if options != nil {
return options.InstallOptions.CreateNamespace
if options != nil && options.InstallOptions.CreateNamespace != nil {
return *options.InstallOptions.CreateNamespace
}

return true // for backward compatibility
Expand Down Expand Up @@ -4012,8 +4012,8 @@ func getLabelsValue(options *configv1beta1.HelmOptions) map[string]string {
}

func getReplaceValue(options *configv1beta1.HelmOptions) bool {
if options != nil {
return options.InstallOptions.Replace
if options != nil && options.InstallOptions.Replace != nil {
return *options.InstallOptions.Replace
}
return true
}
Expand Down
3 changes: 2 additions & 1 deletion test/fv/delete_check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"k8s.io/utils/ptr"

appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -110,7 +111,7 @@ spec:
Options: &configv1beta1.HelmOptions{
DependencyUpdate: true,
InstallOptions: configv1beta1.HelmInstallOptions{
Replace: false,
Replace: ptr.To(false),
},
},
},
Expand Down
5 changes: 3 additions & 2 deletions test/fv/helm_failure_message_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/util/retry"
"k8s.io/utils/ptr"

configv1beta1 "github.com/projectsveltos/addon-controller/api/v1beta1"
"github.com/projectsveltos/addon-controller/lib/clusterops"
Expand Down Expand Up @@ -81,8 +82,8 @@ var _ = Describe("Helm with conflicts", func() {
HelmChartAction: configv1beta1.HelmChartActionInstall,
Options: &configv1beta1.HelmOptions{
InstallOptions: configv1beta1.HelmInstallOptions{
CreateNamespace: true,
Replace: true,
CreateNamespace: ptr.To(true),
Replace: ptr.To(true),
},
Timeout: &metav1.Duration{Duration: time.Second},
},
Expand Down
3 changes: 2 additions & 1 deletion test/fv/helm_options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"k8s.io/utils/ptr"

appsv1 "k8s.io/api/apps/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -68,7 +69,7 @@ var _ = Describe("HelmOptions", func() {
Options: &configv1beta1.HelmOptions{
DependencyUpdate: true,
InstallOptions: configv1beta1.HelmInstallOptions{
Replace: false,
Replace: ptr.To(false),
},
},
},
Expand Down