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(docker/network): send target nodeName when removing a network on swarm (#12001)
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:
LP B 2024-07-08 17:31:18 +02:00 • committed by GitHub
parent 85bc14e470
commit ac4b129195
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/react/docker/networks/ItemView/ItemView.tsx
View file

@ -94,7 +94,7 @@ export function ItemView() {
async function onRemoveNetworkClicked() {
deleteNetworkMutation.mutate(
{ networkId },
{ networkId, nodeName },
{
onSuccess: () => {
notifySuccess('Network successfully removed', networkId);

13
app/react/docker/networks/queries/useDeleteNetworkMutation.ts
View file

@ -9,6 +9,7 @@ import { EnvironmentId } from '@/react/portainer/environments/types';
import axios, { parseAxiosError } from '@/portainer/services/axios';
import { buildDockerProxyUrl } from '../../proxy/queries/buildDockerProxyUrl';
import { withAgentTargetHeader } from '../../proxy/queries/utils';
import { NetworkId } from '../types';
import { queryKeys } from './queryKeys';
@ -17,8 +18,8 @@ export function useDeleteNetwork(environmentId: EnvironmentId) {
const queryClient = useQueryClient();
return useMutation(
({ networkId }: { networkId: NetworkId }) =>
deleteNetwork(environmentId, networkId),
({ networkId, nodeName }: { networkId: NetworkId; nodeName?: string }) =>
deleteNetwork(environmentId, networkId, { nodeName }),
mutationOptions(
withInvalidate(queryClient, [queryKeys.base(environmentId)]),
withError('Unable to remove network')
@ -34,11 +35,15 @@ export function useDeleteNetwork(environmentId: EnvironmentId) {
*/
export async function deleteNetwork(
environmentId: EnvironmentId,
networkId: NetworkId
networkId: NetworkId,
{ nodeName }: { nodeName?: string } = {}
) {
try {
await axios.delete(
buildDockerProxyUrl(environmentId, 'networks', networkId)
buildDockerProxyUrl(environmentId, 'networks', networkId),
{
headers: { ...withAgentTargetHeader(nodeName) },
}
);
return networkId;
} catch (err) {