diff --git a/agent-go/message_pusher/publish.go b/agent-go/message_pusher/publish.go deleted file mode 100644 index 813faa7..0000000 --- a/agent-go/message_pusher/publish.go +++ /dev/null @@ -1 +0,0 @@ -package message_pusher diff --git a/cmii_operator/CmiiK8sOperator.go b/cmii_operator/CmiiK8sOperator.go index 44b2f83..cbef604 100644 --- a/cmii_operator/CmiiK8sOperator.go +++ b/cmii_operator/CmiiK8sOperator.go @@ -217,13 +217,13 @@ func RestartCmiiBackendDeployment(cmiiEnv string) { cmiiDeploymentInterfaces := CmiiOperator.DeploymentAllInterface(cmiiEnv) for _, deploymentInterface := range cmiiDeploymentInterfaces { - _, ok := CmiiBackendAppMap[deploymentInterface.Name] - if ok { + if AppNameBelongsToCmiiImage(deploymentInterface.Name) { if !CmiiOperator.DeploymentRestart(deploymentInterface.Namespace, deploymentInterface.Name) { log.ErrorF("[RestartCmiiBackendDeployment] - restart of [%s] [%s] failed !", deploymentInterface.Namespace, deploymentInterface.Name) } else { log.DebugF("[RestartCmiiBackendDeployment] - restart of [%s] [%s] success !", deploymentInterface.Namespace, deploymentInterface.Name) } + } } diff --git a/cmii_operator/CmiiK8sOperator_test.go b/cmii_operator/CmiiK8sOperator_test.go index 8198990..fb5cfff 100644 --- a/cmii_operator/CmiiK8sOperator_test.go +++ b/cmii_operator/CmiiK8sOperator_test.go @@ -6,6 +6,7 @@ import ( "time" "wdd.io/agent-go/assert" "wdd.io/agent-go/utils" + "wdd.io/cmii_operator/message_pusher" ) var CmiiDevNamespaceList = []string{ @@ -227,15 +228,18 @@ func TestUpdateCmiiImageTagFromNameTagMap(t *testing.T) { func TestUpdateCmiiDeploymentImageTag(t *testing.T) { - cmiiEnv := "test" - appName := "cmii-suav-supervision" - newTag := "5.2.0-011901" + cmiiEnv := devFlight + appName := "cmii-uav-device" + newTag := "5.4.0-26906-01" tag := UpdateCmiiDeploymentImageTag(cmiiEnv, appName, newTag) assert.Equal(t, tag, true, "update image tag failed !") utils.SplitLinePrint() - check := CmiiOperator.DeploymentStatusCheck(cmiiEnv, appName, 180) + check := CmiiOperator.DeploymentStatusCheck(cmiiEnv, appName, 300) assert.Equal(t, check, true, "deployment run failed!") + // push message + message_pusher.PushCmiiUpdateMessage(cmiiEnv, appName, newTag, check) + } diff --git a/cmii_operator/K8sOperator.go b/cmii_operator/K8sOperator.go index 34f1f64..df02e01 100644 --- a/cmii_operator/K8sOperator.go +++ b/cmii_operator/K8sOperator.go @@ -81,14 +81,8 @@ func (op *CmiiK8sOperator) changeOperatorEnv(cmiiEnv string) { // ok op.checkAndBuildCmiiK8sOperator() - - if strings.Contains(cmiiEnv, "dev") { - op.CurrentClient = op.DevClient - op.CurrentConfig = op.DevConfig - } else { - op.CurrentClient = op.CoreClient - op.CurrentConfig = op.CoreConfig - } + // first key + op.CurrentNamespace = "" if strings.Contains(cmiiEnv, "dev") { if strings.Contains(cmiiEnv, "devf") { @@ -120,13 +114,38 @@ func (op *CmiiK8sOperator) changeOperatorEnv(cmiiEnv string) { op.CurrentNamespace = uavms } + // key feature if op.CurrentNamespace == "" { - op.CurrentNamespace = dev + op.CurrentNamespace = cmiiEnv + } else { + if strings.Contains(cmiiEnv, "dev") { + op.CurrentClient = op.DevClient + op.CurrentConfig = op.DevConfig + } else { + op.CurrentClient = op.CoreClient + op.CurrentConfig = op.CoreConfig + } } log.InfoF("[k8s env] - current env is => %s", op.CurrentNamespace) } +func (op *CmiiK8sOperator) BuildCurrentClientFromConfig(realClientConfig string) { + log.InfoF("[BuildCurrentClientFromConfig] - build real k8s operator client !") + realEnvConfig, err := clientcmd.RESTConfigFromKubeConfig([]byte(realClientConfig)) + if err != nil { + msg := "[BuildCurrentClientFromConfig] - build real k8s operator error !" + log.Error(msg) + panic(msg) + } + op.CurrentConfig = realEnvConfig + op.CurrentClient, err = kubernetes.NewForConfig(realEnvConfig) + if err != nil { + panic(err.Error()) + } + +} + func (op *CmiiK8sOperator) DeploymentAll(cmiiEnv string) []v1.Deployment { op.changeOperatorEnv(cmiiEnv) diff --git a/cmii_operator/cqga/0-install_all_demand.sh b/cmii_operator/actual_project/cqga/0-install_all_demand.sh similarity index 100% rename from cmii_operator/cqga/0-install_all_demand.sh rename to cmii_operator/actual_project/cqga/0-install_all_demand.sh diff --git a/cmii_operator/cqga/1.mount_volume.sh b/cmii_operator/actual_project/cqga/1.mount_volume.sh similarity index 100% rename from cmii_operator/cqga/1.mount_volume.sh rename to cmii_operator/actual_project/cqga/1.mount_volume.sh diff --git a/cmii_operator/cqga/2-harbor-docker-compose.yaml b/cmii_operator/actual_project/cqga/2-harbor-docker-compose.yaml similarity index 100% rename from cmii_operator/cqga/2-harbor-docker-compose.yaml rename to cmii_operator/actual_project/cqga/2-harbor-docker-compose.yaml diff --git a/cmii_operator/cqga/3-rke-cluster.yml b/cmii_operator/actual_project/cqga/3-rke-cluster.yml similarity index 100% rename from cmii_operator/cqga/3-rke-cluster.yml rename to cmii_operator/actual_project/cqga/3-rke-cluster.yml diff --git a/cmii_operator/actual_project/cqga/operator.go b/cmii_operator/actual_project/cqga/operator.go new file mode 100644 index 0000000..944c2c0 --- /dev/null +++ b/cmii_operator/actual_project/cqga/operator.go @@ -0,0 +1,42 @@ +package main + +import ( + "wdd.io/agent-go/utils" + "wdd.io/cmii_operator" +) + +var realConfig = `apiVersion: v1 +clusters: +- cluster: + certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJeE1ERXhPREEyTURZeU5Gb1hEVE14TURFeE5qQTJNRFl5TkZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBS2ZNCjFjTjBNUnhUTkRGdEZxcnRIZ0RPM29SV0dicmVob3VFcDJ3VUVRbU8yRUFyZDdkMUFReTJsSm9WM0RUVmhXbUwKcUFUOFcxaWRaS0x0Wm5mNjEva3JPeDd0U2lJeU4xa1ErN3NYRUhnTjVMc01EOVlKcndpUFdFY2FXdU9HVmI1aApMWDZWOTRjN0U5UlFDOENtd09iSkRCNG45ZE8zcDVlTDJHaFRpMkNrRWt3ZkRPR0tEL1IxeUNaK0tFcDRWWlplCnpwcnUzRG5zOUNqZHVOT1VBWTZzUGxjazNvdEdIVnhnRC9IRlRjUEhNbGhvUVQ4dmNDOTZwc0FtYXZPR1BZQ0YKa3RtN0VWYkZDOHN5Q1BMT3AwWWhTWHRkbGtKaC9UWHBaM0hSUWJxSzVPNXR4K1dGL05qMGJVc202ZldSMzZWQgpKQVVscUJIeFhSTzhGTFNrVHkwQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFKeWZ2T3hHVVYvT2wybGRQNnYxeWFSTkd5RVkKWkVxTmM2Y29LSklsd0VQNUxNYzdZNGFReWorZCtVTE4zYmIrOXZsZXdHamluTHRrUW5HZ1R3Q3pKTU5ZNlNJNQo2NzJGZEtQTE85Szdpalhway9qRE9FVHJWS25aMXJBTytOUVBmSVhpcXQ3Y1RyVHlaVzdKTVl3emZNa2VlTGErCnREdmY1Rm5vQTBLN2U3a0ZXNTBpN2pXcGh4RXRMNEJpNzAwNnU4NEpqTU5weVp1MzhKMjFXZkR1RjBoU0NQREgKS0x4cnZIZ0FOYzJWU1c2L3JPaVVCQjdiV0JkcWcyQUNVRWZwN0V3UGs2S1BsdGNiNTJtdFhCU2xiQ3pRWWw4UQpmNmVGRFIrbnRjeXNGbU1FMFI3M1lNSHJwR0dGdlduSDVaTmEyVEJYdHpwN2tNNkVPREE5a2R4WkI1dz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= + server: https://192.168.11.170:16443 + name: kubernetes +contexts: +- context: + cluster: kubernetes + user: kubernetes-admin + name: kubernetes-admin@kubernetes +current-context: kubernetes-admin@kubernetes +kind: Config +preferences: {} +users: +- name: kubernetes-admin + user: + client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4ekNDQWR1Z0F3SUJBZ0lKQU9SWThQZlhadWQyTUEwR0NTcUdTSWIzRFFFQkN3VUFNQlV4RXpBUkJnTlYKQkFNVENtdDFZbVZ5Ym1WMFpYTXdIaGNOTWpJd01URTRNRFl6TmpRMFdoY05Nekl3TVRFMk1EWXpOalEwV2pBMApNUmN3RlFZRFZRUUtEQTV6ZVhOMFpXMDZiV0Z6ZEdWeWN6RVpNQmNHQTFVRUF3d1FhM1ZpWlhKdVpYUmxjeTFoClpHMXBiakNDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFPNTZ0ZG51M24rWUsxM3oKZmNlTzNiSmhBL2J0SGpoQXpvRnNObmZjeEY3dlRTZGczSUxySmVNVkFGbG50MHpUL2xacFBlU0ZUN25iL1g1Ygo4RjErSHA2dVR0b0hRVGJHR2VzbEprdkpFMjB3OGJ0Z3VrdlNmTnROOS9NNlFTWWkvTGlHeTZpd2kveGdBVUtKClFtVW1vZmhZSHNKMllFbXJCcExOVFhtenl2a2lUTlJZVC9iNlJJRzNiT3lIVm1Lc1cwQkNQNVZTTFJsLzErZlMKM0dCUUZ2UTNXdTdmVWlzMW9DSXhsc1k5V2VJUmpGOWJDbWtKNnZsT3BWbGlsTlA0cEtSSnl4aXNBNzExNENNWAprRGJvRFBXb2lxMktubzYveXI2L0xwMktsVVVSa1JhQklodEl5eXV2TldPbjhiTW90SUpCNWNOems4UkxYTm5TCklPZEtMVDhDQXdFQUFhTW5NQ1V3RGdZRFZSMFBBUUgvQkFRREFnV2dNQk1HQTFVZEpRUU1NQW9HQ0NzR0FRVUYKQndNQ01BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQ1lwVk9NemlGRUFta1A4S3B2ZWttR3laVGV3dzQreVhyUwo3TEpoWTdTR2pGY210ZldMSW9PWEhmWmZlZWNsN3M5Snh1SytPZlhqU0d0UU9jWXk0WHo5OVFWY2FRandJMEg5Cnc3aWJiYUw3M093RGZrRDMrdlNhME9ZRWZKSFlsNXErQXBnQVpLVWRWazMvZHpJSmhRR0V6L0UxcjdYTlNabDUKL1hOT3pwbzl0VHV2dDAxRlllV0RMN01DeWZGRHFTelpQdnNyWW81bDFiTE5yeEZHb1dvSTdUMlJzR205VXJyYwoyTy84R2hMYTkwZ2tLeE9JTEpYdlJCY2RrOUN4N01ROGFGVHBuSmtPMXJzVzUxMTFoTG5hNm9WRHhISlVrbjRkCmNhODFDV3R1Yk44dkpSYlFwVmkySTJ5K3ljZ3lrNTMzR21GQXNVS3dkdm5rVjNqTVJVbFYKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= + client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcGdJQkFBS0NBUUVBN25xMTJlN2VmNWdyWGZOOXg0N2RzbUVEOXUwZU9FRE9nV3cyZDl6RVh1OU5KMkRjCmd1c2w0eFVBV1dlM1ROUCtWbWs5NUlWUHVkdjlmbHZ3WFg0ZW5xNU8yZ2RCTnNZWjZ5VW1TOGtUYlREeHUyQzYKUzlKODIwMzM4enBCSmlMOHVJYkxxTENML0dBQlFvbENaU2FoK0ZnZXduWmdTYXNHa3MxTmViUEsrU0pNMUZoUAo5dnBFZ2JkczdJZFdZcXhiUUVJL2xWSXRHWC9YNTlMY1lGQVc5RGRhN3Q5U0t6V2dJakdXeGoxWjRoR01YMXNLCmFRbnErVTZsV1dLVTAvaWtwRW5MR0t3RHZYWGdJeGVRTnVnTTlhaUtyWXFlanIvS3ZyOHVuWXFWUlJHUkZvRWkKRzBqTEs2ODFZNmZ4c3lpMGdrSGx3M09UeEV0YzJkSWc1MG90UHdJREFRQUJBb0lCQVFDdTE5YldGbFNZdGNjdAoxYVJsRi9DZ3BKSlVpcHA2WWNGRmtFSUs5UmdnQmxESnl6RkE1d2hiQ2YyOGp0Y01BKzFZQzBidWNYTDNjRHZWClZiRFB5dlRHSUVQOWhBNGpDM0RiUHR4cCtkMDlWQUlYQUI3MkVqZXFUZXE1TC8rdDV6N2tSeWV2NE9oeE95NFIKU3pNYm1BeHVXS1VNcTkrQ2cxcUpiTzRkaVYwSjg5cUtidExsclFCeDFxcHNnUjNES1VhVGVNKzVpeFYyQ1Y1bApSNDV4aU43NWRrSkpaZlY2UUV5K3V2UVd0VHk4NUN3R1U2T2hjOXA4d2s0MmFrQS9qM05FTUZiTjdDaDFKbi9RCjRhNUJpMituRUE4dGVvV2FRSzdoeU5CRENWbTFsamFjaFFveGRSNGhCWVUxdkhTbkt4a0c4bDA1K1BpRTZmZFkKaUtyemhGR0JBb0dCQVBwOStKTExzZXJ6dFQ4a2VLU2FSMXBMOHB5MTQ3cmdjdEVhckxJL2ZqY1VMU3c3OUk3UAovWWhIWnhmdm9TZEZ2QTZwNy81eHFCRitaNTM5L1NKNDlLeWFOdGNJbW01UTZKSW9aRGgzWmVVS3lMKzA1YTdRCkNqMU1wZ2hKMlZDT2VPamNxd0NVQkFhcjNWSjd0cXRxRVFCQk9jMnlWU3dzbU5wclMyYmU1S3RCQW9HQkFQTzUKSG9ZVTBMK2tzdzJKUVM5ODF1ZWtrbDMzR1ZWQ2dPUFdGWThhR3VGRGt3Sm84WGk2TmhtKzh2TjlNaGg3WkYzeQpTU3E1U2RJd01pR0IvKzVJaWp1V25DbWszY2RPdGU0VFBsZHFvdjc3Q1FUUmxPNWJCekR0L1VqYVBBam5GS0FpClg4K0V6NUVXOXFSclN2ZXplZHFDRVRBVDhRWThqNk1WY0VCRW96aC9Bb0dCQUphcVRHZ25RdVdhSHF0VENZbWcKRGtqZW81Zmt3NHcwMG5xNWU2UmZFbENZdnk3N0JQY2RYVmFwOC9WdXVkVEFXZ1BMN1VGekpXOFlROFRBNzQvYgpodmVHYm5QYWhlRFNvNEM5OE1JUjl1VFVIcmxJV2xwU1ljWkxJeGFiTEs0S2MrbEVTVXE0dk04eWNwWFpPWjlTCjFkVDhab00xdjRzcGErcjhYRWNNekNmQkFvR0JBSXVuaXI4SDFHbk1CVEYvY1pPMWRDczkyUVR3MzFwRWhqaUgKWnNrZUMwTURCb3o5OTBmWFk4S3k4T0htM2pxN0VkTG5UMWVrM3BFTFB0NkdjRkZvelpUQmczQTFZVU9nYlkwagpCN2p0aU1LVXRDRkh1cEF1SnR1NXMwWDRqeWdHeVlITTBKdkhuV3lrL09WUCthQWYvblhmeTl1QndiMXlIRmcxCm82R2Y4dXNmQW9HQkFKeGlQcGdDODJPckoxazE3V3dyOFI2ZXpxR2VYb0JPRzFlOEN6ZG1UbWFrN3prWDJJelEKSTVjT3dGaTlnREhTbUVMa0dYZnRHZ01EcXF1VHVLdS9OdW9DQS94Z2FrdTQvVHplNktqbzRjc0NDTmFza3VrRQozYnhwSnU5cElYRU5tMXVuNXBZRy90QTF0V1Rtc3dnRjY1anc2RFpTQUFUTFZMSXg3RVRDR0RlOQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=` + +func main() { + k8sOperator := cmii_operator.CmiiK8sOperator{} + k8sOperator.BuildCurrentClientFromConfig(realConfig) + realNamespace := "ingress-nginx" + + // get all pods + allInterface := k8sOperator.PodAllInterface(realNamespace) + + for _, deploymentInterface := range allInterface { + utils.BeautifulPrint(deploymentInterface) + } + + // restart all backend + +} diff --git a/cmii_operator/cqga/project-info.txt b/cmii_operator/actual_project/cqga/project-info.txt similarity index 100% rename from cmii_operator/cqga/project-info.txt rename to cmii_operator/actual_project/cqga/project-info.txt diff --git a/cmii_operator/log/cmii-update-log.txt b/cmii_operator/log/cmii-update-log.txt index c3328f6..d1a7336 100644 --- a/cmii_operator/log/cmii-update-log.txt +++ b/cmii_operator/log/cmii-update-log.txt @@ -24,3 +24,6 @@ 2024-01-16-14-51-05 uavcloud-test cmii-suav-supervision 5.2.0-011603 5.2.0-011604 2024-01-17-16-13-39 uavcloud-test cmii-suav-supervision 5.2.0-011604 5.2.0-0117 2024-01-19-14-17-03 uavcloud-test cmii-suav-supervision 5.2.0-0117 5.2.0-011901 +2024-02-23-09-31-21 uavcloud-demo cmii-uav-device 5.4.0 5.4.0-26906 +2024-02-23-10-55-14 uavcloud-demo cmii-uav-device 5.4.0-26906 5.4.0-26906-01 +2024-02-23-14-32-05 uavcloud-devflight cmii-uav-device 5.2.0-validation 5.4.0-26906-01 diff --git a/agent-go/message_pusher/client.go b/cmii_operator/message_pusher/client.go similarity index 100% rename from agent-go/message_pusher/client.go rename to cmii_operator/message_pusher/client.go diff --git a/agent-go/message_pusher/client_test.go b/cmii_operator/message_pusher/client_test.go similarity index 100% rename from agent-go/message_pusher/client_test.go rename to cmii_operator/message_pusher/client_test.go diff --git a/agent-go/message_pusher/config.go b/cmii_operator/message_pusher/config.go similarity index 98% rename from agent-go/message_pusher/config.go rename to cmii_operator/message_pusher/config.go index 1d35e04..3153d4d 100644 --- a/agent-go/message_pusher/config.go +++ b/cmii_operator/message_pusher/config.go @@ -1,7 +1,7 @@ package message_pusher import ( - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "os" ) diff --git a/agent-go/message_pusher/options.go b/cmii_operator/message_pusher/options.go similarity index 100% rename from agent-go/message_pusher/options.go rename to cmii_operator/message_pusher/options.go diff --git a/cmii_operator/message_pusher/publish.go b/cmii_operator/message_pusher/publish.go new file mode 100644 index 0000000..a5d3719 --- /dev/null +++ b/cmii_operator/message_pusher/publish.go @@ -0,0 +1,27 @@ +package message_pusher + +var DefaultClientOp = NewDefaultClient() + +var CmiiUpdatePushOptions = []PublishOption{ + WithTitle("更新应用"), + WithPriority("3"), +} + +func PushCmiiUpdateMessage(cmiiEnv, appName, newTag string, updateStatus bool) { + + deployPush := DeployPush{ + Namespace: cmiiEnv, + AppName: appName, + DeployStatus: updateStatus, + ToTag: newTag, + } + + deployPush.ParseCmiiDeployTemplate() + + _, err := DefaultClientOp.PublishDefault(deployPush.ParseCmiiDeployTemplate(), CmiiUpdatePushOptions) + if err != nil { + log.ErrorF("[PushCmiiUpdateMessage] - message push error ！ %s", err.Error()) + return + } + +} diff --git a/agent-go/message_pusher/push_template.go b/cmii_operator/message_pusher/push_template.go similarity index 94% rename from agent-go/message_pusher/push_template.go rename to cmii_operator/message_pusher/push_template.go index c75ebb6..ab0f28a 100644 --- a/agent-go/message_pusher/push_template.go +++ b/cmii_operator/message_pusher/push_template.go @@ -14,6 +14,7 @@ const cmiiDeployTemplate = ` 命名空间: {{.Namespace}} 应用名称: {{.AppName}} 副本数量: {{.Replicas}} +目标版本: {{.ToTag}} ` type DeployPush struct { @@ -21,6 +22,7 @@ type DeployPush struct { AppName string Replicas string DeployStatus bool + ToTag string } func (d DeployPush) ParseCmiiDeployTemplate() bytes.Buffer { diff --git a/agent-go/message_pusher/push_template_test.go b/cmii_operator/message_pusher/push_template_test.go similarity index 61% rename from agent-go/message_pusher/push_template_test.go rename to cmii_operator/message_pusher/push_template_test.go index 664eb39..998e12c 100644 --- a/agent-go/message_pusher/push_template_test.go +++ b/cmii_operator/message_pusher/push_template_test.go @@ -1,6 +1,9 @@ package message_pusher -import "testing" +import ( + "fmt" + "testing" +) func TestDeployPush_ParseCmiiDeployTemplate(t *testing.T) { deployPush := DeployPush{ @@ -8,7 +11,10 @@ func TestDeployPush_ParseCmiiDeployTemplate(t *testing.T) { AppName: "sdasdas", Replicas: "dasdasd", DeployStatus: false, + ToTag: "5.4.0", } - deployPush.ParseCmiiDeployTemplate() + template := deployPush.ParseCmiiDeployTemplate() + + fmt.Println(template.String()) } diff --git a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java index a54b11b..cdaff0a 100644 --- a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java @@ -1,5 +1,7 @@ package io.wdd.server.func; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import io.wdd.func.auto.beans.AppFunctionEnum; import io.wdd.func.auto.beans.BaseFunctionEnum; import io.wdd.func.auto.beans.ProjectDeployContext; @@ -93,12 +95,14 @@ public class TestBaseFuncScheduler { List masterNodeProcedure = List.of( +// BaseFunctionEnum.DISABLE_SWAP, +// BaseFunctionEnum.SHUTDOWN_FIREWALL, // BaseFunctionEnum.INSTALL_DOCKER, +// BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY, // BaseFunctionEnum.INSTALL_DOCKER_COMPOSE, // BaseFunctionEnum.MODIFY_DOCKER_CONFIG, // BaseFunctionEnum.INSTALL_HARBOR -// BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY - BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE + BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY ); List agentNodeProcedure = List.of( @@ -107,12 +111,24 @@ public class TestBaseFuncScheduler { // BaseFunctionEnum.INSTALL_DOCKER, // BaseFunctionEnum.INSTALL_DOCKER_COMPOSE // BaseFunctionEnum.MODIFY_DOCKER_CONFIG - BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY +// BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY ); projectDeployContext.setMasterNodeBaseProcedure(masterNodeProcedure); projectDeployContext.setAgentNodeBaseProcedure(agentNodeProcedure); + + // log + ObjectMapper objectMapper = new ObjectMapper(); + try { + String s = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(projectDeployContext); + System.out.println(); + System.out.println(s); + System.out.println(); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + // baseFuncScheduler.runProcedure(projectDeployContext); @@ -122,17 +138,17 @@ public class TestBaseFuncScheduler { List appFunctionEnumList = List.of( // AppFunctionEnum.DEPLOY_CHRONY_SERVER, // AppFunctionEnum.DEPLOY_RKE - AppFunctionEnum.DEPLOY_K8S_DASHBOARD, - AppFunctionEnum.DEPLOY_NFS, - AppFunctionEnum.DEPLOY_TEST_NFS, - AppFunctionEnum.DEPLOY_K8S_NAMESPACE, - AppFunctionEnum.DEPLOY_K8S_PVC, - AppFunctionEnum.DEPLOY_K8S_MYSQL, - AppFunctionEnum.DEPLOY_K8S_REDIS, - AppFunctionEnum.DEPLOY_K8S_MIDDLEWARES, - AppFunctionEnum.DEPLOY_INGRESS +// AppFunctionEnum.DEPLOY_K8S_DASHBOARD +// AppFunctionEnum.DEPLOY_NFS, +// AppFunctionEnum.DEPLOY_TEST_NFS, +// AppFunctionEnum.DEPLOY_K8S_NAMESPACE, +// AppFunctionEnum.DEPLOY_K8S_PVC, +// AppFunctionEnum.DEPLOY_K8S_MYSQL, +// AppFunctionEnum.DEPLOY_K8S_REDIS, +// AppFunctionEnum.DEPLOY_K8S_MIDDLEWARES +// AppFunctionEnum.DEPLOY_INGRESS // AppFunctionEnum.DEPLOY_FRONTEND -// AppFunctionEnum.DEPLOY_BACKEND + AppFunctionEnum.DEPLOY_BACKEND // AppFunctionEnum.DEPLOY_K8S_SRS ); @@ -145,7 +161,7 @@ public class TestBaseFuncScheduler { agentNodeProcedure = List.of(BaseFunctionEnum.CHRONY_TO_MASTER); projectDeployContext.setMasterNodeBaseProcedure(masterNodeProcedure); - projectDeployContext.setAgentNodeBaseProcedure(agentNodeProcedure); +// projectDeployContext.setAgentNodeBaseProcedure(agentNodeProcedure); // baseFuncScheduler.runProcedure(projectDeployContext); }