chore(kompose): remove the code EE-4917 (#12003)

api/stacks/stackbuilders/k8s_file_content_builder.go

@@ -1,7 +1,6 @@
 package stackbuilders
 
 import (
-	"fmt"
 	"strconv"
 	"sync"
 
@@ -40,6 +39,7 @@ func CreateK8sStackFileContentBuilder(dataStore dataservices.DataStore,
 
 func (b *K8sStackFileContentBuilder) SetGeneralInfo(payload *StackPayload, endpoint *portainer.Endpoint) FileContentMethodStackBuildProcess {
 	b.FileContentMethodStackBuilder.SetGeneralInfo(payload, endpoint)
+
 	return b
 }
 
@@ -47,13 +47,14 @@ func (b *K8sStackFileContentBuilder) SetUniqueInfo(payload *StackPayload) FileCo
 	if b.hasError() {
 		return b
 	}
+
 	b.stack.Name = payload.StackName
 	b.stack.Type = portainer.KubernetesStack
 	b.stack.EntryPoint = filesystem.ManifestFileDefaultName
 	b.stack.Namespace = payload.Namespace
 	b.stack.CreatedBy = b.User.Username
-	b.stack.IsComposeFormat = payload.ComposeFormat
 	b.stack.FromAppTemplate = payload.FromAppTemplate
+
 	return b
 }
 
@@ -65,14 +66,11 @@ func (b *K8sStackFileContentBuilder) SetFileContent(payload *StackPayload) FileC
 	stackFolder := strconv.Itoa(int(b.stack.ID))
 	projectPath, err := b.fileService.StoreStackFileFromBytes(stackFolder, b.stack.EntryPoint, []byte(payload.StackFileContent))
 	if err != nil {
-		fileType := "Manifest"
-		if b.stack.IsComposeFormat {
-			fileType = "Compose"
-		}
-		errMsg := fmt.Sprintf("Unable to persist Kubernetes %s file on disk", fileType)
-		b.err = httperror.InternalServerError(errMsg, err)
+		b.err = httperror.InternalServerError("Unable to persist Kubernetes Manifest file on disk", err)
+
 		return b
 	}
+
 	b.stack.ProjectPath = projectPath
 
 	return b
@@ -96,6 +94,7 @@ func (b *K8sStackFileContentBuilder) Deploy(payload *StackPayload, endpoint *por
 	k8sDeploymentConfig, err := deployments.CreateKubernetesStackDeploymentConfig(b.stack, b.KuberneteDeployer, k8sAppLabel, b.User, endpoint)
 	if err != nil {
 		b.err = httperror.InternalServerError("failed to create temp kub deployment files", err)
+
 		return b
 	}
 

api/stacks/stackbuilders/k8s_git_builder.go

@@ -42,6 +42,7 @@ func CreateKubernetesStackGitBuilder(dataStore dataservices.DataStore,
 
 func (b *KubernetesStackGitBuilder) SetGeneralInfo(payload *StackPayload, endpoint *portainer.Endpoint) GitMethodStackBuildProcess {
 	b.GitMethodStackBuilder.SetGeneralInfo(payload, endpoint)
+
 	return b
 }
 
@@ -55,12 +56,13 @@ func (b *KubernetesStackGitBuilder) SetUniqueInfo(payload *StackPayload) GitMeth
 	b.stack.Name = payload.StackName
 	b.stack.EntryPoint = payload.ManifestFile
 	b.stack.CreatedBy = b.user.Username
-	b.stack.IsComposeFormat = payload.ComposeFormat
+
 	return b
 }
 
 func (b *KubernetesStackGitBuilder) SetGitRepository(payload *StackPayload) GitMethodStackBuildProcess {
 	b.GitMethodStackBuilder.SetGitRepository(payload)
+
 	return b
 }
 
@@ -92,6 +94,7 @@ func (b *KubernetesStackGitBuilder) Deploy(payload *StackPayload, endpoint *port
 
 func (b *KubernetesStackGitBuilder) SetAutoUpdate(payload *StackPayload) GitMethodStackBuildProcess {
 	b.GitMethodStackBuilder.SetAutoUpdate(payload)
+
 	return b
 }
 

api/stacks/stackbuilders/k8s_url_builder.go

@@ -40,6 +40,7 @@ func CreateKubernetesStackUrlBuilder(dataStore dataservices.DataStore,
 
 func (b *KubernetesStackUrlBuilder) SetGeneralInfo(payload *StackPayload, endpoint *portainer.Endpoint) UrlMethodStackBuildProcess {
 	b.UrlMethodStackBuilder.SetGeneralInfo(payload, endpoint)
+
 	return b
 }
 
@@ -53,7 +54,7 @@ func (b *KubernetesStackUrlBuilder) SetUniqueInfo(payload *StackPayload) UrlMeth
 	b.stack.Name = payload.StackName
 	b.stack.EntryPoint = filesystem.ManifestFileDefaultName
 	b.stack.CreatedBy = b.user.Username
-	b.stack.IsComposeFormat = payload.ComposeFormat
+
 	return b
 }
 
@@ -62,10 +63,10 @@ func (b *KubernetesStackUrlBuilder) SetURL(payload *StackPayload) UrlMethodStack
 		return b
 	}
 
-	var manifestContent []byte
 	manifestContent, err := client.Get(payload.ManifestURL, 30)
 	if err != nil {
 		b.err = httperror.InternalServerError("Unable to retrieve manifest from URL", err)
+
 		return b
 	}
 
@@ -73,6 +74,7 @@ func (b *KubernetesStackUrlBuilder) SetURL(payload *StackPayload) UrlMethodStack
 	projectPath, err := b.fileService.StoreStackFileFromBytes(stackFolder, b.stack.EntryPoint, manifestContent)
 	if err != nil {
 		b.err = httperror.InternalServerError("Unable to persist Kubernetes manifest file on disk", err)
+
 		return b
 	}
 	b.stack.ProjectPath = projectPath
@@ -98,6 +100,7 @@ func (b *KubernetesStackUrlBuilder) Deploy(payload *StackPayload, endpoint *port
 	k8sDeploymentConfig, err := deployments.CreateKubernetesStackDeploymentConfig(b.stack, b.KuberneteDeployer, k8sAppLabel, b.user, endpoint)
 	if err != nil {
 		b.err = httperror.InternalServerError("failed to create temp kub deployment files", err)
+
 		return b
 	}
 

api/stacks/stackbuilders/stack_payload.go

@@ -23,8 +23,6 @@ type StackPayload struct {
 	FromAppTemplate bool `example:"false"`
 	// Kubernetes stack name
 	StackName string
-	// Whether the kubernetes stack config file is compose format
-	ComposeFormat bool
 	// Kubernetes stack namespace
 	Namespace string
 	// Path to the k8s Stack file. Used by k8s git repository method