From 0246770fa52713886813c1b2cbbb9fc8c8f962f1 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Mon, 22 Jul 2024 15:11:43 +0800 Subject: [PATCH] feat(apigateway): report docker-compose-baremetal running environment (#20865) --- pkg/apigateway/report/report.go | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkg/apigateway/report/report.go b/pkg/apigateway/report/report.go index 9c4a8c4641..d4856e8620 100644 --- a/pkg/apigateway/report/report.go +++ b/pkg/apigateway/report/report.go @@ -75,9 +75,10 @@ type sReport struct { } const ( - RUNNING_ENV_KUBERNETES = "kubernetes" - RUNNING_ENV_DOCKER_COMPOSE = "docker-compose" - RUNNING_ENV_UNKNOWN = "unknown" + RUNNING_ENV_KUBERNETES = "kubernetes" + RUNNING_ENV_DOCKER_COMPOSE = "docker-compose" + RUNNING_ENV_DOCKER_COMPOSE_BAREMETAL = "docker-compose-baremetal" + RUNNING_ENV_UNKNOWN = "unknown" ) func isInsideDockerCompose() bool { @@ -123,6 +124,19 @@ func getRunningEnv() string { } if isInsideDockerCompose() { + // list agent to check whether we're running baremetal agent + s := auth.GetAdminSession(context.Background(), options.Options.Region) + ret, err := compute.Baremetalagents.List(s, nil) + if err != nil { + log.Warningf("list agents error: %s", err) + return RUNNING_ENV_DOCKER_COMPOSE + } + for _, agent := range ret.Data { + aType, _ := agent.GetString("agent_type") + if aType == "baremetal" { + return RUNNING_ENV_DOCKER_COMPOSE_BAREMETAL + } + } return RUNNING_ENV_DOCKER_COMPOSE } return RUNNING_ENV_UNKNOWN