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

chore(nomad): remove Nomad code EE-7234 (#11980)
Some checks are pending
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
ci / build_manifests (push) Blocked by required conditions
/ triage (push) Waiting to run
Lint / Run linters (push) Waiting to run
Test / test-client (push) Waiting to run
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run

Browse source
This commit is contained in:
andres-portainer 2024-06-28 08:54:44 -03:00 • committed by GitHub
parent 19fa40286a
commit e1648425ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 11 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/react/edge/edge-stacks/queries/useCreateEdgeStack/createStackFromGit.ts
View file

@ -29,7 +29,7 @@ export type GitRepositoryPayload = {
filePathInRepository?: string;
/** List of identifiers of EdgeGroups */
edgeGroups: Array<EdgeGroup['Id']>;
/** Deployment type to deploy this stack. Valid values are: 0 - 'compose', 1 - 'kubernetes', 2 - 'nomad'. Compose is enabled only for docker environments, kubernetes is enabled only for kubernetes environments, nomad is enabled only for nomad environments */
/** Deployment type to deploy this stack. Valid values are: 0 - 'compose', 1 - 'kubernetes'. Compose is enabled only for docker environments, kubernetes is enabled only for kubernetes environments */
deploymentType: DeploymentType;
/** List of Registries to use for this stack */
registries?: Array<RegistryId>;

19
app/react/portainer/environments/queries/useEnvironmentList.ts
View file

@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query';
import { withError } from '@/react-tools/react-query';
import { EnvironmentStatus, EnvironmentType } from '../types';
import { EnvironmentStatus } from '../types';
import {
EnvironmentsQueryParams,
getEnvironments,
@ -82,23 +82,6 @@ export function useEnvironmentList(
async () => {
const start = (page - 1) * pageLimit + 1;
// Workaround for EE-6060: filter out Nomad results when no filter is applied.
// Remove when cleaning up API.
if (!query.types || query.types.length === 0) {
const environmentTypesArray: EnvironmentType[] = [
EnvironmentType.Docker,
EnvironmentType.AgentOnDocker,
EnvironmentType.Azure,
EnvironmentType.EdgeAgentOnDocker,
EnvironmentType.KubernetesLocal,
EnvironmentType.AgentOnKubernetes,
EnvironmentType.EdgeAgentOnKubernetes,
];
// eslint-disable-next-line no-param-reassign
query.types = environmentTypesArray;
}
return getEnvironments({
start,
limit: pageLimit,

BIN
app/react/portainer/environments/utils/nomad.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.4 KiB

3
app/react/portainer/environments/utils/nomad.svg
View file

@ -1,3 +0,0 @@
<svg width="105" height="95" viewBox="0 0 105 95" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M52.3597 3.30634L14.061 25.3999V69.6L52.3338 91.6936L90.6325 69.6V25.3999L52.3597 3.30634ZM69.4448 51.9346L59.2468 57.8231L46.9177 51.0805V65.1697L35.3392 72.5162V43.0782L44.5386 37.4529L57.2883 44.1696V29.7915L69.4448 22.4837V51.9368V51.9346Z" fill="#00CA8E"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 376 B