From 88d75a704eed6562dc73a5d10a5cec14384cdf35 Mon Sep 17 00:00:00 2001
From: zeaslity <ice@qq.com>
Date: Sun, 28 Apr 2024 11:56:22 +0800
Subject: [PATCH] [agent-operator] - update cmii update function

---
 agent-operator/CmiiOperator.go                | 31 ++++++++++---------
 agent-operator/K8sOperator.go                 |  1 +
 agent-operator/image/CmiiImageSync.go         |  1 +
 agent-operator/main.go                        | 15 +++++----
 .../server/func/TestImageSyncScheduler.java   |  4 +--
 5 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/agent-operator/CmiiOperator.go b/agent-operator/CmiiOperator.go
index b7bd3f0..a441005 100644
--- a/agent-operator/CmiiOperator.go
+++ b/agent-operator/CmiiOperator.go
@@ -193,7 +193,7 @@ func DownloadLoadTagUpload(downloadFromOss bool, ossUrlPrefix, ossFileName, loca
 
 	// 支持单文件的形式
 	if !utils.IsFileOrDir(localGzipFolderOrGzipFile) {
-		// 单个压缩文件
+		// 单个压缩文件 肯定是离线的形式
 		if !strings.HasSuffix(localGzipFolderOrGzipFile, ".tar.gz") {
 			log.ErrorF("local gzip file %s is not a .tar.gz file !", localGzipFolderOrGzipFile)
 			return nil
@@ -201,22 +201,23 @@ func DownloadLoadTagUpload(downloadFromOss bool, ossUrlPrefix, ossFileName, loca
 
 		// load
 		image.LoadFromGzipFilePath(localGzipFolderOrGzipFile)
-	}
-
-	separator := os.PathSeparator
-	if !strings.HasSuffix(localGzipFolderOrGzipFile, string(separator)) {
-		localGzipFolderOrGzipFile += string(separator)
-	}
-
-	// download
-	if downloadFromOss {
-		if !parseAndDownloadFromOss(ossUrlPrefix, ossFileName, localGzipFolderOrGzipFile) {
-			log.ErrorF("download from oss error !")
-			return nil
+	} else {
+		separator := os.PathSeparator
+		if !strings.HasSuffix(localGzipFolderOrGzipFile, string(separator)) {
+			localGzipFolderOrGzipFile += string(separator)
 		}
+
+		// download
+		if downloadFromOss {
+			if !parseAndDownloadFromOss(ossUrlPrefix, ossFileName, localGzipFolderOrGzipFile) {
+				log.ErrorF("download from oss error !")
+				return nil
+			}
+		}
+
+		// load
+		loadAllGzipImageFromLocalFolder(localGzipFolderOrGzipFile)
 	}
-	// load
-	loadAllGzipImageFromLocalFolder(localGzipFolderOrGzipFile)
 
 	// tag
 	// push
diff --git a/agent-operator/K8sOperator.go b/agent-operator/K8sOperator.go
index 2522ada..d051626 100644
--- a/agent-operator/K8sOperator.go
+++ b/agent-operator/K8sOperator.go
@@ -387,6 +387,7 @@ func (op *CmiiK8sOperator) DeploymentScale(cmiiEnv, appName string, scaleCount i
 	return true
 }
 func (op *CmiiK8sOperator) DeploymentUpdateTagByImageFullName(cmiiEnv, imageFullName string) bool {
+	// todo
 
 	split := strings.Split(imageFullName, ":")
 	// harbor
diff --git a/agent-operator/image/CmiiImageSync.go b/agent-operator/image/CmiiImageSync.go
index ed62097..40bcc6b 100644
--- a/agent-operator/image/CmiiImageSync.go
+++ b/agent-operator/image/CmiiImageSync.go
@@ -211,6 +211,7 @@ func UploadToHarbor(targetImageName string) (uploadOK bool) {
 	fmt.Println()
 	log.InfoF("[UploadToHarbor] - upload %s success!", targetImageName)
 	fmt.Println()
+	return true
 }
 
 // TagFromListAndPushToCHarbor 需要支持 harbor.cdcyy.cn  ip:8033  rancher/rancher:v2.5.7  nginx:latest
diff --git a/agent-operator/main.go b/agent-operator/main.go
index fc57af4..0173f05 100644
--- a/agent-operator/main.go
+++ b/agent-operator/main.go
@@ -7,7 +7,6 @@ import (
 	"os"
 	"strings"
 	"wdd.io/agent-common/utils"
-	"wdd.io/agent-operator/real_project/bgtg"
 )
 
 var LocalKubeConfigFile = "/root/.kube/config"
@@ -16,7 +15,8 @@ var LocalKubeConfigFile = "/root/.kube/config"
 // 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}}"
 
-func RealProjectRunner() {
+func BuildDefaultK8sOperator() {
+
 	// build from local LocalKubeConfigFile
 	if !utils.FileExists(LocalKubeConfigFile) {
 		log.ErrorF("%s not exits! error!", LocalKubeConfigFile)
@@ -29,18 +29,19 @@ func RealProjectRunner() {
 		return
 	}
 
-	realNamespace := "bjtg"
-
 	op := CmiiK8sOperator{}
 	op.BuildCurrentClientFromConfig(readFile)
 	DefaultCmiiOperator = op
+}
+
+func RealProjectRunner() {
 
 	// ops
 
 	// update
-	result := UpdateCmiiImageTagFromNameTagList(realNamespace, bgtg.AllCmiiImageTagList)
+	//result := UpdateCmiiImageTagFromNameTagList(realNamespace, bgtg.AllCmiiImageTagList)
 	//result := UpdateCmiiImageTagFromNameTagMap(realNamespace, xmyd.Real540ImageTagMap)
-	utils.BeautifulPrint(result)
+	//utils.BeautifulPrint(result)
 
 	//for _, imageFullName := range xmyd.AllCmiiImageTagList {
 	//	appName := image.ImageFullNameToAppName(imageFullName)
@@ -92,6 +93,8 @@ func main() {
 	flag.Parse()
 
 	if mode == "image" {
+
+		BuildDefaultK8sOperator()
 		// 堡垒机模式 的 镜像美容
 		// 初始化堡垒机模式
 		for {
diff --git a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java
index 83442a6..2c4e8a6 100644
--- a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java
+++ b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java
@@ -44,7 +44,7 @@ public class TestImageSyncScheduler {
         ArrayList<String> ImageFullNameList = new ArrayList<>(List.of(
 //                "harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0",
 //                "harbor.cdcyy.com.cn/cmii/cmii/srs:v5.0.195"
-                "harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.3.0-cqly-042601"
+                "harbor.cdcyy.com.cn/cmii/cmii-uav-developer:5.4.0-cqly-042801"
         ));
 
         Boolean downloadAndCompressOnly = false;
@@ -102,7 +102,7 @@ public class TestImageSyncScheduler {
         ));
 
         ArrayList<String> ImageFullNameList = new ArrayList<>(List.of(
-                "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.4.0-cqly-032802"
+                "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.4.0-cqly-042801"
         ));
 
         Boolean downloadAndCompressOnly = true;