actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-24 16:41:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

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

Browse source
This commit is contained in:
Hidde Beydals 2021-09-21 20:19:43 +02:00 committed by GitHub
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 Expand all files Collapse all files

10
cmd/flux/create_helmrelease.go
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())}
} }