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

[agent][deploy] - a lot

Browse Source
This commit is contained in:
zeaslity
2024-12-18 17:40:33 +08:00
parent fa0e4a0734
commit af3e058af4
22 changed files with 13418 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
agent-operator/CmiiDeployOperator.go
View File

@@ -24,7 +24,8 @@ func init() {
case "linux":
DeployFilePrefix = "/root/wddproject/ProjectOctopus/agent-common/real_project/"
case "windows":
DeployFilePrefix = "C:\\Users\\wdd\\IdeaProjects\\ProjectOctopus\\agent-common\\real_project\\"
//DeployFilePrefix = "C:\\Users\\wdd\\IdeaProjects\\ProjectOctopus\\agent-common\\real_project\\"
DeployFilePrefix = "C:\\Users\\wddsh\\Documents \\IdeaProjects\\ProjectOctopus\\agent-common\\real_project\\"
}
}

21
agent-operator/CmiiDeployOperator_test.go
View File

@@ -258,6 +258,27 @@ func TestCmiiEnvDeploy_ZhuHaiHengQing(t *testing.T) {
}
func TestCmiiEnvDeploy_ZheJiangErJiPingTai(t *testing.T) {
// 浙江二级平台扩容
commonEnv := &z_dep.CommonEnvironmentConfig{
WebIP: "111.2.224.59",
WebPort: "8088",
HarborIPOrCustomImagePrefix: "192.168.10.3",
HarborPort: "8033",
Namespace: "zjejpt",
TagVersion: "6.1.0",
TenantEnv: "",
MinioPublicIP: "192.168.10.2",
MinioInnerIP: "192.168.10.2",
NFSServerIP: "192.168.10.2",
ApplyFilePrefix: "",
}
CmiiEnvDeployOffline(commonEnv, true, real_project.Cmii611ImageList)
}
func TestCmiiEnvDeploy_JiLinYiDong(t *testing.T) {
// 吉林移动

28
agent-operator/CmiiK8sHigherOperator_test.go
View File

@@ -235,21 +235,26 @@ func TestBackupAllDeploymentFromEnv(t *testing.T) {
}
func TestBackUpAllCmiiAppImageNameFromEnv(t *testing.T) {
func TestBackUpAllCmiiAppImageNameFroEnv(t *testing.T) {
BackUpAllCmiiAppImageNameFromEnv(config.Demo)
}
func TestRestartCmiiDeployment(t *testing.T) {
cmiiEnv := config.Uavms
appName := "cmii-uav-admin-user"
cmiiEnv := config.Demo
appNameList := []string{
"cmii-uav-industrial-portfolio",
}
kill := DefaultCmiiOperator.DeploymentRestartByKill(cmiiEnv, appName)
assert.Equal(t, kill, true, "have unhealthy pod !")
for _, appName := range appNameList {
kill := DefaultCmiiOperator.DeploymentRestartByKill(cmiiEnv, appName)
assert.Equal(t, kill, true, "have unhealthy pod !")
check := DefaultCmiiOperator.DeploymentStatusCheck(cmiiEnv, appName, 180)
assert.Equal(t, check, true, "DeploymentStatusCheck failed !")
}
check := DefaultCmiiOperator.DeploymentStatusCheck(cmiiEnv, appName, 180)
assert.Equal(t, check, true, "DeploymentStatusCheck failed !")
}
func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
@@ -258,7 +263,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
now := time.Now()
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 11, 50, 00, 0, now.Location())
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 17, 46, 00, 0, now.Location())
duration := time.Duration(0)
@@ -278,9 +283,10 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
cmiiEnv := config.Demo
appNameTagMap := map[string]string{
"cmii-uas-lifecycle": "6.1.0-20241125-120601",
//"cmii-uav-industrial-portfolio": "6.1.0-20241125-120501",
//"cmii-uav-platform": "6.1.0-20241125-120202",
//"cmii-uas-lifecycle": "6.1.0-20241125-121201",
//"cmii-uav-ruoyi": "2024121102",
//"cmii-uav-platform-dispatchh5": "6.1.0",
"cmii-uav-industrial-portfolio": "6.1.0-20241125-121301",
}
for appName, newTag := range appNameTagMap {

2
agent-operator/main.go
View File

@@ -15,6 +15,8 @@ var LocalKubeConfigFile = "/root/.kube/config"
// C:\Users\wdd\go\bin\gox.exe -osarch="linux/amd64" -output "build/agent-operator_{{.OS}}_{{.Arch}}"
// C:\Users\wdd\go\bin\gox.exe -osarch="linux/amd64 linux/arm64" -output "build/agent-operator_{{.OS}}_{{.Arch}}"
// C:\Users\wddsh\go\bin\gox.exe -osarch="linux/amd64" -output "build/agent-operator_{{.OS}}_{{.Arch}}"
func BuildDefaultK8sOperator() {
// build from local LocalKubeConfigFile