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

[agent-deploy] - bug fix

Browse Source
This commit is contained in:
zeaslity
2024-04-26 15:57:28 +08:00
parent 7f4a4d877e
commit 421f53a8aa
22 changed files with 7369 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
agent-operator/deploy/OctopusDeploy.go
View File

@@ -1,12 +1,12 @@
package deploy
import (
"os"
"wdd.io/agent-common/logger"
"wdd.io/agent-operator/deploy/a_dashboard"
"wdd.io/agent-operator/deploy/a_nfs"
"wdd.io/agent-operator/deploy/b_middle"
"wdd.io/agent-operator/deploy/c_app"
"wdd.io/agent-operator/deploy/z_dep"
"wdd.io/agent-operator/image"
"wdd.io/agent-operator/real_project/zjjt"
)
var log = logger.Log
@@ -27,39 +27,64 @@ func OctopusDeploy() {
NFSServerIP: "10.100.2.121",
}
a_dashboard.K8sDashboardDeploy(common)
a_nfs.NFSDeploy(common)
a_nfs.NFSTestDeploy(common)
// pvc
b_middle.PVCDeploy(common)
// middlewares
b_middle.MidMySQlDeploy(common)
b_middle.MidRedisDeploy(common)
b_middle.MidEmqxDeploy(common)
b_middle.MidMongoDeploy(common)
b_middle.MidRabbitMQDeploy(common)
b_middle.MidRabbitMQDeploy(common)
b_middle.MidNacosDeploy(common)
configMapDeploy(common)
c_app.IngressDeploy(common)
//a_dashboard.K8sDashboardDeploy(common)
//
backendDeploy(common)
frontendDeploy(common)
c_app.SrsDeploy(common)
//a_nfs.NFSDeploy(common)
//a_nfs.NFSTestDeploy(common)
//
//// pvc
//b_middle.PVCDeploy(common)
//
//// middlewares
//b_middle.MidMySQlDeploy(common)
//b_middle.MidRedisDeploy(common)
//b_middle.MidEmqxDeploy(common)
//b_middle.MidMongoDeploy(common)
//b_middle.MidRabbitMQDeploy(common)
//b_middle.MidRabbitMQDeploy(common)
//b_middle.MidNacosDeploy(common)
//
//configMapDeploy(common)
//c_app.IngressDeploy(common)
//
//frontendImageVersionMap, backendImageVersionMap := image.FrontendBackendImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
//
//backendDeploy(common, backendImageVersionMap)
//frontendDeploy(common, frontendImageVersionMap)
c_app.SRSDeploy(common)
}
func backendDeploy(common *z_dep.CommonEnvironmentConfig) {
backendMap := map[string]string{
"cmii-admin-data": "5.2.0",
"cmii-admin-gateway": "5.2.0",
"cmii-admin-user": "5.2.0",
func CmiiAppDeploy() {
// common environment
common := &z_dep.CommonEnvironmentConfig{
WebIP: "10.100.2.121",
WebPort: "8888",
HarborIP: "10.100.2.121",
HarborPort: "8033",
Namespace: "zjjt",
TagVersion: "5.5.0",
TenantEnv: "",
MinioPublicIP: "10.100.2.116",
MinioInnerIP: "10.100.2.116",
NFSServerIP: "10.100.2.121",
}
for appName, tag := range backendMap {
frontendImageVersionMap, backendImageVersionMap := image.FrontendBackendImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
backendDeploy(common, backendImageVersionMap)
frontendDeploy(common, frontendImageVersionMap)
configMapDeploy(common)
//c_app.IngressDeploy(common)
}
func backendDeploy(common *z_dep.CommonEnvironmentConfig, backendImageVersionMap map[string]string) {
os.Remove(c_app.BackendApplyFilePath)
for appName, tag := range backendImageVersionMap {
c_app.DefaultCmiiBackendConfig.AppName = appName
c_app.DefaultCmiiBackendConfig.ImageTag = tag
c_app.DefaultCmiiBackendConfig.Replicas = "1"
@@ -67,20 +92,30 @@ func backendDeploy(common *z_dep.CommonEnvironmentConfig) {
}
}
func frontendDeploy(common *z_dep.CommonEnvironmentConfig) {
frontendMap := map[string]string{
"cmii-admin-web": "5.2.0",
}
func frontendDeploy(common *z_dep.CommonEnvironmentConfig, frontendImageVersionMap map[string]string) {
os.Remove(c_app.FrontendApplyFilePath)
for appName, tag := range frontendMap {
c_app.FrontendDefaultNginxDeploy(common)
for appName, tag := range frontendImageVersionMap {
c_app.DefaultCmiiFrontendConfig.AppName = appName
c_app.DefaultCmiiFrontendConfig.ImageTag = tag
c_app.DefaultCmiiFrontendConfig.Replicas = "1"
value, ok := c_app.FrontendShortNameMaps[appName]
if !ok {
log.ErrorF("FrontendShortNameMaps error ! not contains %s", appName)
continue
}
c_app.DefaultCmiiFrontendConfig.ShortName = value
c_app.DefaultCmiiFrontendConfig.FrontendDeploy(common)
}
}
func configMapDeploy(common *z_dep.CommonEnvironmentConfig) {
os.Remove(c_app.ConfigMapApplyFilePath)
for frontendName, shortName := range c_app.FrontendShortNameMaps {
c_app.DefaultCmiiFrontendConfig.AppName = frontendName