Add enableDNS flag support to diff command
Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com>
This commit is contained in:
parent
8c518b6727
commit
a473d39873
|
|
@ -2897,6 +2897,9 @@ func (st *HelmState) flagsForDiff(helm helmexec.Interface, release *ReleaseSpec,
|
||||||
settings := cli.New()
|
settings := cli.New()
|
||||||
var flags []string
|
var flags []string
|
||||||
flags = st.appendChartVersionFlags(flags, release)
|
flags = st.appendChartVersionFlags(flags, release)
|
||||||
|
if release.EnableDNS != nil && *release.EnableDNS || release.EnableDNS == nil && st.HelmDefaults.EnableDNS {
|
||||||
|
flags = append(flags, "--enable-dns")
|
||||||
|
}
|
||||||
|
|
||||||
disableOpenAPIValidation := false
|
disableOpenAPIValidation := false
|
||||||
if release.DisableOpenAPIValidation != nil {
|
if release.DisableOpenAPIValidation != nil {
|
||||||
|
|
|
||||||
|
|
@ -1836,14 +1836,19 @@ func TestHelmState_DiffReleases(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestHelmState_DiffFlags(t *testing.T) {
|
func TestHelmState_DiffFlags(t *testing.T) {
|
||||||
|
enable := true
|
||||||
|
disable := false
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
|
defaults HelmSpec
|
||||||
releases []ReleaseSpec
|
releases []ReleaseSpec
|
||||||
helm *exectest.Helm
|
helm *exectest.Helm
|
||||||
wantDiffFlags []string
|
wantDiffFlags []string
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "release with api version and kubeversion",
|
name: "release with api version and kubeversion",
|
||||||
|
defaults: HelmSpec{},
|
||||||
releases: []ReleaseSpec{
|
releases: []ReleaseSpec{
|
||||||
{
|
{
|
||||||
Name: "releaseName",
|
Name: "releaseName",
|
||||||
|
|
@ -1857,6 +1862,7 @@ func TestHelmState_DiffFlags(t *testing.T) {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "release with kubeversion and plain http which is ignored",
|
name: "release with kubeversion and plain http which is ignored",
|
||||||
|
defaults: HelmSpec{},
|
||||||
releases: []ReleaseSpec{
|
releases: []ReleaseSpec{
|
||||||
{
|
{
|
||||||
Name: "releaseName",
|
Name: "releaseName",
|
||||||
|
|
@ -1868,6 +1874,44 @@ func TestHelmState_DiffFlags(t *testing.T) {
|
||||||
helm: &exectest.Helm{},
|
helm: &exectest.Helm{},
|
||||||
wantDiffFlags: []string{"--kube-version", "1.21"},
|
wantDiffFlags: []string{"--kube-version", "1.21"},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "release with enable-dns",
|
||||||
|
defaults: HelmSpec{EnableDNS: false},
|
||||||
|
releases: []ReleaseSpec{
|
||||||
|
{
|
||||||
|
Name: "releaseName",
|
||||||
|
Chart: "foo",
|
||||||
|
EnableDNS: &enable,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
helm: &exectest.Helm{},
|
||||||
|
wantDiffFlags: []string{"--enable-dns"},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "release with disable-dns override",
|
||||||
|
defaults: HelmSpec{EnableDNS: true},
|
||||||
|
releases: []ReleaseSpec{
|
||||||
|
{
|
||||||
|
Name: "releaseName",
|
||||||
|
Chart: "foo",
|
||||||
|
EnableDNS: &disable,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
helm: &exectest.Helm{},
|
||||||
|
wantDiffFlags: nil,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "release with enable-dns from default",
|
||||||
|
defaults: HelmSpec{EnableDNS: true},
|
||||||
|
releases: []ReleaseSpec{
|
||||||
|
{
|
||||||
|
Name: "releaseName",
|
||||||
|
Chart: "foo",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
helm: &exectest.Helm{},
|
||||||
|
wantDiffFlags: []string{"--enable-dns"},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
for i := range tests {
|
for i := range tests {
|
||||||
tt := tests[i]
|
tt := tests[i]
|
||||||
|
|
@ -1875,6 +1919,7 @@ func TestHelmState_DiffFlags(t *testing.T) {
|
||||||
state := &HelmState{
|
state := &HelmState{
|
||||||
ReleaseSetSpec: ReleaseSetSpec{
|
ReleaseSetSpec: ReleaseSetSpec{
|
||||||
Releases: tt.releases,
|
Releases: tt.releases,
|
||||||
|
HelmDefaults: tt.defaults,
|
||||||
},
|
},
|
||||||
logger: logger,
|
logger: logger,
|
||||||
valsRuntime: valsRuntime,
|
valsRuntime: valsRuntime,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue