From a82ada54919f6d96d83ba1d1cb6e8d369a420563 Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Tue, 1 Oct 2024 21:20:00 -0700 Subject: [PATCH] fix: chart crd forceUpgrade field should be nil by default Signed-off-by: Ethan Mosbaugh --- pkg/apis/helm/v1beta1/chart_types.go | 1 - pkg/apis/k0s/v1beta1/extensions.go | 1 - static/_crds/helm/helm.k0sproject.io_charts.yaml | 1 - static/_crds/k0s/k0s.k0sproject.io_clusterconfigs.yaml | 1 - 4 files changed, 4 deletions(-) diff --git a/pkg/apis/helm/v1beta1/chart_types.go b/pkg/apis/helm/v1beta1/chart_types.go index 79e2e5a781c7..8bf99aca8151 100644 --- 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 index b4bd6c0ebd02..20ff87b7c1ca 100644 --- a/pkg/apis/k0s/v1beta1/extensions.go +++ b/pkg/apis/k0s/v1beta1/extensions.go @@ -118,7 +118,6 @@ type Chart struct { // +kubebuilder:validation:XIntOrString Timeout BackwardCompatibleDuration `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/static/_crds/helm/helm.k0sproject.io_charts.yaml b/static/_crds/helm/helm.k0sproject.io_charts.yaml index 98ea00310323..8d46167dda42 100644 --- a/static/_crds/helm/helm.k0sproject.io_charts.yaml +++ b/static/_crds/helm/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/_crds/k0s/k0s.k0sproject.io_clusterconfigs.yaml b/static/_crds/k0s/k0s.k0sproject.io_clusterconfigs.yaml index 4f615090412c..7b7531f8f958 100644 --- a/static/_crds/k0s/k0s.k0sproject.io_clusterconfigs.yaml +++ b/static/_crds/k0s/k0s.k0sproject.io_clusterconfigs.yaml @@ -106,7 +106,6 @@ spec: minLength: 1 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).'