From e7383c272f8a63b94be58f27cf891f6360975d5d Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Wed, 21 Aug 2024 15:23:53 +0800
Subject: [PATCH] =?UTF-8?q?[Agent][Deploy]=20-=20ImageSyncDLTU.sh=20?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agent-operator/CmiiK8sOperator_test.go |  4 ++--
 agent-operator/ImageSyncDLTU.sh        | 30 +++++++++++++++++++++-----
 agent-operator/log/cmii-update-log.txt |  2 ++
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/agent-operator/CmiiK8sOperator_test.go b/agent-operator/CmiiK8sOperator_test.go
index 17bf2de..48fa096 100755
--- a/agent-operator/CmiiK8sOperator_test.go
+++ b/agent-operator/CmiiK8sOperator_test.go
@@ -253,7 +253,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
 	// 计算20:00的时间
 	now := time.Now()
 
-	targetTime := time.Date(now.Year(), now.Month(), now.Day(), 11, 3, 00, 0, now.Location())
+	targetTime := time.Date(now.Year(), now.Month(), now.Day(), 12, 50, 00, 0, now.Location())
 
 	duration := time.Duration(0)
 
@@ -278,7 +278,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
 		//"cmii-uav-platform-dispatchh5": "5.6.0-062401",
 		//"cmii-uav-data-post-process": "5.6.0-062401",
 		//"cmii-uav-industrial-portfolio": "5.6.0-071801",
-		"cmii-uav-industrial-portfolio": "5.7.0-31369-yunnan-082101",
+		"cmii-uav-industrial-portfolio": "5.7.0-31369-yunnan-082102",
 		//"cmii-uav-brain":     "5.5.0",
 		//"cmii-uav-platform": "5.6.0-071702",
 		//"cmii-uas-lifecycle": "5.6.0-30403-071802",
diff --git a/agent-operator/ImageSyncDLTU.sh b/agent-operator/ImageSyncDLTU.sh
index 55674e7..ed20e2e 100644
--- a/agent-operator/ImageSyncDLTU.sh
+++ b/agent-operator/ImageSyncDLTU.sh
@@ -3,8 +3,8 @@
 all_image_list_txt="all-cmii-image-list.txt"  # 需要修改版本
 gzip_image_list_txt="all-gzip-image-list.txt" # 一般不需要修改
 oss_prefix_url="https://oss.demo.uavcmlc.com/cmlc-installation"
-local_gzip_path="/root/wdd/octopus_image"
-DockerRegisterDomain="harbor.cdcyy.com.cn" # 需要根据实际修改
+local_gzip_path="/root/wdd/octopus_image_tmp"
+DockerRegisterDomain="10.250.0.100:8033" # 需要根据实际修改
 HarborAdminPass=V2ryStr@ngPss              # 需要跟第一脚本中的密码保持一致
 
 print_green() {
@@ -59,13 +59,27 @@ dltu() {
   wget "$oss_prefix_url$all_image_list_txt"
   wget "$oss_prefix_url$gzip_image_list_txt"
 
-  pulled=""
+  docker login -u admin -p ${HarborAdminPass} ${DockerRegisterDomain}
+  echo ""
   while IFS= read -r i; do
     [ -z "${i}" ] && continue
-    echo "download gzip file =>: ${i}"
+    echo "download gzip file =>: $oss_prefix_url${i}"
     if wget "$oss_prefix_url${i}" >/dev/null 2>&1; then
       echo "Gzip file download success : ${i}"
-      pulled="${pulled} ${i}"
+      image_full_name=$(docker load -i ${i} | awk -F': ' '{print $2}')
+
+      app_name=$(echo "$image_full_name" | sed 's|.*/||g')
+      echo "extract short name is $app_name"
+
+      if echo $image_full_name | grep -q "rancher"
+      then
+        print_green "tag image to => $DockerRegisterDomain/rancher/$app_name"
+        docker tag ${image_full_name} $DockerRegisterDomain/rancher/$app_name
+        docker push $DockerRegisterDomain/rancher/$app_name
+      else
+        echo ""
+      fi
+
     else
       print_red "Gzip file download FAILED : ${i}"
     fi
@@ -75,4 +89,10 @@ dltu() {
 
 }
 
+test(){
+ app_name=$(echo "nginx:latest" | sed 's|.*/||g')
+ echo "extract short name is $app_name"
+}
+
+# test
 Download_Load_Tag_Upload "rke"
diff --git a/agent-operator/log/cmii-update-log.txt b/agent-operator/log/cmii-update-log.txt
index bb53473..b090cca 100755
--- a/agent-operator/log/cmii-update-log.txt
+++ b/agent-operator/log/cmii-update-log.txt
@@ -213,3 +213,5 @@
 2024-07-19-09-54-00 uavcloud-demo  cmii-uav-platform-armypeople            5.7.0-29668-071901            5.7.0
 2024-08-20-17-36-40 uavcloud-demo  cmii-uav-industrial-portfolio           5.7.0-31369-yunnan-081901     5.7.0-31369-yunnan-082001
 2024-08-21-11-03-00 uavcloud-demo  cmii-uav-industrial-portfolio           5.7.0-31369-yunnan-082001     5.7.0-31369-yunnan-082101
+2024-08-21-14-50-50 uavcloud-demo  cmii-uav-industrial-portfolio           5.7.0-31369-yunnan-082101     5.7.0-31369-yunnan-082201
+2024-08-21-14-55-15 uavcloud-demo  cmii-uav-industrial-portfolio           5.7.0-31369-yunnan-082201     5.7.0-31369-yunnan-082102