From fd9b809b4208225d7a104e277abf77aa2c8fc1d2 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Mon, 15 Jul 2024 15:16:11 +0800 Subject: [PATCH] [Agent][Deploy] - update cmii frontend --- agent-deploy/d_app/TemplateCmiiFrontend.go | 2 +- .../d_app/TemplateIngressConfigMap.go | 37 +++++---------- agent-deploy/uavcloud-dev/k8s-frontend.yaml | 38 +++++----------- agent-deploy/z_dep/G.go | 8 ---- agent-go/server-env.yaml | 1 + agent-operator/CmiiDeployOperator_test.go | 4 ++ agent-operator/CmiiK8sOperator_test.go | 7 ++- agent-operator/image/HarborOperator_test.go | 45 ++++++++++++++++--- agent-operator/log/cmii-update-log.txt | 11 +++++ 9 files changed, 82 insertions(+), 71 deletions(-) diff --git a/agent-deploy/d_app/TemplateCmiiFrontend.go b/agent-deploy/d_app/TemplateCmiiFrontend.go index a7e5260..2d47e5f 100755 --- a/agent-deploy/d_app/TemplateCmiiFrontend.go +++ b/agent-deploy/d_app/TemplateCmiiFrontend.go @@ -54,7 +54,7 @@ spec: memory: 500Mi volumeMounts: - name: nginx-conf - mountPath: /usr/local/nginx/conf/nginx.conf + mountPath: /etc/nginx/conf.d/nginx.conf subPath: nginx.conf - name: tenant-prefix subPath: ingress-config.js diff --git a/agent-deploy/d_app/TemplateIngressConfigMap.go b/agent-deploy/d_app/TemplateIngressConfigMap.go index c4a07e9..dd5fe40 100755 --- a/agent-deploy/d_app/TemplateIngressConfigMap.go +++ b/agent-deploy/d_app/TemplateIngressConfigMap.go @@ -34,34 +34,19 @@ metadata: cmii.type: frontend data: nginx.conf: | - user root; - worker_processes auto; + server { + listen 9528; + server_name localhost; + gzip on; - events { - worker_connections 1024; - } - http { - include mime.types; - default_type application/octet-stream; + location / { + root /home/cmii-platform/dist; + index index.html index.htm; + } - sendfile on; - - keepalive_timeout 600; - - server { - listen 9528; - server_name localhost; - gzip on; - - location / { - root /home/cmii-platform/dist; - index index.html index.htm; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; } } ` diff --git a/agent-deploy/uavcloud-dev/k8s-frontend.yaml b/agent-deploy/uavcloud-dev/k8s-frontend.yaml index 341e626..d4af0cd 100644 --- a/agent-deploy/uavcloud-dev/k8s-frontend.yaml +++ b/agent-deploy/uavcloud-dev/k8s-frontend.yaml @@ -8,36 +8,22 @@ metadata: cmii.type: frontend data: nginx.conf: | - user root; - worker_processes auto; + server { + listen 9528; + server_name localhost; + gzip on; - events { - worker_connections 1024; - } - http { - include mime.types; - default_type application/octet-stream; + location / { + root /home/cmii-platform/dist; + index index.html index.htm; + } - sendfile on; - - keepalive_timeout 600; - - server { - listen 9528; - server_name localhost; - gzip on; - - location / { - root /home/cmii-platform/dist; - index index.html index.htm; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; } } + --- apiVersion: apps/v1 kind: Deployment diff --git a/agent-deploy/z_dep/G.go b/agent-deploy/z_dep/G.go index a269b2f..ec1ce50 100755 --- a/agent-deploy/z_dep/G.go +++ b/agent-deploy/z_dep/G.go @@ -63,14 +63,6 @@ type CommonEnvironmentConfig struct { ApplyFilePrefix string } -//func (env *CommonEnvironmentConfig) CompactEnv() { -// -// copySameFields(env, c_app.DefaultCmiiBackendConfig) -// copySameFields(env, c_app.DefaultCmiiFrontendConfig) -//} -// -// - func (env *CommonEnvironmentConfig) ValidateAndUniform() bool { validate := validator.New() err := validate.Struct(env) diff --git a/agent-go/server-env.yaml b/agent-go/server-env.yaml index 1260e45..316bef9 100755 --- a/agent-go/server-env.yaml +++ b/agent-go/server-env.yaml @@ -13,6 +13,7 @@ diskTotal: "914.9 GB" diskUsage: "12.3 GB" archInfo: "x86_64 (64 Bit)" osInfo: " + Ubuntu 20.04.5 LTS" osKernelInfo: "5.4.0-135-generic" tcpControl: "bbr " diff --git a/agent-operator/CmiiDeployOperator_test.go b/agent-operator/CmiiDeployOperator_test.go index 033f3f8..e98d7d2 100755 --- a/agent-operator/CmiiDeployOperator_test.go +++ b/agent-operator/CmiiDeployOperator_test.go @@ -8,6 +8,10 @@ import ( func TestCmiiEnvDeploy(t *testing.T) { + // dev + // devflight + // devoperation + deployNamespace := devFlight // deploy to cmii environment diff --git a/agent-operator/CmiiK8sOperator_test.go b/agent-operator/CmiiK8sOperator_test.go index 1242f49..efb7f67 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(), 17, 35, 00, 0, now.Location()) + targetTime := time.Date(now.Year(), now.Month(), now.Day(), 10, 05, 00, 0, now.Location()) duration := time.Duration(0) @@ -277,11 +277,10 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) { appNameTagMap := map[string]string{ //"cmii-uav-platform-dispatchh5": "5.6.0-062401", //"cmii-uav-data-post-process": "5.6.0-062401", + "cmii-uav-industrial-portfolio": "5.6.0-071501", //"cmii-uav-multilink": "5.5.0", //"cmii-uav-developer": "5.6.0-062701", - "cmii-uav-platform": "5.6.0-070401", - "cmii-uav-platform-share": "5.6.0-070401", - "cmii-uav-industrial-portfolio": "5.6.0-070401", + //"cmii-uav-platform": "5.6.0-0626", } for appName, newTag := range appNameTagMap { diff --git a/agent-operator/image/HarborOperator_test.go b/agent-operator/image/HarborOperator_test.go index 49b264d..e8805fa 100755 --- a/agent-operator/image/HarborOperator_test.go +++ b/agent-operator/image/HarborOperator_test.go @@ -2,6 +2,7 @@ package image import ( "fmt" + "strings" "testing" "wdd.io/agent-common/utils" ) @@ -10,10 +11,10 @@ var DefaultHarborOperator *HarborOperator func TestHarborOperator_BuildOperator(t *testing.T) { harborOperator := &HarborOperator{ - HarborHost: "http://harbor.wdd.io", - HarborPort: "8033", - HarborUser: "", - HarborPass: "", + HarborHost: "http://harbor.cdcyy.com.cn", + HarborPort: "", + HarborUser: "rad02_drone", + HarborPass: "Drone@1234", HarborClient: nil, } @@ -32,7 +33,7 @@ func TestHarborOperator_RepoListAll(t *testing.T) { TestHarborOperator_BuildOperator(t) //repoListAll := DefaultHarborOperator.RepoListAll("ran") - repoListAll := DefaultHarborOperator.RepoListAll("rancher") + repoListAll := DefaultHarborOperator.RepoListAll("cmii") utils.BeautifulPrint(repoListAll) @@ -54,11 +55,43 @@ func TestHarborOperator_ArtifactListAll(t *testing.T) { artifactListAll := DefaultHarborOperator.ArtifactListAll("cmii", "cmii-uav-user") for _, artifact := range artifactListAll { + //if len(artifact.Tags) == 0 { + // fmt.Println(artifact.Digest) + //} for _, tag := range artifact.Tags { fmt.Println(tag.Name) } } - utils.BeautifulPrint(artifactListAll) + //utils.BeautifulPrint(artifactListAll) + +} + +func TestHarborOperator_CmiiHarborCleanUp(t *testing.T) { + TestHarborOperator_BuildOperator(t) + + //repoListAll := DefaultHarborOperator.RepoListAll("ran") + repoListAll := DefaultHarborOperator.RepoListAll("cmii") + + for _, repo := range repoListAll { + repoName := strings.TrimPrefix(repo.Name, "cmii/") + artifactListAll := DefaultHarborOperator.ArtifactListAll("cmii", repoName) + + for _, artifact := range artifactListAll { + //if len(artifact.Tags) == 0 { + // fmt.Println(artifact.Digest) + //} + for _, tag := range artifact.Tags { + if strings.Contains(tag.Name, "snapshot") || strings.Contains(tag.Name, "validation") || strings.Contains(tag.Name, "beta") || strings.Contains(tag.Name, "staging") || strings.Contains(tag.Name, "test") { + fmt.Println(tag.Name) + fmt.Println(artifact.Digest) + fmt.Println() + DefaultHarborOperator.ArtifactDeleteOne("cmii", repoName, artifact.Digest) + } + } + } + } + + //utils.BeautifulPrint(artifactListAll) } diff --git a/agent-operator/log/cmii-update-log.txt b/agent-operator/log/cmii-update-log.txt index 561674e..c11623e 100755 --- a/agent-operator/log/cmii-update-log.txt +++ b/agent-operator/log/cmii-update-log.txt @@ -91,6 +91,17 @@ 2024-07-01-18-12-13 uavcloud-demo cmii-uav-platform 5.6.0-0626 5.6.0-070101 2024-07-01-18-19-57 uavcloud-demo cmii-uav-platform 5.6.0-070101 5.6.0-0626 2024-07-03-11-37-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-sense-070103 5.6.0-070301 +2024-07-11-11-33-03 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-sense-071001 5.6.0-071101 +2024-07-11-11-38-04 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071101 5.6.0-sense-071001 +2024-07-11-11-39-40 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-sense-071001 5.6.0-071101 +2024-07-11-11-44-41 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071101 5.6.0-sense-071001 +2024-07-11-14-08-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-sense-071001 5.6.0-071102 2024-07-04-17-35-00 uavcloud-demo cmii-uav-platform-share 5.6.0-0704 5.6.0-070401 2024-07-04-17-35-06 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-070301 5.6.0-070401 2024-07-04-17-36-38 uavcloud-demo cmii-uav-platform 5.6.0-070203 5.6.0-070401 +2024-07-11-16-14-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071102 5.6.0-071103 +2024-07-11-16-39-40 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071103 5.6.0-071104 +2024-07-11-17-08-31 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071104 5.6.0-071105 +2024-07-12-09-14-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071106 5.6.0-071201 +2024-07-12-11-40-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071201 5.6.0-071202 +2024-07-15-10-05-51 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071206 5.6.0-071501