Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 07:49:41 +02:00
Code Issues Releases Activity

fix(edgestack): gitops auto update issue [EE-7260] (#11965)

Browse source
This commit is contained in:
Oscar Zhou 2024-06-27 08:48:03 +12:00 • committed by GitHub
parent e828615467
commit 39bdfa4512
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ import axios, { parseAxiosError } from '@/portainer/services/axios';
import { RegistryId } from '@/react/portainer/registries/types/registry';
import { Pair } from '@/react/portainer/settings/types';
import { EdgeGroup } from '@/react/edge/edge-groups/types';
import { AutoUpdateModel } from '@/react/portainer/gitops/types';
import { AutoUpdateResponse } from '@/react/portainer/gitops/types';
import { DeploymentType, EdgeStack, StaggerConfig } from '../../types';
import { buildUrl } from '../buildUrl';
@ -42,7 +42,7 @@ export type GitRepositoryPayload = {
/** TLSSkipVerify skips SSL verification when cloning the Git repository */
tlsSkipVerify?: boolean;
/** Optional GitOps update configuration */
autoUpdate?: AutoUpdateModel;
autoUpdate: AutoUpdateResponse | null;
/** Whether the stack supports relative path volume */
supportRelativePath?: boolean;
/** Local filesystem path */

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

@ -4,6 +4,7 @@ import { EdgeGroup } from '@/react/edge/edge-groups/types';
import { RegistryId } from '@/react/portainer/registries/types/registry';
import { Pair } from '@/react/portainer/settings/types';
import {
AutoUpdateResponse,
GitFormModel,
RelativePathModel,
} from '@/react/portainer/gitops/types';
@ -70,6 +71,7 @@ export type CreateEdgeStackPayload =
payload: BasePayload & {
git: GitFormModel;
relativePathSettings?: RelativePathModel;
autoUpdate: AutoUpdateResponse | null;
};
};
@ -115,6 +117,7 @@ async function createStackAndGitCredential(
payload: BasePayload & {
git: GitFormModel;
relativePathSettings?: RelativePathModel;
autoUpdate: AutoUpdateResponse | null;
}
) {
const newGitModel = await saveGitCredentialsIfNeeded(userId, payload.git);
@ -144,6 +147,6 @@ async function createStackAndGitCredential(
payload.relativePathSettings?.PerDeviceConfigsMatchType,
perDeviceConfigsPath: payload.relativePathSettings?.PerDeviceConfigsPath,
tlsSkipVerify: newGitModel.TLSSkipVerify,
autoUpdate: newGitModel.AutoUpdate,
autoUpdate: payload.autoUpdate,
});
}