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

[Agent][Deploy] - cmii deploy template rearrange

Browse Source
This commit is contained in:
zeaslity
2024-06-18 09:52:28 +08:00
parent 51fbb2027d
commit 6b2dc33a34
46 changed files with 12655 additions and 13960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
agent-operator/CmiiK8sOperator.go
View File

@@ -7,7 +7,7 @@ import (
"time"
image2 "wdd.io/agent-common/image"
"wdd.io/agent-common/utils"
"wdd.io/agent-operator/config"
"wdd.io/agent-deploy/d_app"
)
var DefaultCmiiOperator = CmiiK8sOperator{}
@@ -194,7 +194,7 @@ func FindCmiiMiddlewarePodInterface(cmiiEnv string) (podList []CmiiPodInterface)
cmiiPodInterfaces := DefaultCmiiOperator.PodAllInterface(cmiiEnv)
for _, podInterface := range cmiiPodInterfaces {
for key := range config.CmiiMiddlewareNameMap {
for key := range d_app.CmiiMiddlewareNameMap {
if strings.Contains(podInterface.Name, key) {
podList = append(podList, podInterface)
}
@@ -205,8 +205,8 @@ func FindCmiiMiddlewarePodInterface(cmiiEnv string) (podList []CmiiPodInterface)
}
func ScaleCmiiFrontendDeploymentToDesiredReplicas(cmiiEnv string, desiredReplicas int32) (errorUpdateMap map[string]int32) {
frontMap := make(map[string]int32, len(config.CmiiFrontendAppMap))
for aooName := range config.CmiiFrontendAppMap {
frontMap := make(map[string]int32, len(d_app.CmiiFrontendAppMap))
for aooName := range d_app.CmiiFrontendAppMap {
frontMap[aooName] = desiredReplicas
}
@@ -214,8 +214,8 @@ func ScaleCmiiFrontendDeploymentToDesiredReplicas(cmiiEnv string, desiredReplica
}
func ScaleCmiiBackendDeploymentToDesiredReplicas(cmiiEnv string, desiredReplicas int32) (errorUpdateMap map[string]int32) {
backMap := make(map[string]int32, len(config.CmiiBackendAppMap))
for aooName := range config.CmiiBackendAppMap {
backMap := make(map[string]int32, len(d_app.CmiiBackendAppMap))
for aooName := range d_app.CmiiBackendAppMap {
backMap[aooName] = desiredReplicas
}
@@ -284,7 +284,7 @@ func RestartCmiiFrontendDeployment(cmiiEnv string) {
cmiiDeploymentInterfaces := DefaultCmiiOperator.DeploymentAllInterface(cmiiEnv)
for _, deploymentInterface := range cmiiDeploymentInterfaces {
_, ok := config.CmiiFrontendAppMap[deploymentInterface.Name]
_, ok := d_app.CmiiFrontendAppMap[deploymentInterface.Name]
if ok {
if !DefaultCmiiOperator.DeploymentRestart(deploymentInterface.Namespace, deploymentInterface.Name) {
log.ErrorF("[RestartCmiiFrontendDeployment] - restart of [%s] [%s] failed !", deploymentInterface.Namespace, deploymentInterface.Name)
@@ -486,7 +486,7 @@ func BackupAllCmiiDeploymentToMap(cmiiEnv string) (backendMap, frontendMap, srsM
}
// add srs part
for key, value := range config.CmiiSrsAppMap {
for key, value := range d_app.CmiiSrsAppMap {
var app *CmiiDeploymentInterface
if strings.Contains(value, "deployment") {
app = DefaultCmiiOperator.DeploymentOneInterface(cmiiEnv, key)
@@ -546,7 +546,7 @@ func BackUpAllCmiiAppImageNameFromEnv(cmiiEnv string) {
only := make(map[string]string, 150)
// front
utils.AppendContentToFile("---\n", filePath)
for key, value := range config.CmiiFrontendAppMap {
for key, value := range d_app.CmiiFrontendAppMap {
_, ok := only[key]
if !ok {
deploy := DefaultCmiiOperator.DeploymentOneInterface(cmiiEnv, key)
@@ -557,7 +557,7 @@ func BackUpAllCmiiAppImageNameFromEnv(cmiiEnv string) {
}
}
utils.AppendContentToFile("---\n", filePath)
for key, value := range config.CmiiBackendAppMap {
for key, value := range d_app.CmiiBackendAppMap {
_, ok := only[key]
if !ok {
deploy := DefaultCmiiOperator.DeploymentOneInterface(cmiiEnv, key)
@@ -570,7 +570,7 @@ func BackUpAllCmiiAppImageNameFromEnv(cmiiEnv string) {
// backend
utils.AppendContentToFile("---\n", filePath)
// gis server
for key, value := range config.CmiiGISAppMap {
for key, value := range d_app.CmiiGISAppMap {
_, ok := only[key]
if !ok {
deploy := DefaultCmiiOperator.DeploymentOneInterface(cmiiEnv, key)
@@ -582,7 +582,7 @@ func BackUpAllCmiiAppImageNameFromEnv(cmiiEnv string) {
}
// srs
utils.AppendContentToFile("---\n", filePath)
for key, value := range config.CmiiSrsAppMap {
for key, value := range d_app.CmiiSrsAppMap {
_, ok := only[key]
if !ok {
var app *CmiiDeploymentInterface
@@ -609,9 +609,9 @@ func BackUpAllCmiiAppImageNameFromEnv(cmiiEnv string) {
func FilterAllCmiiAppStrict(source []CmiiDeploymentInterface) (result []CmiiDeploymentInterface) {
for _, c := range source {
_, ok := config.CmiiBackendAppMap[c.ContainerName]
_, ok := d_app.CmiiBackendAppMap[c.ContainerName]
if !ok {
_, ok = config.CmiiFrontendAppMap[c.ContainerName]
_, ok = d_app.CmiiFrontendAppMap[c.ContainerName]
if !ok {
log.WarnF("[FilterAllCmiiAppStrict] - [%s] not cmii pod ！", c.ContainerName)
continue
@@ -663,9 +663,9 @@ func FilterAllCmiiAppSoft(source []CmiiDeploymentInterface) (result []CmiiDeploy
func FilterAllCmiiPodStrict(podList []CmiiPodInterface) (result []CmiiPodInterface) {
for _, c := range podList {
_, ok := config.CmiiBackendAppMap[c.ContainerName]
_, ok := d_app.CmiiBackendAppMap[c.ContainerName]
if !ok {
_, ok = config.CmiiFrontendAppMap[c.ContainerName]
_, ok = d_app.CmiiFrontendAppMap[c.ContainerName]
if !ok {
log.WarnF("[FilterAllCmiiPodStrict] - [%s] not cmii pod ！", c.ContainerName)
continue
@@ -735,9 +735,9 @@ func FilterAllCmiiNodeSoft(nodeList []CmiiNodeInterface) (result []CmiiNodeInter
}
func AppNameBelongsToCmiiImage(appName string) bool {
_, ok := config.CmiiBackendAppMap[appName]
_, ok := d_app.CmiiBackendAppMap[appName]
if !ok {
_, ok = config.CmiiFrontendAppMap[appName]
_, ok = d_app.CmiiFrontendAppMap[appName]
if !ok {
log.WarnF("[AppNameBelongsToCmiiImage] - [%s] not cmii app ！", appName)
return false