From 7f837c8af855d010c21b321ce0d754aa47ba831d Mon Sep 17 00:00:00 2001 From: GEcko <577738@qq.com> Date: Tue, 4 Dec 2018 14:40:56 +0800 Subject: [PATCH 1/3] fix TestHelmInitByAliyunStableRepo --- plugin/plugin_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/plugin_test.go b/plugin/plugin_test.go index 69048d9..c784f6e 100644 --- a/plugin/plugin_test.go +++ b/plugin/plugin_test.go @@ -534,8 +534,8 @@ func TestHelmInitByAliyunStableRepo(t *testing.T) { expected := "init " if plugin.Config.StableRepoURL != "" { expected = expected + "--stable-repo-url" + expected = expected + " " + plugin.Config.StableRepoURL } - if expected != result { t.Error("Helm cannot init for stable repository") } From e2450728698c66a7bf5bd0d07b7ff36824b4bef3 Mon Sep 17 00:00:00 2001 From: GEcko <577738@qq.com> Date: Tue, 4 Dec 2018 14:50:53 +0800 Subject: [PATCH 2/3] fix TestHelmInitByAliyunStableRepo --- plugin/plugin_test.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugin/plugin_test.go b/plugin/plugin_test.go index c784f6e..dd35ea9 100644 --- a/plugin/plugin_test.go +++ b/plugin/plugin_test.go @@ -531,11 +531,7 @@ func TestHelmInitByAliyunStableRepo(t *testing.T) { } init := doHelmInit(plugin) result := strings.Join(init, " ") - expected := "init " - if plugin.Config.StableRepoURL != "" { - expected = expected + "--stable-repo-url" - expected = expected + " " + plugin.Config.StableRepoURL - } + expected := "init --stable-repo-url " + plugin.Config.StableRepoURL if expected != result { t.Error("Helm cannot init for stable repository") } From 819b69edba0bf609dd4d7ed1ee4f48de609929eb Mon Sep 17 00:00:00 2001 From: GEcko <577738@qq.com> Date: Tue, 4 Dec 2018 18:35:36 +0800 Subject: [PATCH 3/3] fix stable_repo_url --- main.go | 2 +- plugin/plugin.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index 032c27a..d76b8e5 100644 --- a/main.go +++ b/main.go @@ -149,7 +149,7 @@ func main() { EnvVar: "PLUGIN_UPDATE_DEPENDENCIES,UPDATE_DEPENDENCIES", }, cli.StringFlag{ - Name: "stable-repo-url", + Name: "stable_repo_url", Usage: "URL for stable repository (default 'https://kubernetes-charts.storage.googleapis.com')", EnvVar: "PLUGIN_STABLE_REPO_URL,STABLE_REPO_URL", }, diff --git a/plugin/plugin.go b/plugin/plugin.go index 4c92dbc..c8ff30f 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -395,6 +395,7 @@ func (p *Plugin) debug() { fmt.Printf("Secrets: %s \n", p.Config.Secrets) fmt.Printf("Helm Repos: %s \n", p.Config.HelmRepos) fmt.Printf("ValuesFiles: %s \n", p.Config.ValuesFiles) + fmt.Printf("StableRepoURL: %s \n", p.Config.StableRepoURL) kubeconfig, err := ioutil.ReadFile(KUBECONFIG) if err == nil { fmt.Println(string(kubeconfig))