From 20c03e5bf9a144d8ef40fa95160eb579bad98d3a Mon Sep 17 00:00:00 2001 From: svvac <_@svvac.net> Date: Mon, 10 Jun 2024 16:41:50 +0200 Subject: [PATCH] Add support for `--skip-crds` helm install flag --- pkg/apis/helm.cattle.io/v1/doc.go | 2 +- pkg/apis/helm.cattle.io/v1/types.go | 1 + pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go | 2 +- pkg/apis/helm.cattle.io/v1/zz_generated_list_types.go | 2 +- pkg/apis/helm.cattle.io/v1/zz_generated_register.go | 2 +- pkg/apis/helm.cattle.io/zz_generated_register.go | 2 +- pkg/controllers/chart/chart.go | 4 ++++ pkg/controllers/chart/chart_test.go | 4 +++- pkg/generated/clientset/versioned/clientset.go | 2 +- pkg/generated/clientset/versioned/fake/clientset_generated.go | 2 +- pkg/generated/clientset/versioned/fake/doc.go | 2 +- pkg/generated/clientset/versioned/fake/register.go | 2 +- pkg/generated/clientset/versioned/scheme/doc.go | 2 +- pkg/generated/clientset/versioned/scheme/register.go | 2 +- .../clientset/versioned/typed/helm.cattle.io/v1/doc.go | 2 +- .../clientset/versioned/typed/helm.cattle.io/v1/fake/doc.go | 2 +- .../helm.cattle.io/v1/fake/fake_helm.cattle.io_client.go | 2 +- .../versioned/typed/helm.cattle.io/v1/fake/fake_helmchart.go | 2 +- .../typed/helm.cattle.io/v1/fake/fake_helmchartconfig.go | 2 +- .../versioned/typed/helm.cattle.io/v1/generated_expansion.go | 2 +- .../typed/helm.cattle.io/v1/helm.cattle.io_client.go | 2 +- .../clientset/versioned/typed/helm.cattle.io/v1/helmchart.go | 2 +- .../versioned/typed/helm.cattle.io/v1/helmchartconfig.go | 2 +- pkg/generated/controllers/helm.cattle.io/factory.go | 2 +- pkg/generated/controllers/helm.cattle.io/interface.go | 2 +- pkg/generated/controllers/helm.cattle.io/v1/helmchart.go | 2 +- .../controllers/helm.cattle.io/v1/helmchartconfig.go | 2 +- pkg/generated/controllers/helm.cattle.io/v1/interface.go | 2 +- 28 files changed, 33 insertions(+), 26 deletions(-) diff --git a/pkg/apis/helm.cattle.io/v1/doc.go b/pkg/apis/helm.cattle.io/v1/doc.go index 6bd5f6a5..2a35e179 100644 --- a/pkg/apis/helm.cattle.io/v1/doc.go +++ b/pkg/apis/helm.cattle.io/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. // +k8s:deepcopy-gen=package // +groupName=helm.cattle.io diff --git a/pkg/apis/helm.cattle.io/v1/types.go b/pkg/apis/helm.cattle.io/v1/types.go index 3172ae9a..aa5f5cca 100644 --- a/pkg/apis/helm.cattle.io/v1/types.go +++ b/pkg/apis/helm.cattle.io/v1/types.go @@ -34,6 +34,7 @@ type HelmChartSpec struct { JobImage string `json:"jobImage,omitempty"` BackOffLimit *int32 `json:"backOffLimit,omitempty"` Timeout *metav1.Duration `json:"timeout,omitempty"` + SkipCRDs bool `json:"skipCRDs,omitempty"` FailurePolicy string `json:"failurePolicy,omitempty"` AuthSecret *corev1.LocalObjectReference `json:"authSecret,omitempty"` diff --git a/pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go b/pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go index 701ba854..3410442c 100644 --- a/pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go +++ b/pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go @@ -17,7 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package v1 diff --git a/pkg/apis/helm.cattle.io/v1/zz_generated_list_types.go b/pkg/apis/helm.cattle.io/v1/zz_generated_list_types.go index 4c4b66de..fa81f84d 100644 --- a/pkg/apis/helm.cattle.io/v1/zz_generated_list_types.go +++ b/pkg/apis/helm.cattle.io/v1/zz_generated_list_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. // +k8s:deepcopy-gen=package // +groupName=helm.cattle.io diff --git a/pkg/apis/helm.cattle.io/v1/zz_generated_register.go b/pkg/apis/helm.cattle.io/v1/zz_generated_register.go index 1998efb6..0f30f7f4 100644 --- a/pkg/apis/helm.cattle.io/v1/zz_generated_register.go +++ b/pkg/apis/helm.cattle.io/v1/zz_generated_register.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. // +k8s:deepcopy-gen=package // +groupName=helm.cattle.io diff --git a/pkg/apis/helm.cattle.io/zz_generated_register.go b/pkg/apis/helm.cattle.io/zz_generated_register.go index 1b101ea5..9b412a04 100644 --- a/pkg/apis/helm.cattle.io/zz_generated_register.go +++ b/pkg/apis/helm.cattle.io/zz_generated_register.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package helm diff --git a/pkg/controllers/chart/chart.go b/pkg/controllers/chart/chart.go index 02271f35..34b25a3c 100644 --- a/pkg/controllers/chart/chart.go +++ b/pkg/controllers/chart/chart.go @@ -678,6 +678,10 @@ func args(chart *v1.HelmChart) []string { args = append(args, "--version", spec.Version) } + if spec.SkipCRDs { + args = append(args, "--skip-crds") + } + for _, k := range keys(spec.Set) { val := spec.Set[k] if typedVal(val) { diff --git a/pkg/controllers/chart/chart_test.go b/pkg/controllers/chart/chart_test.go index b222cd7c..4b40f491 100644 --- a/pkg/controllers/chart/chart_test.go +++ b/pkg/controllers/chart/chart_test.go @@ -143,6 +143,7 @@ func TestInstallArgs(t *testing.T) { assert := assert.New(t) stringArgs := strings.Join(args(NewChart()), " ") assert.Equal("install "+ + "--skip-crds "+ "--set-string acme.dnsProvider.name=cloudflare "+ "--set-string global.clusterCIDR=10.42.0.0/16\\,fd42::/48 "+ "--set-string global.systemDefaultRegistry= "+ @@ -163,7 +164,8 @@ func TestDeleteArgs(t *testing.T) { func NewChart() *v1.HelmChart { return v1.NewHelmChart("kube-system", "traefik", v1.HelmChart{ Spec: v1.HelmChartSpec{ - Chart: "stable/traefik", + Chart: "stable/traefik", + SkipCRDs: true, Set: map[string]intstr.IntOrString{ "rbac.enabled": intstr.Parse("true"), "ssl.enabled": intstr.Parse("false"), diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go index 8712088e..7a4906cb 100644 --- a/pkg/generated/clientset/versioned/clientset.go +++ b/pkg/generated/clientset/versioned/clientset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package versioned diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go index a59519df..ab388a4f 100644 --- a/pkg/generated/clientset/versioned/fake/clientset_generated.go +++ b/pkg/generated/clientset/versioned/fake/clientset_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package fake diff --git a/pkg/generated/clientset/versioned/fake/doc.go b/pkg/generated/clientset/versioned/fake/doc.go index 8aaca0c7..c62a99a8 100644 --- a/pkg/generated/clientset/versioned/fake/doc.go +++ b/pkg/generated/clientset/versioned/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. // This package has the automatically generated fake clientset. package fake diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go index 4125b352..8d32b937 100644 --- a/pkg/generated/clientset/versioned/fake/register.go +++ b/pkg/generated/clientset/versioned/fake/register.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package fake diff --git a/pkg/generated/clientset/versioned/scheme/doc.go b/pkg/generated/clientset/versioned/scheme/doc.go index 6bd144ec..2a1a34f0 100644 --- a/pkg/generated/clientset/versioned/scheme/doc.go +++ b/pkg/generated/clientset/versioned/scheme/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. // This package contains the scheme of the automatically generated clientset. package scheme diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go index 9e7e4d97..f482b31c 100644 --- a/pkg/generated/clientset/versioned/scheme/register.go +++ b/pkg/generated/clientset/versioned/scheme/register.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package scheme diff --git a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go index 761c8c49..b3294a34 100644 --- a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go +++ b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. // This package has the automatically generated typed clients. package v1 diff --git a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/doc.go b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/doc.go index ccad4cbc..fa398798 100644 --- a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/doc.go +++ b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. // Package fake has the automatically generated clients. package fake diff --git a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/fake_helm.cattle.io_client.go b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/fake_helm.cattle.io_client.go index 90921882..99300ed4 100644 --- a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/fake_helm.cattle.io_client.go +++ b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/fake_helm.cattle.io_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package fake diff --git a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/fake_helmchart.go b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/fake_helmchart.go index 142e0901..f7945204 100644 --- a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/fake_helmchart.go +++ b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/fake_helmchart.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package fake diff --git a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/fake_helmchartconfig.go b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/fake_helmchartconfig.go index cdea03e4..0756e6f4 100644 --- a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/fake_helmchartconfig.go +++ b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/fake/fake_helmchartconfig.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package fake diff --git a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go index 81557737..b606742a 100644 --- a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go +++ b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package v1 diff --git a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go index 8b28d681..0d4dda1e 100644 --- a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go +++ b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package v1 diff --git a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go index b1e49546..cf809b5c 100644 --- a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go +++ b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package v1 diff --git a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go index 4255a562..4f145cd4 100644 --- a/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go +++ b/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package v1 diff --git a/pkg/generated/controllers/helm.cattle.io/factory.go b/pkg/generated/controllers/helm.cattle.io/factory.go index 646b8ab4..42e8a5a3 100644 --- a/pkg/generated/controllers/helm.cattle.io/factory.go +++ b/pkg/generated/controllers/helm.cattle.io/factory.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package helm diff --git a/pkg/generated/controllers/helm.cattle.io/interface.go b/pkg/generated/controllers/helm.cattle.io/interface.go index 98b58007..96bb5636 100644 --- a/pkg/generated/controllers/helm.cattle.io/interface.go +++ b/pkg/generated/controllers/helm.cattle.io/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package helm diff --git a/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go b/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go index 10b0961b..8bfc0a3c 100644 --- a/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go +++ b/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package v1 diff --git a/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go b/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go index e5522a54..13533dfe 100644 --- a/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go +++ b/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package v1 diff --git a/pkg/generated/controllers/helm.cattle.io/v1/interface.go b/pkg/generated/controllers/helm.cattle.io/v1/interface.go index a5367509..d02f44a8 100644 --- a/pkg/generated/controllers/helm.cattle.io/v1/interface.go +++ b/pkg/generated/controllers/helm.cattle.io/v1/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by main. DO NOT EDIT. +// Code generated by codegen. DO NOT EDIT. package v1