Merge pull request #5099 from k0sproject/backport-5077-to-release-1.28

[Backport release-1.28] fix: chart crd forceUpgrade field should be nil by default
k0sproject · Oct 28, 2024 · bb26edb · bb26edb
2 parents 8e2359b + 05e48b6
commit bb26edb
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 4 deletions.
diff --git a/pkg/apis/helm/v1beta1/chart_types.go b/pkg/apis/helm/v1beta1/chart_types.go
@@ -34,7 +34,6 @@ type ChartSpec struct {
 	Namespace   string `json:"namespace,omitempty"`
 	Timeout     string `json:"timeout,omitempty"`
 	// ForceUpgrade when set to false, disables the use of the "--force" flag when upgrading the the chart (default: true).
-	// +kubebuilder:default=true
 	// +optional
 	ForceUpgrade *bool `json:"forceUpgrade,omitempty"`
 	Order        int   `json:"order,omitempty"`

diff --git a/pkg/apis/k0s/v1beta1/extensions.go b/pkg/apis/k0s/v1beta1/extensions.go
@@ -96,7 +96,6 @@ type Chart struct {
 	TargetNS  string        `json:"namespace"`
 	Timeout   time.Duration `json:"timeout"`
 	// ForceUpgrade when set to false, disables the use of the "--force" flag when upgrading the the chart (default: true).
-	// +kubebuilder:default=true
 	// +optional
 	ForceUpgrade *bool `json:"forceUpgrade,omitempty"`
 	Order        int   `json:"order"`

diff --git a/static/manifests/helm/CustomResourceDefinition/helm.k0sproject.io_charts.yaml b/static/manifests/helm/CustomResourceDefinition/helm.k0sproject.io_charts.yaml
@@ -42,7 +42,6 @@ spec:
               chartName:
                 type: string
               forceUpgrade:
-                default: true
                 description: 'ForceUpgrade when set to false, disables the use of
                   the "--force" flag when upgrading the the chart (default: true).'
                 type: boolean

diff --git a/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml b/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml
@@ -95,7 +95,6 @@ spec:
                             chartname:
                               type: string
                             forceUpgrade:
-                              default: true
                               description: 'ForceUpgrade when set to false, disables
                                 the use of the "--force" flag when upgrading the the
                                 chart (default: true).'