Skip to content

Commit 20c03e5

Browse files
committed
Add support for --skip-crds helm install flag
1 parent 3b100ff commit 20c03e5

28 files changed

+33
-26
lines changed

pkg/apis/helm.cattle.io/v1/doc.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/helm.cattle.io/v1/types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ type HelmChartSpec struct {
3434
JobImage string `json:"jobImage,omitempty"`
3535
BackOffLimit *int32 `json:"backOffLimit,omitempty"`
3636
Timeout *metav1.Duration `json:"timeout,omitempty"`
37+
SkipCRDs bool `json:"skipCRDs,omitempty"`
3738
FailurePolicy string `json:"failurePolicy,omitempty"`
3839
AuthSecret *corev1.LocalObjectReference `json:"authSecret,omitempty"`
3940

pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/helm.cattle.io/v1/zz_generated_list_types.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/helm.cattle.io/v1/zz_generated_register.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/helm.cattle.io/zz_generated_register.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/controllers/chart/chart.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,10 @@ func args(chart *v1.HelmChart) []string {
678678
args = append(args, "--version", spec.Version)
679679
}
680680

681+
if spec.SkipCRDs {
682+
args = append(args, "--skip-crds")
683+
}
684+
681685
for _, k := range keys(spec.Set) {
682686
val := spec.Set[k]
683687
if typedVal(val) {

pkg/controllers/chart/chart_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ func TestInstallArgs(t *testing.T) {
143143
assert := assert.New(t)
144144
stringArgs := strings.Join(args(NewChart()), " ")
145145
assert.Equal("install "+
146+
"--skip-crds "+
146147
"--set-string acme.dnsProvider.name=cloudflare "+
147148
"--set-string global.clusterCIDR=10.42.0.0/16\\,fd42::/48 "+
148149
"--set-string global.systemDefaultRegistry= "+
@@ -163,7 +164,8 @@ func TestDeleteArgs(t *testing.T) {
163164
func NewChart() *v1.HelmChart {
164165
return v1.NewHelmChart("kube-system", "traefik", v1.HelmChart{
165166
Spec: v1.HelmChartSpec{
166-
Chart: "stable/traefik",
167+
Chart: "stable/traefik",
168+
SkipCRDs: true,
167169
Set: map[string]intstr.IntOrString{
168170
"rbac.enabled": intstr.Parse("true"),
169171
"ssl.enabled": intstr.Parse("false"),

pkg/generated/clientset/versioned/clientset.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/generated/clientset/versioned/fake/clientset_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)