diff --git a/cmii_operator/CmiiK8sOperator.go b/cmii_operator/CmiiK8sOperator.go index 83971f1..38f6dd0 100644 --- a/cmii_operator/CmiiK8sOperator.go +++ b/cmii_operator/CmiiK8sOperator.go @@ -10,7 +10,9 @@ import ( ) var CmiiOperator = CmiiK8sOperator{} -var updateLogPath = "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\cmii_operator\\log\\cmii-update-log.txt" + +// var updateLogPath = "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\cmii_operator\\log\\cmii-update-log.txt" +var updateLogPath = "/home/wdd/IdeaProjects/ProjectOctopus/cmii_operator/log/cmii-update-log.txt" // FindAppNotHealthyOrRestartCountGreaterThanN 重启次数大于N的所有Deployment func FindAppNotHealthyOrRestartCountGreaterThanN(cmiiEnv string, restartCount int32) []CmiiDeploymentInterface { diff --git a/cmii_operator/CmiiK8sOperator_test.go b/cmii_operator/CmiiK8sOperator_test.go index 0acfba1..f98b369 100644 --- a/cmii_operator/CmiiK8sOperator_test.go +++ b/cmii_operator/CmiiK8sOperator_test.go @@ -67,7 +67,7 @@ func TestRestartCmiiFrontendDeployment(t *testing.T) { func TestRestartCmiiDeployment(t *testing.T) { cmiiEnv := integration - appName := "cmii-uav-device" + appName := "cmii-uav-mission" kill := CmiiOperator.DeploymentRestartByKill(cmiiEnv, appName) assert.Equal(t, kill, true, "have unhealthy pod !") diff --git a/cmii_operator/image/CmiiImageSync.go b/cmii_operator/image/CmiiImageSync.go index b7a3750..991b72d 100644 --- a/cmii_operator/image/CmiiImageSync.go +++ b/cmii_operator/image/CmiiImageSync.go @@ -62,6 +62,21 @@ func getContainerList(all bool) []types.Container { return containers } +// ListService Deprecated +func ListService() { + + serviceList, err := apiClient.ServiceList(context.TODO(), types.ServiceListOptions{ + Filters: filters.Args{}, + Status: true, + }) + if err != nil { + log.ErrorF("error is %s", err.Error()) + return + } + + utils.BeautifulPrint(serviceList) +} + func GetAll() []types.ImageSummary { list, err := apiClient.ImageList(context.TODO(), types.ImageListOptions{ diff --git a/cmii_operator/image/CmiiImageSync_test.go b/cmii_operator/image/CmiiImageSync_test.go index 4a32c70..ba972ec 100644 --- a/cmii_operator/image/CmiiImageSync_test.go +++ b/cmii_operator/image/CmiiImageSync_test.go @@ -29,6 +29,10 @@ func TestGetAllContainer(t *testing.T) { } } +func TestListService(t *testing.T) { + ListService() +} + func TestImageGetAll(t *testing.T) { imageGetAll := GetAll() diff --git a/cmii_operator/log/cmii-update-log.txt b/cmii_operator/log/cmii-update-log.txt index e6423ef..4f37361 100644 --- a/cmii_operator/log/cmii-update-log.txt +++ b/cmii_operator/log/cmii-update-log.txt @@ -111,3 +111,9 @@ 2024-03-08-15-16-14 uavcloud-demo cmii-uav-platform 5.4.0-25263 5.4.0 2024-03-11-11-20-15 zyga cmii-uav-surveillance 5.4.0 5.4.0-leaflet 2024-03-11-15-42-15 uavcloud-demo cmii-uav-platform 5.4.0 5.4.0-25263-0311 +2024-03-19-17-37-53 uavcloud-demo cmii-uav-tower 5.4.0 5.4.0-0319 +2024-03-19-17-39-21 uavcloud-demo cmii-uav-airspace 5.4.0 5.4.0-0319 +2024-03-20-09-11-35 uavcloud-demo cmii-uav-mqtthandler 5.4.0-25916-1 5.4.0-25916-032001 +2024-03-20-09-12-29 uavcloud-demo cmii-uav-industrial-portfolio 5.4.0-27348-2 5.4.0-27348-032001 +2024-03-20-09-14-23 uavcloud-demo cmii-uav-platform 5.4.0-031901 5.4.0-25263-ai-032001 +2024-03-20-09-21-51 uavcloud-demo cmii-uav-platform 5.4.0-25263-ai-032001 5.4.0-031901