Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-07 14:55:27 +02:00
Code Issues Releases Activity

feat(nomad): remove nomad from UI EE-6060 (#10509)

Browse source
This commit is contained in:
matias-portainer 2023-10-31 15:27:20 -03:00 • committed by GitHub
parent 1140804fe9
commit 8bb5129be0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
110 changed files with 39 additions and 1813 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/portainer/filters/filters.js
View file

@ -6,7 +6,6 @@ import { Cloud } from 'lucide-react';
import Kube from '@/assets/ico/kube.svg?c';
import DockerIcon from '@/assets/ico/vendor/docker-icon.svg?c';
import MicrosoftIcon from '@/assets/ico/vendor/microsoft-icon.svg?c';
import NomadIcon from '@/assets/ico/vendor/nomad-icon.svg?c';
import { EnvironmentType } from '@/react/portainer/environments/types';
export function truncateLeftRight(text, max, left, right) {
@ -119,8 +118,6 @@ export function environmentTypeIcon(type) {
case EnvironmentType.AgentOnDocker:
case EnvironmentType.Docker:
return DockerIcon;
case EnvironmentType.EdgeAgentOnNomad:
return NomadIcon;
default:
throw new Error(`type ${type}-${EnvironmentType[type]} is not supported`);
}

7
app/portainer/views/endpoints/edit/endpoint.html
View file

@ -46,12 +46,7 @@
</span>
<div class="col-sm-12 form-section-title"> Edge agent deployment script </div>
<edge-script-form
edge-info="{ key: endpoint.EdgeKey, id: endpoint.EdgeID }"
commands="state.edgeScriptCommands"
is-nomad-token-visible="state.showNomad"
async-mode="endpoint.Edge.AsyncMode"
></edge-script-form>
<edge-script-form edge-info="{ key: endpoint.EdgeKey, id: endpoint.EdgeID }" commands="state.edgeScriptCommands" async-mode="endpoint.Edge.AsyncMode"></edge-script-form>
<edge-key-display edge-key="endpoint.EdgeKey"> </edge-key-display>
</rd-widget-body>

5
app/portainer/views/endpoints/edit/endpointController.js
View file

@ -34,8 +34,6 @@ function EndpointController(
$scope.onChangeTags = onChangeTags;
$scope.onChangeTLSConfigFormValues = onChangeTLSConfigFormValues;
const isBE = process.env.PORTAINER_EDITION === 'BE';
$scope.state = {
selectAll: false,
// displayTextFilter: false,
@ -53,10 +51,9 @@ function EndpointController(
allowCreate: Authentication.isAdmin(),
allowSelfSignedCerts: true,
showAMTInfo: false,
showNomad: isBE,
showTLSConfig: false,
edgeScriptCommands: {
linux: _.compact([commandsTabs.k8sLinux, commandsTabs.swarmLinux, commandsTabs.standaloneLinux, isBE && commandsTabs.nomadLinux]),
linux: _.compact([commandsTabs.k8sLinux, commandsTabs.swarmLinux, commandsTabs.standaloneLinux]),
win: [commandsTabs.swarmWindows, commandsTabs.standaloneWindow],
},
};