From 37e40159eb585f344ab895ffa6ebf67a568c49a2 Mon Sep 17 00:00:00 2001
From: Luis Davim <luis.davim@jet.com>
Date: Sat, 13 Mar 2021 00:40:35 +0000
Subject: [PATCH] fix: race condition when applying namespace quotas

Signed-off-by: Luis Davim <luis.davim@jet.com>
---
 internal/app/kube_helpers.go | 38 ++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/internal/app/kube_helpers.go b/internal/app/kube_helpers.go
index 5bfb6dac..066422d8 100644
--- a/internal/app/kube_helpers.go
+++ b/internal/app/kube_helpers.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"path"
+	"os"
 	"strings"
 	"sync"
 
@@ -119,19 +119,10 @@ spec:
 	}
 
 	definition = definition + Indent(string(d), strings.Repeat(" ", 4))
-	targetFile := path.Join(createTempDir(tempFilesDir, "tmp"), "temp-LimitRange.yaml")
-	if err := ioutil.WriteFile(targetFile, []byte(definition), 0o666); err != nil {
-		log.Fatal(err.Error())
-	}
-
-	cmd := kubectl([]string{"apply", "-f", targetFile, "-n", ns, flags.getKubeDryRunFlag("apply")}, "Creating LimitRange in namespace [ "+ns+" ]")
-	result := cmd.Exec()
 
-	if result.code != 0 {
-		log.Fatal("Failed to create LimitRange in namespace [ " + ns + " ] with error: " + result.errors)
+	if err := apply(definition, ns, "LimitRange"); err != nil {
+		log.Fatal(err.Error())
 	}
-
-	deleteFile(targetFile)
 }
 
 func setQuotas(ns string, quotas *quotas) {
@@ -163,18 +154,31 @@ spec:
 
 	definition = definition + Indent(string(d), strings.Repeat(" ", 4))
 
-	if err := ioutil.WriteFile("temp-ResourceQuota.yaml", []byte(definition), 0o666); err != nil {
+	if err := apply(definition, ns, "ResourceQuota"); err != nil {
 		log.Fatal(err.Error())
 	}
+}
 
-	cmd := kubectl([]string{"apply", "-f", "temp-ResourceQuota.yaml", "-n", ns, flags.getKubeDryRunFlag("apply")}, "Creating ResourceQuota in namespace [ "+ns+" ]")
-	result := cmd.Exec()
+func apply(definition, ns, kind string) error {
+	targetFile, err := ioutil.TempFile(tempFilesDir, kind+"-*.yaml")
+	if err != nil {
+		return err
+	}
+	defer os.Remove(targetFile.Name())
 
-	deleteFile("temp-ResourceQuota.yaml")
+	if _, err = targetFile.Write([]byte(definition)); err != nil {
+		return err
+	}
+
+	cmd := kubectl([]string{"apply", "-f", targetFile.Name(), "-n", ns, flags.getKubeDryRunFlag("apply")},
+		"Creating "+kind+" in namespace [ "+ns+" ]")
+	result := cmd.Exec()
 
 	if result.code != 0 {
-		log.Fatal("ERROR: failed to create ResourceQuota in namespace [ " + ns + " ]: " + result.errors)
+		return fmt.Errorf("ERROR: failed to create %s in namespace [ %s ]: %s", kind, ns, result.errors)
 	}
+
+	return nil
 }
 
 // createContext creates a context -connecting to a k8s cluster- in kubectl config.