Fix #2129: Cluster addon fails on apply after timeout

IBM-Cloud · Dec 22, 2020 · 8171f02 · 8171f02
1 parent caa64b8
commit 8171f02
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/ibm/resource_ibm_container_addons.go b/ibm/resource_ibm_container_addons.go
@@ -129,7 +129,7 @@ func resourceIBMContainerAddOnsCreate(d *schema.ResourceData, meta interface{})
 	}
 	payload.Enable = true
 	_, err = addOnAPI.ConfigureAddons(cluster, &payload, targetEnv)
-	if err != nil {
+	if err != nil && !strings.Contains(err.Error(), "Request failed with status code: 409") {
 		return err
 	}
 	_, err = waitForContainerAddOns(d, meta, cluster, schema.TimeoutCreate)
@@ -257,7 +257,7 @@ func resourceIBMContainerAddOnsUpdate(d *schema.ResourceData, meta interface{})
 					updateList.AddonsList = append(updateList.AddonsList, update)
 					updateList.Update = true
 					_, err = addOnAPI.ConfigureAddons(cluster, &updateList, targetEnv)
-					if err != nil {
+					if err != nil && !strings.Contains(err.Error(), "Request failed with status code: 409") {
 						return err
 					}
 					_, err = waitForContainerAddOns(d, meta, cluster, schema.TimeoutUpdate)
@@ -288,7 +288,7 @@ func resourceIBMContainerAddOnsUpdate(d *schema.ResourceData, meta interface{})
 			}
 			addOnParams.Enable = true
 			_, err = addOnAPI.ConfigureAddons(cluster, &addOnParams, targetEnv)
-			if err != nil {
+			if err != nil && !strings.Contains(err.Error(), "Request failed with status code: 409") {
 				return err
 			}
 			_, err = waitForContainerAddOns(d, meta, cluster, schema.TimeoutCreate)