Mirrors
/
flux2
mirror of https://github.com/fluxcd/flux2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1846 from SomtochiAma/crd-panic-0.17.2

Browse Source
pull/1849/head
Hidde Beydals 4 years ago committed by GitHub
parent 3a76c26822 68a89d3cd4
commit bbe62d029c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File

10
cmd/flux/create_helmrelease.go
Unescape Escape View File

@ -187,9 +187,11 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
} }
if helmReleaseArgs.createNamespace { if helmReleaseArgs.createNamespace {
helmRelease.Spec.Install = &helmv2.Install{ if helmRelease.Spec.Install == nil {
CreateNamespace: helmReleaseArgs.createNamespace, helmRelease.Spec.Install = &helmv2.Install{}
} }
helmRelease.Spec.Install.CreateNamespace = helmReleaseArgs.createNamespace
} }
if helmReleaseArgs.saName != "" { if helmReleaseArgs.saName != "" {
@ -197,6 +199,10 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
} }
if helmReleaseArgs.crds != "" { if helmReleaseArgs.crds != "" {
if helmRelease.Spec.Install == nil {
helmRelease.Spec.Install = &helmv2.Install{}
}
helmRelease.Spec.Install.CRDs = helmv2.Create helmRelease.Spec.Install.CRDs = helmv2.Create
helmRelease.Spec.Upgrade = &helmv2.Upgrade{CRDs: helmv2.CRDsPolicy(helmReleaseArgs.crds.String())} helmRelease.Spec.Upgrade = &helmv2.Upgrade{CRDs: helmv2.CRDsPolicy(helmReleaseArgs.crds.String())}
} }

Write Preview
Loading…
Cancel
Save