[Agent][Deploy] - 修改部署模板的端口

agent-operator/CmiiDeployOperator_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"testing"
 	image2 "wdd.io/agent-common/image"
+	"wdd.io/agent-common/real_project/jsntejpt"
 	"wdd.io/agent-common/real_project/zhejianyidong_erjipingtai"
 	"wdd.io/agent-deploy/z_dep"
 )
@@ -84,17 +85,17 @@ func TestCmiiEnvDeploy_JiangSuNanTong(t *testing.T) {
 
 	// 江苏南通
 	commonEnv := &z_dep.CommonEnvironmentConfig{
-		WebIP:                       "111.2.224.59",
+		WebIP:                       "10.40.51.5",
 		WebPort:                     "8088",
-		HarborIPOrCustomImagePrefix: "192.168.10.3",
+		HarborIPOrCustomImagePrefix: "10.40.51.5",
 		HarborPort:                  "8033",
-		Namespace:                   "zjyd",
+		Namespace:                   "jsntejpt",
 		TagVersion:                  "5.7.0",
-		NFSServerIP:                 "192.168.10.3",
-		MinioInnerIP:                "192.168.10.2",
+		NFSServerIP:                 "10.40.51.5",
+		MinioInnerIP:                "10.40.51.5",
 	}
 
-	CmiiEnvDeployOffline(commonEnv, true, zhejianyidong_erjipingtai.Cmii570ImageList)
+	CmiiEnvDeployOffline(commonEnv, true, jsntejpt.AllCmiiImageList)
 
 }
 

agent-operator/ImageSyncDLTU.sh

@@ -3,7 +3,7 @@
 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"
+local_gzip_path="/root/octopus_image"
 
 DockerRegisterDomain="10.40.51.5:8033" # 需要根据实际修改
 HarborAdminPass=V2ryStr@ngPss              # 需要跟第一脚本中的密码保持一致
@@ -127,16 +127,31 @@ Load_Tag_Upload(){
       print_red "bad arguments"
       ;;
     esac
-    shift # past argument or value
   done
 
 }
 
 ltu(){
-  while IFS= read -r file; do
-    [ -z "${file}" ] && continue
-    echo "read gzip file full name is $file"
-  done < "$(find $local_gzip_path -type f -name "*.tar.gz")"
+ all_file_list=$(find $local_gzip_path -type f -name "*.tar.gz")
+
+  for file in $all_file_list; do
+    echo "offline gzip file is => : $file"
+    image_full_name=$(docker load -i ${file} | head -n1 |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
+      print_green "tag image to => $DockerRegisterDomain/cmii/$app_name"
+      docker tag ${image_full_name} $DockerRegisterDomain/cmii/$app_name
+      docker push $DockerRegisterDomain/cmii/$app_name
+    fi
+  done
 }