[Cmii][ImageSync] - 优化处理逻辑

agent-operator/CmiiK8sOperator.go

@@ -395,7 +395,8 @@ func BackupAllDeploymentFromEnv(cmiiEnv string) bool {
 	// must filter
 	allInterface = FilterAllCmiiAppSoft(allInterface)
 
-	filePath := "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\cmii_operator\\log\\all-" + CmiiOperator.CurrentNamespace + "-" + utils.TimeSplitFormatString() + ".txt"
+	//filePath := "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\cmii_operator\\log\\all-" + CmiiOperator.CurrentNamespace + "-" + utils.TimeSplitFormatString() + ".txt"
+	filePath := "/home/wdd/IdeaProjects/ProjectOctopus/agent-operator/log/all-" + CmiiOperator.CurrentNamespace + "-" + utils.TimeSplitFormatString() + ".txt"
 
 	log.InfoF("[BackupAllDeploymentFromEnv] - backup all image from %s => %s", CmiiOperator.CurrentNamespace, filePath)
 
@@ -493,7 +494,8 @@ func BackupAllCmiiDeploymentToMap(cmiiEnv string) (backendMap, frontendMap, srsM
 func BackUpAllCmiiAppImageNameFromEnv(cmiiEnv string) {
 
 	CmiiOperator.changeOperatorEnv(cmiiEnv)
-	filePath := "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\cmii_operator\\log\\images-" + CmiiOperator.CurrentNamespace + "-" + utils.TimeSplitFormatString() + ".txt"
+	//filePath := "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\cmii_operator\\log\\images-" + CmiiOperator.CurrentNamespace + "-" + utils.TimeSplitFormatString() + ".txt"
+	filePath := "/home/wdd/IdeaProjects/ProjectOctopus/agent-operator/log/images-" + CmiiOperator.CurrentNamespace + "-" + utils.TimeSplitFormatString() + ".txt"
 
 	only := make(map[string]string, 150)
 	// front

agent-operator/CmiiK8sOperator_test.go

@@ -211,28 +211,28 @@ func TestUpdateCmiiImageTagFromNameTagMap(t *testing.T) {
 }
 
 func TestScaleCmiiFrontendDeploymentToDesiredReplicas(t *testing.T) {
-	ScaleCmiiFrontendDeploymentToDesiredReplicas(dev, 0)
+	ScaleCmiiFrontendDeploymentToDesiredReplicas(uat, 0)
 }
 
 func TestScaleCmiiBackendDeploymentToDesiredReplicas(t *testing.T) {
-	ScaleCmiiBackendDeploymentToDesiredReplicas(dev, 0)
+	ScaleCmiiBackendDeploymentToDesiredReplicas(uat, 0)
 }
 
 func TestBackupAllDeploymentFromEnv(t *testing.T) {
 
-	BackupAllDeploymentFromEnv(demo)
+	BackupAllDeploymentFromEnv(integration)
 
 }
 
 func TestBackUpAllCmiiAppImageNameFromEnv(t *testing.T) {
 
-	BackUpAllCmiiAppImageNameFromEnv(demo)
+	BackUpAllCmiiAppImageNameFromEnv(integration)
 
 }
 
 func TestRestartCmiiDeployment(t *testing.T) {
 	cmiiEnv := integration
-	appName := "cmii-uav-device"
+	appName := "cmii-uav-platform"
 
 	kill := CmiiOperator.DeploymentRestartByKill(cmiiEnv, appName)
 	assert.Equal(t, kill, true, "have unhealthy pod !")
@@ -244,8 +244,8 @@ func TestRestartCmiiDeployment(t *testing.T) {
 func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
 
 	cmiiEnv := demo
-	appName := "cmii-uav-platform"
-	newTag := "5.4.0-031901"
+	appName := "cmii-uav-process"
+	newTag := "5.4.0-032201"
 
 	tag := UpdateCmiiDeploymentImageTag(cmiiEnv, appName, newTag)
 	assert.Equal(t, tag, true, "update image tag failed !")

agent-operator/CmiiOperator.go

@@ -19,7 +19,7 @@ const DirectPushDeployHarborHost = "36.134.71.138"
 type ImageSyncEntity struct {
 	ProjectName      string
 	ProjectVersion   string
-	DirectHarborHost string
+	DirectHarborHost string //此参数决定是否能够直连目标主机，如果有则代表直连，可以直接推送景象
 	PushToDemoMinio  bool
 }
 
@@ -32,6 +32,7 @@ type ImageSyncResult struct {
 	AllCmiiImageNameList   []string
 }
 
+// PullFromEntityAndSyncConditionally 根据ImageSyncEntity拉取特定的镜像，然后上传到特定的目标机器
 func (sync ImageSyncEntity) PullFromEntityAndSyncConditionally() (imageSyncResult ImageSyncResult) {
 
 	var realCmiiImageList []string

agent-operator/K8sOperator_test.go

@@ -75,7 +75,7 @@ func TestCmiiK8sOperator_DeploymentFizz(t *testing.T) {
 func TestCmiiK8sOperator_DeploymentScale(t *testing.T) {
 	start := time.Now()
 
-	CmiiOperator.DeploymentScale("devflight", "cmii-uav-depotautoreturn", 0)
+	CmiiOperator.DeploymentScale(demo, "cmii-uav-industrial-portfolio", 1)
 	elapsed := time.Since(start).Milliseconds()
 	fmt.Printf("执行耗时： %d ms\n", elapsed)
 
@@ -91,7 +91,7 @@ func TestCmiiK8sOperator_DeploymentUpdateTag(t *testing.T) {
 
 func TestCmiiK8sOperator_DeploymentRestart(t *testing.T) {
 
-	cmiiEnv := "int"
+	cmiiEnv := "demo"
 	appName := "cmii-uav-gis-server"
 
 	CmiiOperator.DeploymentRestart(cmiiEnv, appName)

agent-operator/image/CmiiImageSync_test.go

@@ -185,6 +185,8 @@ func TestSaveSpecificImageToGzipFile(t *testing.T) {
 		}
 
 		// image pull success
+		log.InfoF("image should have pulled successful ! => %s", imageFullName)
+
 		if !SaveToTarGZ(imageFullName, imageGzipFilePathPrefix) {
 			log.ErrorF("image save to gzip file error ! => %s", imageFullName)
 			return

agent-operator/main.go

@@ -15,7 +15,7 @@ func main() {
 
 	// build from local LocalKubeConfigFile
 	if !utils.FileExists(LocalKubeConfigFile) {
-		log.ErrorF("%s not exits! error!")
+		log.ErrorF("%s not exits! error!", LocalKubeConfigFile)
 		return
 	}