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

refactor(app): remove all VMWARE_VIC related code (#3914)

pull/3879/head
xAt0mZ 2020-06-10 21:59:11 +02:00 committed by GitHub
parent b02749f877
commit 06911ad2c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/docker/helpers/infoHelper.js
View File

@ -18,11 +18,7 @@ angular.module('portainer.docker').factory('InfoHelper', [
} }
if (!info.Swarm || _.isEmpty(info.Swarm.NodeID)) { if (!info.Swarm || _.isEmpty(info.Swarm.NodeID)) {
if (info.ID === 'vSphere Integrated Containers') {
mode.provider = 'VMWARE_VIC';
} else {
mode.provider = 'DOCKER_STANDALONE'; mode.provider = 'DOCKER_STANDALONE';
}
} else { } else {
mode.provider = 'DOCKER_SWARM_MODE'; mode.provider = 'DOCKER_SWARM_MODE';
if (info.Swarm.ControlAvailable) { if (info.Swarm.ControlAvailable) {

2
app/docker/views/containers/stats/containerstats.html
View File

@ -80,7 +80,7 @@
</rd-widget> </rd-widget>
</div> </div>
<div class="col-sm-12" ng-if="applicationState.endpoint.mode.provider !== 'VMWARE_VIC'"> <div class="col-sm-12">
<container-processes-datatable <container-processes-datatable
title-text="Processes" title-text="Processes"
title-icon="fa-tasks" title-icon="fa-tasks"

3
app/docker/views/images/edit/imageController.js
View File

@ -147,10 +147,9 @@ angular.module('portainer.docker').controller('ImageController', [
function initView() { function initView() {
HttpRequestHelper.setPortainerAgentTargetHeader($transition$.params().nodeName); HttpRequestHelper.setPortainerAgentTargetHeader($transition$.params().nodeName);
var endpointProvider = $scope.applicationState.endpoint.mode.provider;
$q.all({ $q.all({
image: ImageService.image($transition$.params().id), image: ImageService.image($transition$.params().id),
history: endpointProvider !== 'VMWARE_VIC' ? ImageService.history($transition$.params().id) : [], history: ImageService.history($transition$.params().id),
}) })
.then(function success(data) { .then(function success(data) {
$scope.image = data.image; $scope.image = data.image;

3
app/docker/views/networks/edit/networkController.js
View File

@ -99,10 +99,7 @@ angular.module('portainer.docker').controller('NetworkController', [
NetworkService.network($transition$.params().id) NetworkService.network($transition$.params().id)
.then(function success(data) { .then(function success(data) {
$scope.network = data; $scope.network = data;
var endpointProvider = $scope.applicationState.endpoint.mode.provider;
if (endpointProvider !== 'VMWARE_VIC') {
getContainersInNetwork(data); getContainersInNetwork(data);
}
$scope.network.IPAM.IPV4Configs = DockerNetworkHelper.getIPV4Configs($scope.network.IPAM.Config); $scope.network.IPAM.IPV4Configs = DockerNetworkHelper.getIPV4Configs($scope.network.IPAM.Config);
$scope.network.IPAM.IPV6Configs = DockerNetworkHelper.getIPV6Configs($scope.network.IPAM.Config); $scope.network.IPAM.IPV6Configs = DockerNetworkHelper.getIPV6Configs($scope.network.IPAM.Config);
}) })

3
app/docker/views/volumes/create/createVolumeController.js
View File

@ -130,9 +130,8 @@ angular.module('portainer.docker').controller('CreateVolumeController', [
function initView() { function initView() {
var apiVersion = $scope.applicationState.endpoint.apiVersion; var apiVersion = $scope.applicationState.endpoint.apiVersion;
var endpointProvider = $scope.applicationState.endpoint.mode.provider;
PluginService.volumePlugins(apiVersion < 1.25 || endpointProvider === 'VMWARE_VIC') PluginService.volumePlugins(apiVersion < 1.25)
.then(function success(data) { .then(function success(data) {
$scope.availableVolumeDrivers = data; $scope.availableVolumeDrivers = data;
}) })

2
app/portainer/views/sidebar/sidebar.html
View File

@ -18,7 +18,7 @@
ng-if="applicationState.endpoint.mode && applicationState.endpoint.mode.provider !== 'AZURE'" ng-if="applicationState.endpoint.mode && applicationState.endpoint.mode.provider !== 'AZURE'"
endpoint-api-version="applicationState.endpoint.apiVersion" endpoint-api-version="applicationState.endpoint.apiVersion"
swarm-management="applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && applicationState.endpoint.mode.role === 'MANAGER'" swarm-management="applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && applicationState.endpoint.mode.role === 'MANAGER'"
standalone-management="applicationState.endpoint.mode.provider === 'DOCKER_STANDALONE' || applicationState.endpoint.mode.provider === 'VMWARE_VIC'" standalone-management="applicationState.endpoint.mode.provider === 'DOCKER_STANDALONE'"
admin-access="isAdmin" admin-access="isAdmin"
offline-mode="endpointState.OfflineMode" offline-mode="endpointState.OfflineMode"
></docker-sidebar-content> ></docker-sidebar-content>