Disable tillerless for helm3 (#987)

This commit is contained in:
刘相轩
2019-11-21 21:53:38 +09:00
committed by KUOKA Yusuke
parent 8a2311d033
commit 06a3b558e0
2 changed files with 11 additions and 11 deletions
+4 -4
View File
@@ -11,12 +11,12 @@ type HelmContext struct {
WorkerIndex int
}
func (context *HelmContext) GetTillerlessArgs(helmBinary string) []string {
if context.Tillerless {
func (context *HelmContext) GetTillerlessArgs(helm *execer) []string {
if context.Tillerless && !helm.IsHelm3() {
if context.TillerNamespace != "" {
return []string{"tiller", "run", context.TillerNamespace, "--", helmBinary}
return []string{"tiller", "run", context.TillerNamespace, "--", helm.helmBinary}
} else {
return []string{"tiller", "run", "--", helmBinary}
return []string{"tiller", "run", "--", helm.helmBinary}
}
} else {
return []string{}