From ae4578c0e54043db7ad0ac23335dc9c93cd84815 Mon Sep 17 00:00:00 2001 From: Andrew Starr-Bochicchio Date: Wed, 13 May 2020 17:08:17 -0400 Subject: [PATCH] kubernetes: Fail faster on cluster create error (fixes: #434). (#435) * kubernetes: Fail faster on cluster create error (fixes: #434). * Bump k8s test version slugs. --- digitalocean/resource_digitalocean_kubernetes_cluster.go | 5 +++++ .../resource_digitalocean_kubernetes_cluster_test.go | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/digitalocean/resource_digitalocean_kubernetes_cluster.go b/digitalocean/resource_digitalocean_kubernetes_cluster.go index 75f560b3..47baa200 100644 --- a/digitalocean/resource_digitalocean_kubernetes_cluster.go +++ b/digitalocean/resource_digitalocean_kubernetes_cluster.go @@ -485,6 +485,11 @@ func waitForKubernetesClusterCreate(client *godo.Client, id string) (*godo.Kuber return cluster, nil } + if cluster.Status.State == "error" { + ticker.Stop() + return nil, fmt.Errorf(cluster.Status.Message) + } + if n > timeout { ticker.Stop() break diff --git a/digitalocean/resource_digitalocean_kubernetes_cluster_test.go b/digitalocean/resource_digitalocean_kubernetes_cluster_test.go index afff373f..84f236f0 100644 --- a/digitalocean/resource_digitalocean_kubernetes_cluster_test.go +++ b/digitalocean/resource_digitalocean_kubernetes_cluster_test.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -const testClusterVersion15 = "1.15.9-do.2" -const testClusterVersion16 = "1.16.6-do.2" +const testClusterVersion15 = "1.15.11-do.0" +const testClusterVersion16 = "1.16.8-do.0" func TestAccDigitalOceanKubernetesCluster_Basic(t *testing.T) { t.Parallel()