github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(k8s/app): remove advanced deployment panel from app details view (#4730)

pull/4774/head
LP B 2021-01-25 02:43:54 +01:00 committed by GitHub
parent 41308d570d
commit 83f4c5ec0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/kubernetes/views/applications/edit/application.html
View File

@ -7,8 +7,6 @@
<kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading> <kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
<div ng-if="ctrl.state.viewReady"> <div ng-if="ctrl.state.viewReady">
<div ng-if="ctrl.state.isAdmin" ng-include="'app/kubernetes/templates/advancedDeploymentPanel.html'"></div>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<rd-widget> <rd-widget>
@ -57,9 +55,7 @@
<tr ng-if="ctrl.application.Requests.Cpu || ctrl.application.Requests.Memory"> <tr ng-if="ctrl.application.Requests.Cpu || ctrl.application.Requests.Memory">
<td> <td>
<div>Resource reservations</div> <div>Resource reservations</div>
<div ng-if="ctrl.application.ApplicationType !== ctrl.KubernetesApplicationTypes.POD" class="text-muted small"> <div ng-if="ctrl.application.ApplicationType !== ctrl.KubernetesApplicationTypes.POD" class="text-muted small"> per instance </div>
per instance
</div>
</td> </td>
<td> <td>
<div ng-if="ctrl.application.Requests.Cpu">CPU {{ ctrl.application.Requests.Cpu | kubernetesApplicationCPUValue }}</div> <div ng-if="ctrl.application.Requests.Cpu">CPU {{ ctrl.application.Requests.Cpu | kubernetesApplicationCPUValue }}</div>

5
app/kubernetes/views/applications/edit/applicationController.js
View File

@ -1,5 +1,3 @@
require('../../../templates/advancedDeploymentPanel.html');
import angular from 'angular'; import angular from 'angular';
import * as _ from 'lodash-es'; import * as _ from 'lodash-es';
import * as JsonPatch from 'fast-json-patch'; import * as JsonPatch from 'fast-json-patch';
@ -103,7 +101,6 @@ class KubernetesApplicationController {
Notifications, Notifications,
LocalStorage, LocalStorage,
ModalService, ModalService,
Authentication,
KubernetesApplicationService, KubernetesApplicationService,
KubernetesEventService, KubernetesEventService,
KubernetesStackService, KubernetesStackService,
@ -117,7 +114,6 @@ class KubernetesApplicationController {
this.Notifications = Notifications; this.Notifications = Notifications;
this.LocalStorage = LocalStorage; this.LocalStorage = LocalStorage;
this.ModalService = ModalService; this.ModalService = ModalService;
this.Authentication = Authentication;
this.KubernetesApplicationService = KubernetesApplicationService; this.KubernetesApplicationService = KubernetesApplicationService;
this.KubernetesEventService = KubernetesEventService; this.KubernetesEventService = KubernetesEventService;
@ -339,7 +335,6 @@ class KubernetesApplicationController {
placementWarning: false, placementWarning: false,
expandedNote: false, expandedNote: false,
useIngress: false, useIngress: false,
isAdmin: this.Authentication.isAdmin(),
}; };
this.state.activeTab = this.LocalStorage.getActiveTab('application'); this.state.activeTab = this.LocalStorage.getActiveTab('application');