Merge branch 'main' into local-ss

# Conflicts:
#	agent-common/real_project/CmiiImageListConfig.go
#	agent-operator/CmiiK8sOperator_test.go
#	agent-operator/ImageSyncOperator_test.go

agent-operator/CmiiDeployOperator_test.go

@@ -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上线测试-集成测试环境