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

feat: Option to pass kubeVersion to helm template (#2002)

This commit is contained in:
Mårten Svantesson 2022-01-07 01:05:03 +01:00 committed by GitHub
parent 94f99536c6
commit fe8a176db5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -322,13 +322,15 @@ bases:
# Advanced Configuration: API Capabilities # Advanced Configuration: API Capabilities
# #
# 'helmfile template' renders releases locally without querying an actual cluster, # 'helmfile template' renders releases locally without querying an actual cluster,
# and in this case `.Capabilities.APIVersions` cannot be populated. # and in this case `.Capabilities.APIVersions` cannot be populated. Also `Capabilities.KubeVersion` will probably be incorrect.
# When a chart queries for a specific CRD, this can lead to unexpected results. # When a chart queries for a specific CRD or the Kubernetes version, this can lead to unexpected results.
# #
# Configure a fixed list of api versions to pass to 'helm template' via the --api-versions flag: # Configure a fixed list of api versions to pass to 'helm template' via the --api-versions flag:
apiVersions: apiVersions:
- example/v1 - example/v1
# Configure a Kubernetes version to pass to 'helm template' via the --kube-version flag:
kubeVersion: v1.21
``` ```
## Templating ## Templating

9
pkg/app/app_test.go
View File

@ -2692,12 +2692,15 @@ releases:
} }
} }
func TestTemplate_ApiVersions(t *testing.T) { func TestTemplate_ApiVersionsAndKubeVersion(t *testing.T) {
files := map[string]string{ files := map[string]string{
"/path/to/helmfile.yaml": ` "/path/to/helmfile.yaml": `
apiVersions: apiVersions:
- helmfile.test/v1 - helmfile.test/v1
- helmfile.test/v2 - helmfile.test/v2
kubeVersion: v1.21
releases: releases:
- name: myrelease1 - name: myrelease1
chart: stable/mychart1 chart: stable/mychart1
@ -2706,7 +2709,7 @@ releases:
var helm = &mockHelmExec{} var helm = &mockHelmExec{}
var wantReleases = []mockTemplates{ var wantReleases = []mockTemplates{
{name: "myrelease1", chart: "stable/mychart1", flags: []string{"--api-versions", "helmfile.test/v1", "--api-versions", "helmfile.test/v2", "--namespace", "testNamespace", "--output-dir", "output/subdir/helmfile-[a-z0-9]{8}-myrelease1"}}, {name: "myrelease1", chart: "stable/mychart1", flags: []string{"--api-versions", "helmfile.test/v1", "--api-versions", "helmfile.test/v2", "--kube-version", "v1.21", "--namespace", "testNamespace", "--output-dir", "output/subdir/helmfile-[a-z0-9]{8}-myrelease1"}},
} }
var buffer bytes.Buffer var buffer bytes.Buffer
@ -2743,7 +2746,7 @@ releases:
t.Errorf("chart = [%v], want %v", helm.templated[i].chart, wantReleases[i].chart) t.Errorf("chart = [%v], want %v", helm.templated[i].chart, wantReleases[i].chart)
} }
for j := range wantReleases[i].flags { for j := range wantReleases[i].flags {
if j == 7 { if j == 9 {
matched, _ := regexp.Match(wantReleases[i].flags[j], []byte(helm.templated[i].flags[j])) matched, _ := regexp.Match(wantReleases[i].flags[j], []byte(helm.templated[i].flags[j]))
if !matched { if !matched {
t.Errorf("HelmState.TemplateReleases() = [%v], want %v", helm.templated[i].flags[j], wantReleases[i].flags[j]) t.Errorf("HelmState.TemplateReleases() = [%v], want %v", helm.templated[i].flags[j], wantReleases[i].flags[j])

4
pkg/state/state.go
View File

@ -61,6 +61,7 @@ type ReleaseSetSpec struct {
Releases []ReleaseSpec `yaml:"releases,omitempty"` Releases []ReleaseSpec `yaml:"releases,omitempty"`
Selectors []string `yaml:"-"` Selectors []string `yaml:"-"`
ApiVersions []string `yaml:"apiVersions,omitempty"` ApiVersions []string `yaml:"apiVersions,omitempty"`
KubeVersion string `yaml:"kubeVersion,omitempty"`
// Hooks is a list of extension points paired with operations, that are executed in specific points of the lifecycle of releases defined in helmfile // Hooks is a list of extension points paired with operations, that are executed in specific points of the lifecycle of releases defined in helmfile
Hooks []event.Hook `yaml:"hooks,omitempty"` Hooks []event.Hook `yaml:"hooks,omitempty"`
@ -2459,6 +2460,9 @@ func (st *HelmState) flagsForTemplate(helm helmexec.Interface, release *ReleaseS
} }
flags = st.appendApiVersionsFlags(flags) flags = st.appendApiVersionsFlags(flags)
if st.KubeVersion != "" {
flags = append(flags, "--kube-version", st.KubeVersion)
}
common, files, err := st.namespaceAndValuesFlags(helm, release, workerIndex) common, files, err := st.namespaceAndValuesFlags(helm, release, workerIndex)
if err != nil { if err != nil {