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

Merge branch 'main' into local-ss

Browse Source 
# Conflicts:
#	agent-common/real_project/CmiiImageListConfig.go
#	agent-operator/CmiiK8sOperator_test.go
#	agent-operator/ImageSyncOperator_test.go
This commit is contained in:
zeaslity
2024-11-11 17:23:56 +08:00
parent d5cbaded65 f901992d92
commit bf45eeb735
53 changed files with 45813 additions and 15745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
agent-operator/CmiiDeployOperator.go
View File

@@ -6,6 +6,7 @@ import (
"path/filepath"
"runtime"
"strings"
image2 "wdd.io/agent-common/image"
"wdd.io/agent-common/utils"
agentdeploy "wdd.io/agent-deploy"
@@ -13,14 +14,14 @@ import (
"wdd.io/agent-operator/image"
)
var DeployFilePrefix = "/home/wdd/IdeaProjects/ProjectOctopus/agent-common/real_project/"
var DeployFilePrefix = "/root/wddproject/ProjectOctopus/agent-common/real_project/"
func init() {
switch runtime.GOOS {
case "linux":
DeployFilePrefix = "/home/wdd/IdeaProjects/ProjectOctopus/agent-common/real_project/"
DeployFilePrefix = "/root/wddproject/ProjectOctopus/agent-common/real_project/"
case "windows":
DeployFilePrefix = "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\agent-common\\real_project\\"
DeployFilePrefix = "C:\\Users\\wdd\\IdeaProjects\\ProjectOctopus\\agent-common\\real_project\\"
}
}

29
agent-operator/CmiiDeployOperator_test.go
View File

@@ -2,6 +2,7 @@ package main
import (
"testing"
image2 "wdd.io/agent-common/image"
"wdd.io/agent-common/real_project"
"wdd.io/agent-common/real_project/zhejianyidong_erjipingtai"
@@ -23,7 +24,12 @@ func TestCmiiEnvDeploy(t *testing.T) {
HarborIPOrCustomImagePrefix: image2.CmiiHarborPrefix,
HarborPort: "",
Namespace: deployNamespace,
TagVersion: "5.7.0",
TagVersion: "6.0.0",
TenantEnv: "",
MinioPublicIP: "",
MinioInnerIP: "127.0.0.1",
NFSServerIP: "",
ApplyFilePrefix: "",
}
CmiiEnvDeploy(cmiiDeployCommonEnv, false, deployNamespace)
@@ -86,6 +92,27 @@ func TestCmiiEnvDeploy_ZheJiangYiDongErJiPingTai(t *testing.T) {
}
func TestCmiiEnvDeploy_ZiyangTongGan(t *testing.T) {
// 资阳通感
commonEnv := &z_dep.CommonEnvironmentConfig{
WebIP: "80.192.1.46",
WebPort: "8088",
HarborIPOrCustomImagePrefix: "80.192.1.46",
HarborPort: "8033",
Namespace: "zygajg",
TagVersion: "6.0.0",
TenantEnv: "",
MinioPublicIP: "",
MinioInnerIP: "80.192.1.48",
NFSServerIP: "80.192.1.48",
ApplyFilePrefix: "/root/wddproject/ProjectOctopus/agent-common/real_project/zygajg",
}
CmiiEnvDeployOffline(commonEnv, true, real_project.Cmii600ImageList)
}
func TestCmiiEnvDeploy_JiChengCeShiHuanJing(t *testing.T) {
// 2024上线测试-集成测试环境

39
agent-operator/CmiiK8sOperator_test.go
View File

@@ -255,30 +255,29 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
//计算20:00的时间
//now := time.Now()
//
//targetTime := time.Date(now.Year(), now.Month(), now.Day(), 10, 8, 00, 0, now.Location())
//
//duration := time.Duration(0)
//
//if !now.After(targetTime) {
// // 计算到20:00的剩余时间
// duration = targetTime.Sub(now)
//} else {
// // 如果当前时间已经过了20:00，那么就跳到下一天
// //targetTime = targetTime.Add(24 * time.Hour)
//}
//
//fmt.Println(duration)
//
//// 等待到20:00
//time.Sleep(duration)
now := time.Now()
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 16, 45, 00, 0, now.Location())
duration := time.Duration(0)
if !now.After(targetTime) {
// 计算到20:00的剩余时间
duration = targetTime.Sub(now)
} else {
// 如果当前时间已经过了20:00，那么就跳到下一天
//targetTime = targetTime.Add(24 * time.Hour)
}
fmt.Println(duration)
// 等待到20:00
time.Sleep(duration)
cmiiEnv := demo
appNameTagMap := map[string]string{
"cmii-uav-industrial-portfolio": "6.0.0-31369-yunnan-092602",
//"cmii-uav-platform-pilot2-to-cloud": "6.0.0-092502",
"cmii-uav-platform-uasms": "6.0.0-110902",
}
for appName, newTag := range appNameTagMap {

2
agent-operator/ImageSyncOperator_test.go
View File

@@ -51,7 +51,7 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) {
sync := ImageSyncEntity{
DownloadCondition: &DownloadEntity{
ShouldDownloadImage: true,
ProjectName: "zhhq_6.0.0",
ProjectName: "zyga_6.0.0",
ProjectVersion: "",
CmiiNameTagList: []string{
//"cmii-uav-mqtthandler:5.4.0-bjdyt-052102",

4
agent-operator/K8sOperator.go
View File

@@ -57,8 +57,8 @@ func init() {
switch runtime.GOOS {
case "windows":
CmiiDevClusterK8sConfig = "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\agent-operator\\config\\cmii-dev-cluster.yaml"
CmiiCoreClusterK8sConfig = "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\agent-operator\\config\\cmii-core-cluster.yaml"
CmiiDevClusterK8sConfig = "C:\\Users\\wdd\\Documents\\IdeaProjects\\ProjectOctopus\\agent-operator\\config\\cmii-dev-cluster.yaml"
CmiiCoreClusterK8sConfig = "C:\\Users\\wdd\\Documents\\IdeaProjects\\ProjectOctopus\\agent-operator\\config\\cmii-core-cluster.yaml"
case "linux":
CmiiDevClusterK8sConfig = "/home/wdd/IdeaProjects/ProjectOctopus/agent-operator/config/cmii-dev-cluster.yaml"
CmiiCoreClusterK8sConfig = "/home/wdd/IdeaProjects/ProjectOctopus/agent-operator/config/cmii-core-cluster.yaml"

4
agent-operator/main.go
View File

@@ -12,8 +12,8 @@ import (
var LocalKubeConfigFile = "/root/.kube/config"
// build for offline usage
// C:\Users\wddsh\go\bin\gox.exe -osarch="linux/amd64" -output "build/agent-operator_{{.OS}}_{{.Arch}}"
// C:\Users\wddsh\go\bin\gox.exe -osarch="linux/amd64 linux/arm64" -output "build/agent-operator_{{.OS}}_{{.Arch}}"
// 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}}"
func BuildDefaultK8sOperator() {