Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

fix(k8s): fix error handling for namespace restricted user EE-1703 (#5692)

Browse source 
* fix error handler for user has no namespace access
This commit is contained in:
Richard Wei 2021-09-22 16:01:28 +12:00 • committed by GitHub
parent b876f2d17d
commit e1f725d01a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 1446 additions and 1432 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/kubernetes/views/deploy/deploy.html
View file

@ -16,12 +16,18 @@
<uib-tab-heading> <i class="fa fa-code space-right" aria-hidden="true"></i> Deploy </uib-tab-heading>
<form class="form-horizontal" style="margin-top: 20px;">
<div class="form-group">
<div class="form-group" ng-if="ctrl.formValues.Namespace">
<label for="target_node" class="col-lg-1 col-sm-2 control-label text-left">Namespace</label>
<div class="col-lg-11 col-sm-10">
<select class="form-control" ng-model="ctrl.formValues.Namespace" ng-options="namespace.Name as namespace.Name for namespace in ctrl.namespaces"></select>
</div>
</div>
<div class="form-group" ng-if="!ctrl.formValues.Namespace">
<div class="col-sm-12 small text-muted">
<i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
You do not have access to any namespace. Contact your administrator to get access to a namespace.
</div>
</div>
<div class="col-sm-12 form-section-title">
Build method

8
app/kubernetes/views/deploy/deployController.js
View file

@ -107,7 +107,9 @@ class KubernetesDeployController {
this.state.BuildMethod === KubernetesDeployBuildMethods.WEB_EDITOR && _.isEmpty(this.formValues.EditorContent) && _.isEmpty(this.formValues.Namespace);
const isURLFormInvalid = this.state.BuildMethod == KubernetesDeployBuildMethods.WEB_EDITOR.URL && _.isEmpty(this.formValues.ManifestURL);
return isGitFormInvalid || isWebEditorInvalid || isURLFormInvalid || this.state.actionInProgress;
const isNamespaceInvalid = _.isEmpty(this.formValues.Namespace);
return isGitFormInvalid || isWebEditorInvalid || isURLFormInvalid || this.state.actionInProgress || isNamespaceInvalid;
}
onChangeFormValues(values) {
@ -230,7 +232,9 @@ class KubernetesDeployController {
});
this.namespaces = namespaces;
this.formValues.Namespace = this.namespaces[0].Name;
if (this.namespaces.length > 0) {
this.formValues.Namespace = this.namespaces[0].Name;
}
} catch (err) {
this.Notifications.error('Failure', err, 'Unable to load namespaces data');
}