Add support for --skip-crds helm install flag

k3s-io · Jun 10, 2024 · 20c03e5 · 20c03e5
1 parent 3b100ff
commit 20c03e5
Show file tree

Hide file tree

Showing 28 changed files with 33 additions and 26 deletions.
diff --git a/pkg/apis/helm.cattle.io/v1/doc.go b/pkg/apis/helm.cattle.io/v1/doc.go
diff --git 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
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
diff --git a/pkg/apis/helm.cattle.io/v1/zz_generated_register.go b/pkg/apis/helm.cattle.io/v1/zz_generated_register.go
diff --git a/pkg/apis/helm.cattle.io/zz_generated_register.go b/pkg/apis/helm.cattle.io/zz_generated_register.go
diff --git 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
@@ -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
diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go
diff --git a/pkg/generated/clientset/versioned/fake/doc.go b/pkg/generated/clientset/versioned/fake/doc.go
diff --git a/pkg/generated/clientset/versioned/fake/register.go b/pkg/generated/clientset/versioned/fake/register.go
diff --git a/pkg/generated/clientset/versioned/scheme/doc.go b/pkg/generated/clientset/versioned/scheme/doc.go
diff --git a/pkg/generated/clientset/versioned/scheme/register.go b/pkg/generated/clientset/versioned/scheme/register.go
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
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
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
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
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
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
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
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
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
diff --git a/pkg/generated/controllers/helm.cattle.io/factory.go b/pkg/generated/controllers/helm.cattle.io/factory.go
diff --git a/pkg/generated/controllers/helm.cattle.io/interface.go b/pkg/generated/controllers/helm.cattle.io/interface.go
diff --git a/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go b/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go
diff --git a/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go b/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go
diff --git a/pkg/generated/controllers/helm.cattle.io/v1/interface.go b/pkg/generated/controllers/helm.cattle.io/v1/interface.go