Skip to content

Commit

Permalink
Get kubeconfig in e2e as early as possible (Azure#3152)
Browse files Browse the repository at this point in the history
  • Loading branch information
0xmichalis authored and acs-bot committed Jun 4, 2018
1 parent f0331ba commit ed241d6
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion test/e2e/runner/cli_provisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,12 @@ func (cli *CLIProvisioner) provision() error {
}
cli.Engine.ExpandedDefinition = csGenerated

// Both Openshift and Kubernetes deployments should have a kubeconfig available
// at this point.
if (cli.Config.IsKubernetes() || cli.Config.IsOpenShift()) && !cli.IsPrivate() {
cli.Config.SetKubeConfig()
}

// Lets start by just using the normal az group deployment cli for creating a cluster
err = cli.Account.CreateDeployment(cli.Config.Name, eng)
if err != nil {
Expand Down Expand Up @@ -184,7 +190,6 @@ func (cli *CLIProvisioner) generateName() string {
func (cli *CLIProvisioner) waitForNodes() error {
if cli.Config.IsKubernetes() || cli.Config.IsOpenShift() {
if !cli.IsPrivate() {
cli.Config.SetKubeConfig()
log.Println("Waiting on nodes to go into ready state...")
ready := node.WaitOnReady(cli.Engine.NodeCount(), 10*time.Second, cli.Config.Timeout)
if !ready {
Expand Down

0 comments on commit ed241d6

Please sign in to comment.