fix: AgentRun 源码获取统一切换 Gitea
This commit is contained in:
+16
-15
@@ -46,6 +46,7 @@ nativeDevelopment:
|
||||
value: 152.53.229.148
|
||||
runner:
|
||||
image: 127.0.0.1:5000/agentrun/agentrun-mgr-env@sha256:fd1e10dc7a81020aebdbd14f1d29d7c9a92de3e431ca52a17e722f63073bed13
|
||||
bootRepoUrl: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
serviceAccount: agentrun-nc01-v02-runner
|
||||
jobNamePrefix: agentrun-nc01-v02-l1-runner
|
||||
nodeSelector:
|
||||
@@ -318,13 +319,13 @@ controlPlane:
|
||||
passwordSourceKey: POSTGRES_PASSWORD
|
||||
gitMirror:
|
||||
namespace: devops-infra
|
||||
readService: git-mirror-http
|
||||
readDeployment: git-mirror-http
|
||||
writeService: git-mirror-write
|
||||
writeDeployment: git-mirror-write
|
||||
resourceBundleBaseUrl: http://git-mirror-http.devops-infra.svc.cluster.local:8080
|
||||
readUrl: http://git-mirror-http.devops-infra.svc.cluster.local:8080/pikasTech/agentrun.git
|
||||
writeUrl: http://git-mirror-write.devops-infra.svc.cluster.local:8080/pikasTech/agentrun.git
|
||||
readService: gitea-http
|
||||
readDeployment: gitea
|
||||
writeService: gitea-http
|
||||
writeDeployment: gitea
|
||||
resourceBundleBaseUrl: http://gitea-http.devops-infra.svc.cluster.local:3000
|
||||
readUrl: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
writeUrl: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
cachePvc: hwlab-git-mirror-cache
|
||||
cacheHostPath: null
|
||||
sshSecretName: git-mirror-github-ssh
|
||||
@@ -767,13 +768,13 @@ controlPlane:
|
||||
passwordSourceKey: POSTGRES_PASSWORD
|
||||
gitMirror:
|
||||
namespace: devops-infra
|
||||
readService: git-mirror-http
|
||||
readDeployment: git-mirror-http
|
||||
writeService: git-mirror-write
|
||||
writeDeployment: git-mirror-write
|
||||
resourceBundleBaseUrl: http://git-mirror-http.devops-infra.svc.cluster.local:8080
|
||||
readUrl: http://git-mirror-http.devops-infra.svc.cluster.local:8080/pikasTech/agentrun.git
|
||||
writeUrl: http://git-mirror-write.devops-infra.svc.cluster.local:8080/pikasTech/agentrun.git
|
||||
readService: gitea-http
|
||||
readDeployment: gitea
|
||||
writeService: gitea-http
|
||||
writeDeployment: gitea
|
||||
resourceBundleBaseUrl: http://gitea-http.devops-infra.svc.cluster.local:3000
|
||||
readUrl: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
writeUrl: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
cachePvc: hwlab-git-mirror-cache
|
||||
cacheHostPath: null
|
||||
sshSecretName: git-mirror-github-ssh
|
||||
@@ -1157,7 +1158,7 @@ controlPlane:
|
||||
path: "${gitopsPath}"
|
||||
argoNamespace: argocd
|
||||
argoApplication: "${argoApplication}"
|
||||
repoURL: http://git-mirror-http.devops-infra.svc.cluster.local:8080/pikasTech/agentrun.git
|
||||
repoURL: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
toolCredentials:
|
||||
githubPr:
|
||||
id: github-pr
|
||||
|
||||
@@ -361,12 +361,23 @@ consumers:
|
||||
variables:
|
||||
NODE: NC01
|
||||
LANE: v02
|
||||
closeoutGitOpsMirrorFlush: false
|
||||
argoBootstrap:
|
||||
project: agentrun-nc01-v02
|
||||
repoUrl: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
targetRevision: nc01-v0.2-gitops
|
||||
path: deploy/gitops/node/nc01/runtime-v02
|
||||
destinationNamespace: agentrun-v02
|
||||
automated: true
|
||||
repositoryCredential:
|
||||
secretName: argocd-repo-agentrun-nc01-v02
|
||||
username: unidesk-admin
|
||||
deliveryProvenance:
|
||||
required: true
|
||||
markerValue: admission-pac-v2:agentrun-nc01-v02
|
||||
executionServiceAccountName: agentrun-nc01-v02-tekton-runner
|
||||
gitOps:
|
||||
repoUrl: http://git-mirror-http.devops-infra.svc.cluster.local:8080/pikasTech/agentrun.git
|
||||
repoUrl: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
targetRevision: nc01-v0.2-gitops
|
||||
sourceArtifact:
|
||||
mode: embedded-pipeline-spec
|
||||
@@ -385,19 +396,23 @@ consumers:
|
||||
NODE: NC01
|
||||
LANE: release
|
||||
repositoryRef: agentrun-nc01-v02
|
||||
closeoutGitOpsMirrorFlush: false
|
||||
argoBootstrap:
|
||||
project: agentrun-nc01-release
|
||||
repoUrl: http://git-mirror-http.devops-infra.svc.cluster.local:8080/pikasTech/agentrun.git
|
||||
repoUrl: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
targetRevision: nc01-release-gitops
|
||||
path: deploy/gitops/node/nc01/runtime-release
|
||||
destinationNamespace: agentrun-release
|
||||
automated: true
|
||||
repositoryCredential:
|
||||
secretName: argocd-repo-agentrun-nc01-release
|
||||
username: unidesk-admin
|
||||
deliveryProvenance:
|
||||
required: true
|
||||
markerValue: admission-pac-v2:agentrun-nc01-release
|
||||
executionServiceAccountName: agentrun-nc01-release-tekton-runner
|
||||
gitOps:
|
||||
repoUrl: http://git-mirror-http.devops-infra.svc.cluster.local:8080/pikasTech/agentrun.git
|
||||
repoUrl: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
targetRevision: nc01-release-gitops
|
||||
sourceArtifact:
|
||||
mode: embedded-pipeline-spec
|
||||
@@ -817,7 +832,7 @@ templates:
|
||||
concurrencyLimit: 1
|
||||
params:
|
||||
git_read_url: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
git_write_url: http://git-mirror-write.devops-infra.svc.cluster.local:8080/pikasTech/agentrun.git
|
||||
git_write_url: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
source_branch: v0.2
|
||||
node: "${NODE}"
|
||||
gitops_branch: "${nodeLower}-v0.2-gitops"
|
||||
@@ -896,7 +911,7 @@ templates:
|
||||
pipelineRunPrefix: "agentrun-${nodeLower}-v02-ci"
|
||||
argoNamespace: argocd
|
||||
argoApplication: "agentrun-${nodeLower}-v02"
|
||||
closeoutGitOpsMirrorFlush: true
|
||||
closeoutGitOpsMirrorFlush: false
|
||||
agentrunRelease:
|
||||
id: "agentrun-${nodeLower}-release"
|
||||
repositoryRef: "agentrun-${nodeLower}-release"
|
||||
@@ -907,10 +922,10 @@ templates:
|
||||
pipelineRunPrefix: "agentrun-${nodeLower}-release-ci"
|
||||
argoNamespace: argocd
|
||||
argoApplication: "agentrun-${nodeLower}-release"
|
||||
closeoutGitOpsMirrorFlush: true
|
||||
closeoutGitOpsMirrorFlush: false
|
||||
params:
|
||||
git_read_url: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
git_write_url: http://git-mirror-write.devops-infra.svc.cluster.local:8080/pikasTech/agentrun.git
|
||||
git_write_url: http://gitea-http.devops-infra.svc.cluster.local:3000/mirrors/pikasTech-agentrun.git
|
||||
source_branch: release
|
||||
node: "${NODE}"
|
||||
gitops_branch: "${nodeLower}-release-gitops"
|
||||
|
||||
@@ -33,6 +33,7 @@ interface AgentRunNativeManagerSpec {
|
||||
unideskSshEndpointEnv: { name: string; value: string };
|
||||
runner: {
|
||||
image: string;
|
||||
bootRepoUrl: string;
|
||||
serviceAccount: string;
|
||||
jobNamePrefix: string;
|
||||
nodeSelector: Record<string, string>;
|
||||
@@ -175,6 +176,7 @@ function nativeEnvironment(spec: AgentRunNativeManagerSpec): NodeJS.ProcessEnv {
|
||||
AGENTRUN_INTERNAL_MGR_URL: spec.callbackBaseUrl,
|
||||
[`AGENTRUN_${spec.unideskSshEndpointEnv.name}`]: spec.unideskSshEndpointEnv.value,
|
||||
AGENTRUN_RUNNER_IMAGE: spec.runner.image,
|
||||
AGENTRUN_BOOT_REPO_URL: spec.runner.bootRepoUrl,
|
||||
AGENTRUN_RUNNER_SERVICE_ACCOUNT: spec.runner.serviceAccount,
|
||||
AGENTRUN_RUNNER_JOB_NAME_PREFIX: spec.runner.jobNamePrefix,
|
||||
AGENTRUN_RUNNER_NODE_SELECTOR_JSON: JSON.stringify(spec.runner.nodeSelector),
|
||||
@@ -276,6 +278,7 @@ function readNativeManagerSpec(): AgentRunNativeManagerSpec {
|
||||
},
|
||||
runner: {
|
||||
image: stringField(runner, "image", `${CONFIG_PATH}.nativeDevelopment.manager.runner`),
|
||||
bootRepoUrl: stringField(runner, "bootRepoUrl", `${CONFIG_PATH}.nativeDevelopment.manager.runner`),
|
||||
serviceAccount: stringField(runner, "serviceAccount", `${CONFIG_PATH}.nativeDevelopment.manager.runner`),
|
||||
jobNamePrefix: stringField(runner, "jobNamePrefix", `${CONFIG_PATH}.nativeDevelopment.manager.runner`),
|
||||
nodeSelector: stringRecordField(runner, "nodeSelector", `${CONFIG_PATH}.nativeDevelopment.manager.runner`),
|
||||
|
||||
Reference in New Issue
Block a user