public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix more issues 

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2025-04-16 08:36:55 +08:00
parent f6fc585eca
commit 2835cc9be3
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/state/state.go
View File

@ -204,13 +204,13 @@ type HelmSpec struct {
// PlainHttp is true if the remote charte should be fetched using HTTP and not HTTPS // PlainHttp is true if the remote charte should be fetched using HTTP and not HTTPS
PlainHttp bool `yaml:"plainHttp,omitempty"` PlainHttp bool `yaml:"plainHttp,omitempty"`
// Wait, if set to true, will wait until all resources are deleted before mark delete command as successful // Wait, if set to true, will wait until all resources are deleted before mark delete command as successful
DeleteWait bool `yaml:"deleteWait"` DeleteWait bool `yaml:"deleteWait,omitempty"`
// Timeout is the time in seconds to wait for helmfile delete command (default 300) // Timeout is the time in seconds to wait for helmfile delete command (default 300)
DeleteTimeout int `yaml:"deleteTimeout"` DeleteTimeout int `yaml:"deleteTimeout,omitempty"`
// SyncReleaseLabels is true if the release labels should be synced with the helmfile labels // SyncReleaseLabels is true if the release labels should be synced with the helmfile labels
SyncReleaseLabels *bool `yaml:"syncReleaseLabels"` SyncReleaseLabels *bool `yaml:"syncReleaseLabels,omitempty"`
// TakeOwnership is true if the helmfile should take ownership of the release // TakeOwnership is true if the helmfile should take ownership of the release
TakeOwnership *bool `yaml:"takeOwnership"` TakeOwnership *bool `yaml:"takeOwnership,omitempty"`
} }
// RepositorySpec that defines values for a helm repo // RepositorySpec that defines values for a helm repo
@ -414,9 +414,9 @@ type ReleaseSpec struct {
// Timeout is the time in seconds to wait for helmfile delete command (default 300) // Timeout is the time in seconds to wait for helmfile delete command (default 300)
DeleteTimeout *int `yaml:"deleteTimeout,omitempty"` DeleteTimeout *int `yaml:"deleteTimeout,omitempty"`
// SyncReleaseLabels is true if the release labels should be synced with the helmfile labels // SyncReleaseLabels is true if the release labels should be synced with the helmfile labels
SyncReleaseLabels *bool `yaml:"syncReleaseLabels"` SyncReleaseLabels *bool `yaml:"syncReleaseLabels,omitempty"`
// TakeOwnership is true if the release should take ownership of the resources // TakeOwnership is true if the release should take ownership of the resources
TakeOwnership *bool `yaml:"takeOwnership"` TakeOwnership *bool `yaml:"takeOwnership,omitempty"`
} }
func (r *Inherits) UnmarshalYAML(unmarshal func(any) error) error { func (r *Inherits) UnmarshalYAML(unmarshal func(any) error) error {

6
test/e2e/template/helmfile/testdata/snapshot/issue_2098_release_template_needs/output.yaml vendored
View File

@ -19,8 +19,6 @@ releases:
name: default-shared-resources name: default-shared-resources
namespace: default namespace: default
service: shared-resources service: shared-resources
syncReleaseLabels: false
takeOwnership: false
- chart: aservo/util - chart: aservo/util
version: 0.0.1 version: 0.0.1
needs: needs:
@ -32,12 +30,8 @@ releases:
name: default-release-resources name: default-release-resources
namespace: default namespace: default
service: release-resources service: release-resources
syncReleaseLabels: false
takeOwnership: false
templates: templates:
defaults: defaults:
name: default-{{ .Release.Labels.service }} name: default-{{ .Release.Labels.service }}
namespace: default namespace: default
syncReleaseLabels: false
takeOwnership: false
renderedvalues: {} renderedvalues: {}