fix(git): update stack name for git stacks [EE-6670] (#11217)

pull/11226/head
Prabhat Khera 2024-02-20 09:23:46 +13:00 committed by GitHub
parent ce3a1b8ba5
commit 988d4103d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 0 deletions

View File

@ -27,6 +27,8 @@ type stackGitRedployPayload struct {
Prune bool
// Force a pulling to current image with the original tag though the image is already the latest
PullImage bool `example:"false"`
StackName string
}
func (payload *stackGitRedployPayload) Validate(r *http.Request) error {
@ -136,6 +138,10 @@ func (handler *Handler) stackGitRedeploy(w http.ResponseWriter, r *http.Request)
}
}
if payload.StackName != "" {
stack.Name = payload.StackName
}
repositoryUsername := ""
repositoryPassword := ""
if payload.RepositoryAuthentication {

View File

@ -180,6 +180,7 @@
ng-if="ctrl.state.appType === ctrl.KubernetesDeploymentTypes.GIT"
stack="ctrl.stack"
namespace="ctrl.formValues.ResourcePool.Namespace.Name"
stack-name="ctrl.formValues.StackName"
></kubernetes-redeploy-app-git-form>
<!-- #endregion -->

View File

@ -126,6 +126,10 @@ class KubernetesRedeployAppGitFormController {
return;
}
if (this.stack.Name !== this.stackName) {
this.formValues.StackName = this.stackName;
}
this.state.redeployInProgress = true;
await this.StackService.updateKubeGit(this.stack.Id, this.stack.EndpointId, this.namespace, this.formValues);
this.Notifications.success('Success', 'Pulled and redeployed stack successfully');

View File

@ -7,6 +7,7 @@ const kubernetesRedeployAppGitForm = {
bindings: {
stack: '<',
namespace: '<',
stackName: '<',
},
};

View File

@ -461,6 +461,7 @@ angular.module('portainer.app').factory('StackService', [
RepositoryAuthentication: gitConfig.RepositoryAuthentication,
RepositoryUsername: gitConfig.RepositoryUsername,
RepositoryPassword: gitConfig.RepositoryPassword,
StackName: gitConfig.StackName,
}
).$promise;
}