handle error when namespace already exsist and ignore it

Signed-off-by: hungran <26101787+hungran@users.noreply.github.com>
pipe-cd · Jul 21, 2023 · d69e425 · d69e425
1 parent 994be6a
commit d69e425
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/pkg/app/piped/platformprovider/kubernetes/applier.go b/pkg/app/piped/platformprovider/kubernetes/applier.go
@@ -63,12 +63,14 @@ func (a *applier) ApplyManifest(ctx context.Context, manifest Manifest) error {
 	if a.initErr != nil {
 		return a.initErr
 	}
+
 	if a.input.AutoCreateNamespace == true {
-		if err := a.kubectl.CreateNamespace(
+		err := a.kubectl.CreateNamespace(
 			ctx,
 			a.platformProvider.KubeConfigPath,
 			a.getNamespaceToRun(manifest.Key),
-		); err != nil {
+		)
+		if err != nil && !errors.Is(err, errReplaceAlreadyExists) {
 			return err
 		}
 	}
@@ -89,12 +91,14 @@ func (a *applier) CreateManifest(ctx context.Context, manifest Manifest) error {
 	if a.initErr != nil {
 		return a.initErr
 	}
+
 	if a.input.AutoCreateNamespace == true {
-		if err := a.kubectl.CreateNamespace(
+		err := a.kubectl.CreateNamespace(
 			ctx,
 			a.platformProvider.KubeConfigPath,
 			a.getNamespaceToRun(manifest.Key),
-		); err != nil {
+		)
+		if err != nil && !errors.Is(err, errReplaceAlreadyExists) {
 			return err
 		}
 	}

diff --git a/pkg/app/piped/platformprovider/kubernetes/kubectl.go b/pkg/app/piped/platformprovider/kubernetes/kubectl.go
@@ -28,8 +28,10 @@ import (
 )
 
 var (
-	errorReplaceNotFound = errors.New("specified resource is not found")
-	errorNotFoundLiteral = "Error from server (NotFound)"
+	errorReplaceNotFound    = errors.New("specified resource is not found")
+	errorNotFoundLiteral    = "Error from server (NotFound)"
+	errReplaceAlreadyExists = errors.New("resource already exists")
+	errAlreadyExistsLiteral = "Error from server (AlreadyExists)"
 )
 
 type Kubectl struct {
@@ -234,11 +236,8 @@ func (c *Kubectl) CreateNamespace(ctx context.Context, kubeconfig, namespace str
 	cmd := exec.CommandContext(ctx, c.execPath, args...)
 	out, err := cmd.CombinedOutput()
 
-	if strings.Contains(string(out), "(AlreadyExists)") {
-		_, err := fmt.Printf("Namespace already exists: %s", string(out))
-		if err != nil {
-			return err
-		}
+	if strings.Contains(string(out), errAlreadyExistsLiteral) {
+		return errReplaceAlreadyExists
 	}
 	if err != nil {
 		return fmt.Errorf("failed to create namespace: %s, %v", string(out), err)