change the namespace selector behavior (#5768)
parent
6be1ff4d9c
commit
a598b2d72d
|
@ -54,9 +54,6 @@ func (payload *kubernetesStringDeploymentPayload) Validate(r *http.Request) erro
|
|||
if govalidator.IsNull(payload.StackFileContent) {
|
||||
return errors.New("Invalid stack file content")
|
||||
}
|
||||
if govalidator.IsNull(payload.Namespace) {
|
||||
return errors.New("Invalid namespace")
|
||||
}
|
||||
if govalidator.IsNull(payload.StackName) {
|
||||
return errors.New("Invalid stack name")
|
||||
}
|
||||
|
@ -64,9 +61,6 @@ func (payload *kubernetesStringDeploymentPayload) Validate(r *http.Request) erro
|
|||
}
|
||||
|
||||
func (payload *kubernetesGitDeploymentPayload) Validate(r *http.Request) error {
|
||||
if govalidator.IsNull(payload.Namespace) {
|
||||
return errors.New("Invalid namespace")
|
||||
}
|
||||
if govalidator.IsNull(payload.RepositoryURL) || !govalidator.IsURL(payload.RepositoryURL) {
|
||||
return errors.New("Invalid repository URL. Must correspond to a valid URL format")
|
||||
}
|
||||
|
|
|
@ -70,6 +70,7 @@ class KubernetesDeployController {
|
|||
RepositoryFetchInterval: '5m',
|
||||
RepositoryWebhookURL: this.WebhookHelper.returnStackWebhookUrl(uuidv4()),
|
||||
};
|
||||
|
||||
this.ManifestDeployTypes = KubernetesDeployManifestTypes;
|
||||
this.BuildMethods = KubernetesDeployBuildMethods;
|
||||
this.endpointId = this.EndpointProvider.endpointID();
|
||||
|
@ -209,9 +210,15 @@ class KubernetesDeployController {
|
|||
throw new PortainerError('Unable to determine build method');
|
||||
}
|
||||
|
||||
let deployNamespace = '';
|
||||
|
||||
if (this.formValues.Namespace !== 'default') {
|
||||
deployNamespace = this.formValues.Namespace;
|
||||
}
|
||||
|
||||
const payload = {
|
||||
ComposeFormat: composeFormat,
|
||||
Namespace: this.formValues.Namespace,
|
||||
Namespace: deployNamespace,
|
||||
StackName: this.formValues.StackName,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue