github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70282 from justinsb/better_unsupported_provider_messages 

Disambiguate "unsupported provider" messages
pull/58/head
k8s-ci-robot 2018-10-27 13:49:05 -07:00 committed by GitHub
parent 481fa1977c ff8a0e08cb
commit 8616687c90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/framework/util.go
View File

@ -3895,7 +3895,7 @@ func ParseKVLines(output, key string) string {
func RestartKubeProxy(host string) error { func RestartKubeProxy(host string) error {
// TODO: Make it work for all providers. // TODO: Make it work for all providers.
if !ProviderIs("gce", "gke", "aws") { if !ProviderIs("gce", "gke", "aws") {
return fmt.Errorf("unsupported provider: %s", TestContext.Provider) return fmt.Errorf("unsupported provider for RestartKubeProxy: %s", TestContext.Provider)
} }
// kubelet will restart the kube-proxy since it's running in a static pod // kubelet will restart the kube-proxy since it's running in a static pod
Logf("Killing kube-proxy on node %v", host) Logf("Killing kube-proxy on node %v", host)
@ -3932,7 +3932,7 @@ func RestartKubelet(host string) error {
// TODO: Make it work for all providers and distros. // TODO: Make it work for all providers and distros.
supportedProviders := []string{"gce", "aws", "vsphere"} supportedProviders := []string{"gce", "aws", "vsphere"}
if !ProviderIs(supportedProviders...) { if !ProviderIs(supportedProviders...) {
return fmt.Errorf("unsupported provider: %s, supported providers are: %v", TestContext.Provider, supportedProviders) return fmt.Errorf("unsupported provider for RestartKubelet: %s, supported providers are: %v", TestContext.Provider, supportedProviders)
} }
if ProviderIs("gce") && !NodeOSDistroIs("debian", "gci") { if ProviderIs("gce") && !NodeOSDistroIs("debian", "gci") {
return fmt.Errorf("unsupported node OS distro: %s", TestContext.NodeOSDistro) return fmt.Errorf("unsupported node OS distro: %s", TestContext.NodeOSDistro)
@ -3988,7 +3988,7 @@ func WaitForKubeletUp(host string) error {
func RestartApiserver(cs clientset.Interface) error { func RestartApiserver(cs clientset.Interface) error {
// TODO: Make it work for all providers. // TODO: Make it work for all providers.
if !ProviderIs("gce", "gke", "aws") { if !ProviderIs("gce", "gke", "aws") {
return fmt.Errorf("unsupported provider: %s", TestContext.Provider) return fmt.Errorf("unsupported provider for RestartApiserver: %s", TestContext.Provider)
} }
if ProviderIs("gce", "aws") { if ProviderIs("gce", "aws") {
initialRestartCount, err := getApiserverRestartCount(cs) initialRestartCount, err := getApiserverRestartCount(cs)
@ -4011,7 +4011,7 @@ func RestartApiserver(cs clientset.Interface) error {
func sshRestartMaster() error { func sshRestartMaster() error {
if !ProviderIs("gce", "aws") { if !ProviderIs("gce", "aws") {
return fmt.Errorf("unsupported provider: %s", TestContext.Provider) return fmt.Errorf("unsupported provider for sshRestartMaster: %s", TestContext.Provider)
} }
var command string var command string
if ProviderIs("gce") { if ProviderIs("gce") {
@ -4077,7 +4077,7 @@ func getApiserverRestartCount(c clientset.Interface) (int32, error) {
func RestartControllerManager() error { func RestartControllerManager() error {
// TODO: Make it work for all providers and distros. // TODO: Make it work for all providers and distros.
if !ProviderIs("gce", "aws") { if !ProviderIs("gce", "aws") {
return fmt.Errorf("unsupported provider: %s", TestContext.Provider) return fmt.Errorf("unsupported provider for RestartControllerManager: %s", TestContext.Provider)
} }
if ProviderIs("gce") && !MasterOSDistroIs("gci") { if ProviderIs("gce") && !MasterOSDistroIs("gci") {
return fmt.Errorf("unsupported master OS distro: %s", TestContext.MasterOSDistro) return fmt.Errorf("unsupported master OS distro: %s", TestContext.MasterOSDistro)