zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Agent][Deploy] - support pure hostmode

Browse Source
This commit is contained in:
zeaslity
2024-06-11 15:49:37 +08:00
parent cb3daa503a
commit 4b782328db
20 changed files with 7408 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
agent-deploy/OctopusDeploy.go
View File

@@ -65,7 +65,7 @@ func CmiiAppDeploy() {
WebIP: "36.133.201.78",
WebPort: "8888",
HarborIP: "192.168.0.14",
HarborPort: "8033",
HarborPort: "",
Namespace: "xjyd",
TagVersion: "5.5.0",
TenantEnv: "",
@@ -80,8 +80,9 @@ func CmiiAppDeploy() {
backendDeploy(common, backendImageVersionMap)
frontendDeploy(common, frontendImageVersionMap)
//utils.BeautifulPrint(frontendImageVersionMap)
configMapDeploy(common)
//configMapDeploy(common)
//c_app.IngressDeploy(common)
}
@@ -123,6 +124,7 @@ func backendDeploy(common *z_dep.CommonEnvironmentConfig, backendImageVersionMap
}
func frontendDeploy(common *z_dep.CommonEnvironmentConfig, frontendImageVersionMap map[string]string) {
os.Remove(c_app.FrontendApplyFilePath)
c_app.FrontendDefaultNginxDeploy(common)

12
agent-deploy/a_dashboard/TemplateK8SDashboard.go
View File

@@ -179,11 +179,11 @@ spec:
spec:
containers:
- name: kubernetes-dashboard
{{ if .HarborPort }}
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/dashboard:v2.0.1
{{ else }}
{{- else }}
image: {{ .HarborIP }}/cmii/dashboard:v2.0.1
{{ end }}
{{- end }}
ports:
- containerPort: 8443
protocol: TCP
@@ -264,11 +264,11 @@ spec:
spec:
containers:
- name: dashboard-metrics-scraper
{{ if .HarborPort }}
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/metrics-scraper:v1.0.4
{{ else }}
{{- else }}
image: {{ .HarborIP }}/cmii/metrics-scraper:v1.0.4
{{ end }}
{{- end }}
ports:
- containerPort: 8000
protocol: TCP

4
agent-deploy/a_nfs/TemplateNFS.go
View File

@@ -96,7 +96,11 @@ spec:
serviceAccountName: nfs-client-provisioner
containers:
- name: nfs-client-provisioner
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/nfs-subdir-external-provisioner:v4.0.2
{{- else }}
image: {{ .HarborIP }}/cmii/nfs-subdir-external-provisioner:v4.0.2
{{- end }}
volumeMounts:
- name: nfs-client-root
mountPath: /persistentvolumes

6
agent-deploy/a_nfs/TemplateNFSTest.go
View File

@@ -22,7 +22,11 @@ metadata:
spec:
containers:
- name: test-pod
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/busybox
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/busybox:latest
{{- else }}
image: {{ .HarborIP }}/cmii/busybox:latest
{{- end }}
command:
- "/bin/sh"
args:

4
agent-deploy/b_middle/CmiiEmqxTemplate.go
View File

@@ -102,7 +102,11 @@ spec:
serviceAccountName: helm-emqxs
containers:
- name: helm-emqxs
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/emqx:5.5.1
{{- else }}
image: {{ .HarborIP }}/cmii/emqx:5.5.1
{{- end }}
imagePullPolicy: Always
ports:
- name: mqtt

4
agent-deploy/b_middle/CmiiMongoTemplate.go
View File

@@ -54,7 +54,11 @@ spec:
affinity: {}
containers:
- name: helm-mongo
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/mongo:5.0
{{- else }}
image: {{ .HarborIP }}/cmii/mongo:5.0
{{- end }}
resources: {}
ports:
- containerPort: 27017

8
agent-deploy/b_middle/CmiiMySQLTemplate.go
View File

@@ -308,7 +308,11 @@ spec:
fsGroup: 1001
initContainers:
- name: change-volume-permissions
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/bitnami-shell:11-debian-11-r136
{{- else }}
image: {{ .HarborIP }}/cmii/bitnami-shell:11-debian-11-r136
{{- end }}
imagePullPolicy: "Always"
command:
- /bin/bash
@@ -322,7 +326,11 @@ spec:
mountPath: /bitnami/mysql
containers:
- name: mysql
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/mysql:8.1.0-debian-11-r42
{{- else }}
image: {{ .HarborIP }}/cmii/mysql:8.1.0-debian-11-r42
{{- end }}
imagePullPolicy: "IfNotPresent"
securityContext:
runAsUser: 1001

8
agent-deploy/b_middle/CmiiNacosTemplate.go
View File

@@ -81,10 +81,18 @@ spec:
affinity: {}
containers:
- name: nacos-server
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/nacos-server:v2.1.2
{{- else }}
image: {{ .HarborIP }}/cmii/nacos-server:v2.1.2
{{- end }}
ports:
- containerPort: 8848
name: dashboard
- containerPort: 9848
name: tcp-9848
- containerPort: 9849
name: tcp-9849
env:
- name: NACOS_AUTH_ENABLE
value: "false"

10
agent-deploy/b_middle/CmiiRabbitMQTemplate.go
View File

@@ -192,7 +192,11 @@ spec:
terminationGracePeriodSeconds: 120
initContainers:
- name: volume-permissions
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/bitnami-shell:10-debian-10-r140
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/bitnami-shell:11-debian-11-r136
{{- else }}
image: {{ .HarborIP }}/cmii/bitnami-shell:11-debian-11-r136
{{- end }}
imagePullPolicy: "Always"
command:
- /bin/bash
@@ -211,7 +215,11 @@ spec:
mountPath: /bitnami/rabbitmq/mnesia
containers:
- name: rabbitmq
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/rabbitmq:3.9.12-debian-10-r3
{{- else }}
image: {{ .HarborIP }}/cmii/rabbitmq:3.9.12-debian-10-r3
{{- end }}
imagePullPolicy: "Always"
env:
- name: BITNAMI_DEBUG

10
agent-deploy/b_middle/CmiiRedisTemplate.go
View File

@@ -353,7 +353,11 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: redis
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/redis:6.2.6-debian-10-r0
{{- else }}
image: {{ .HarborIP }}/cmii/redis:6.2.6-debian-10-r0
{{- end }}
imagePullPolicy: "Always"
securityContext:
runAsUser: 1001
@@ -487,7 +491,11 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: redis
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/redis:6.2.6-debian-10-r0
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/bitnami-shell:6.2.6-debian-10-r0
{{- else }}
image: {{ .HarborIP }}/cmii/bitnami-shell:6.2.6-debian-10-r0
{{- end }}
imagePullPolicy: "Always"
securityContext:
runAsUser: 1001

2
agent-deploy/c_app/FrontendConfigMap.go
View File

@@ -3,7 +3,7 @@ package c_app
var FrontendShortNameMaps = map[string]string{
"cmii-suav-platform-supervision": "supervision",
"cmii-suav-platform-supervisionh5": "supervisionh5",
"cmii-uav-platform": "",
"cmii-uav-platform": "pangu",
"cmii-uav-platform-ai-brain": "ai-brain",
"cmii-uav-platform-armypeople": "armypeople",
"cmii-uav-platform-base": "base",

6
agent-deploy/c_app/TemplateCmiiBackend.go
View File

@@ -40,11 +40,11 @@ spec:
- name: harborsecret
containers:
- name: {{ .AppName }}
{{ if .HarborPort }}
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/{{ .AppName }}:{{ .ImageTag }}
{{ else }}
{{- else }}
image: {{ .HarborIP }}/cmii/{{ .AppName }}:{{ .ImageTag }}
{{ end }}
{{- end }}
imagePullPolicy: Always
env:
- name: K8S_NAMESPACE

6
agent-deploy/c_app/TemplateCmiiFrontend.go
View File

@@ -30,11 +30,11 @@ spec:
- name: harborsecret
containers:
- name: {{ .AppName }}
{{ if .HarborPort }}
{{- if .HarborPort }}
image: {{ .HarborIP }}:{{ .HarborPort }}/cmii/{{ .AppName }}:{{ .ImageTag }}
{{ else }}
{{- else }}
image: {{ .HarborIP }}/cmii/{{ .AppName }}:{{ .ImageTag }}
{{ end }}
{{- end }}
imagePullPolicy: Always
env:
- name: K8S_NAMESPACE

4
agent-deploy/c_app/TemplateIngressConfigMap.go
View File

@@ -11,7 +11,11 @@ data:
var __GlobalIngressConfig = {
TenantEnvironment: "{{ .TenantEnv }}",
CloudHOST: "{{ .WebIP }}:{{ .WebPort }}",
{{- if eq .ShortName "pangu" }}
ApplicationShortName: "",
{{- else }}
ApplicationShortName: "{{ .ShortName }}",
{{- end }}
AppClientId: "{{ .ClientId }}"
}
`

5143
agent-deploy/z_bjtg/k8s-backend.yaml Normal file
View File

File diff suppressed because it is too large Load Diff

322
agent-deploy/z_bjtg/k8s-configmap.yaml Normal file
View File

@@ -0,0 +1,322 @@
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-qinghaitourism
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "qinghaitourism",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-supervisionh5
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "supervisionh5",
AppClientId: "APP_qqSu82THfexI8PLM"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-emergency
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "emergency",
AppClientId: "APP_aGsTAY1uMZrpKdfk"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-mws
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "mws",
AppClientId: "APP_uKniXPELlRERBBwK"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-oms
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "oms",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-seniclive
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "seniclive",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-media
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "media",
AppClientId: "APP_4AU8lbifESQO4FD6"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-share
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "share",
AppClientId: "APP_4lVSVI0ZGxTssir8"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-jiangsuwenlv
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "jiangsuwenlv",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-cmsportal
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "cmsportal",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-detection
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "detection",
AppClientId: "APP_FDHW2VLVDWPnnOCy"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-logistics
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "logistics",
AppClientId: "APP_PvdfRRRBPL8xbIwl"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-multiterminal
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "multiterminal",
AppClientId: "APP_PvdfRRRBPL8xbIwl"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-traffic
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "traffic",
AppClientId: "APP_Jc8i2wOQ1t73QEJS"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-security
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "security",
AppClientId: "APP_JUSEMc7afyWXxvE7"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-securityh5
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "securityh5",
AppClientId: "APP_N3ImO0Ubfu9peRHD"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-splice
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "splice",
AppClientId: "APP_zE0M3sTRXrCIJS8Y"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-supervision
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "supervision",
AppClientId: "APP_qqSu82THfexI8PLM"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-ai-brain
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "ai-brain",
AppClientId: "APP_rafnuCAmBESIVYMH"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-armypeople
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "armypeople",
AppClientId: "APP_UIegse6Lfou9pO1U"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-base
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "base",
AppClientId: "APP_9LY41OaKSqk2btY0"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-open
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "open",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-threedsimulation
namespace: xjyd
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.133.201.78:8888",
ApplicationShortName: "threedsimulation",
AppClientId: "empty"
}

1860
agent-deploy/z_bjtg/k8s-frontend.yaml Normal file
View File

File diff suppressed because it is too large Load Diff

4
agent-deploy/z_dep/G.go
View File

@@ -21,11 +21,11 @@ var log = logger.Log
func init() {
switch runtime.GOOS {
case "linux":
ApplyFilePrefix = "/home/wdd/IdeaProjects/ProjectOctopus/agent-operator/deploy/z_bjtg/"
ApplyFilePrefix = "/home/wdd/IdeaProjects/ProjectOctopus/agent-deploy/z_bjtg/"
case "darwin": // macOS
ApplyFilePrefix = "MacOS value"
case "windows":
ApplyFilePrefix = "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\agent-operator\\deploy\\z_xjyd\\"
ApplyFilePrefix = "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\agent-deploy\\z_xjyd\\"
default:
ApplyFilePrefix = "Unknown OS"
}