Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-23 15:29:42 +02:00
Code Issues Releases Activity

fix(kubernetes): fix manifestFilePaths slice creation EE-4554 (#8023)

Browse source
This commit is contained in:
andres-portainer 2023-05-25 11:38:14 -03:00 • committed by GitHub
parent a2f734051c
commit bcbdb01785
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/stacks/deployments/deployment_kubernetes_config.go
View file

@ -13,7 +13,7 @@ import (
type KubernetesStackDeploymentConfig struct { type KubernetesStackDeploymentConfig struct {
stack *portainer.Stack stack *portainer.Stack
kuberneteDeployer portainer.KubernetesDeployer kubernetesDeployer portainer.KubernetesDeployer
appLabels k.KubeAppLabels appLabels k.KubeAppLabels
user *portainer.User user *portainer.User
endpoint *portainer.Endpoint endpoint *portainer.Endpoint
@ -24,7 +24,7 @@ func CreateKubernetesStackDeploymentConfig(stack *portainer.Stack, kubeDeployer
return &KubernetesStackDeploymentConfig{ return &KubernetesStackDeploymentConfig{
stack: stack, stack: stack,
kuberneteDeployer: kubeDeployer, kubernetesDeployer: kubeDeployer,
appLabels: appLabels, appLabels: appLabels,
user: user, user: user,
endpoint: endpoint, endpoint: endpoint,
@ -38,7 +38,7 @@ func (config *KubernetesStackDeploymentConfig) GetUsername() string {
func (config *KubernetesStackDeploymentConfig) Deploy() error { func (config *KubernetesStackDeploymentConfig) Deploy() error {
fileNames := stackutils.GetStackFilePaths(config.stack, false) fileNames := stackutils.GetStackFilePaths(config.stack, false)
manifestFilePaths := make([]string, len(fileNames)) manifestFilePaths := make([]string, 0, len(fileNames))
tmpDir, err := os.MkdirTemp("", "kub_deployment") tmpDir, err := os.MkdirTemp("", "kub_deployment")
if err != nil { if err != nil {
@ -55,7 +55,7 @@ func (config *KubernetesStackDeploymentConfig) Deploy() error {
} }
if config.stack.IsComposeFormat { if config.stack.IsComposeFormat {
manifestContent, err = config.kuberneteDeployer.ConvertCompose(manifestContent) manifestContent, err = config.kubernetesDeployer.ConvertCompose(manifestContent)
if err != nil { if err != nil {
return errors.Wrap(err, "failed to convert docker compose file to a kube manifest") return errors.Wrap(err, "failed to convert docker compose file to a kube manifest")
} }
@ -74,7 +74,7 @@ func (config *KubernetesStackDeploymentConfig) Deploy() error {
manifestFilePaths = append(manifestFilePaths, manifestFilePath) manifestFilePaths = append(manifestFilePaths, manifestFilePath)
} }
output, err := config.kuberneteDeployer.Deploy(config.user.ID, config.endpoint, manifestFilePaths, config.stack.Namespace) output, err := config.kubernetesDeployer.Deploy(config.user.ID, config.endpoint, manifestFilePaths, config.stack.Namespace)
if err != nil { if err != nil {
return fmt.Errorf("failed to deploy kubernete stack: %w", err) return fmt.Errorf("failed to deploy kubernete stack: %w", err)
} }