parent
							
								
									e5038fb04f
								
							
						
					
					
						commit
						bce2f4728b
					
				|  | @ -1906,8 +1906,8 @@ releases: | ||||||
| 
 | 
 | ||||||
| 	var helm = &mockHelmExec{} | 	var helm = &mockHelmExec{} | ||||||
| 	var wantReleases = []mockTemplates{ | 	var wantReleases = []mockTemplates{ | ||||||
| 		{[]string{"--name", "myrelease1", "--output-dir", "output/subdir/helmfile-[a-z0-9]{8}-myrelease1"}}, | 		{[]string{"--name", "myrelease1", "--namespace", "testNamespace", "--output-dir", "output/subdir/helmfile-[a-z0-9]{8}-myrelease1"}}, | ||||||
| 		{[]string{"--name", "myrelease2", "--output-dir", "output/subdir/helmfile-[a-z0-9]{8}-myrelease2"}}, | 		{[]string{"--name", "myrelease2", "--namespace", "testNamespace", "--output-dir", "output/subdir/helmfile-[a-z0-9]{8}-myrelease2"}}, | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	var buffer bytes.Buffer | 	var buffer bytes.Buffer | ||||||
|  | @ -1920,12 +1920,13 @@ releases: | ||||||
| 		Env:         "default", | 		Env:         "default", | ||||||
| 		Logger:      logger, | 		Logger:      logger, | ||||||
| 		helmExecer:  helm, | 		helmExecer:  helm, | ||||||
|  | 		Namespace:   "testNamespace", | ||||||
| 	}, files) | 	}, files) | ||||||
| 	app.Template(configImpl{}) | 	app.Template(configImpl{}) | ||||||
| 
 | 
 | ||||||
| 	for i := range wantReleases { | 	for i := range wantReleases { | ||||||
| 		for j := range wantReleases[i].flags { | 		for j := range wantReleases[i].flags { | ||||||
| 			if j == 3 { | 			if j == 5 { | ||||||
| 				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]) | ||||||
|  | @ -1936,5 +1937,4 @@ releases: | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| 	} | 	} | ||||||
| 
 |  | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -569,6 +569,8 @@ func (st *HelmState) TemplateReleases(helm helmexec.Interface, outputDir string, | ||||||
| 			continue | 			continue | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
|  | 		st.applyDefaultsTo(&release) | ||||||
|  | 
 | ||||||
| 		flags, err := st.flagsForTemplate(helm, &release, 0) | 		flags, err := st.flagsForTemplate(helm, &release, 0) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			errs = append(errs, err) | 			errs = append(errs, err) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue