diff --git a/src/runtime/pkg/containerd-shim-v2/shim_management.go b/src/runtime/pkg/containerd-shim-v2/shim_management.go index 00eb9d7db6..a6b9bdba34 100644 --- a/src/runtime/pkg/containerd-shim-v2/shim_management.go +++ b/src/runtime/pkg/containerd-shim-v2/shim_management.go @@ -33,12 +33,13 @@ import ( ) const ( - DirectVolumePathKey = "path" - + DirectVolumePathKey = "path" + AgentUrl = "/agent-url" DirectVolumeStatUrl = "/direct-volume/stats" DirectVolumeResizeUrl = "/direct-volume/resize" IPTablesUrl = "/iptables" IP6TablesUrl = "/ip6tables" + MetricsUrl = "/metrics" ) var ( @@ -260,8 +261,8 @@ func (s *service) startManagementServer(ctx context.Context, ociSpec *specs.Spec // bind handler m := http.NewServeMux() - m.Handle("/metrics", http.HandlerFunc(s.serveMetrics)) - m.Handle("/agent-url", http.HandlerFunc(s.agentURL)) + m.Handle(MetricsUrl, http.HandlerFunc(s.serveMetrics)) + m.Handle(AgentUrl, http.HandlerFunc(s.agentURL)) m.Handle(DirectVolumeStatUrl, http.HandlerFunc(s.serveVolumeStats)) m.Handle(DirectVolumeResizeUrl, http.HandlerFunc(s.serveVolumeResize)) m.Handle(IPTablesUrl, http.HandlerFunc(s.ipTablesHandler)) diff --git a/src/runtime/pkg/kata-monitor/metrics.go b/src/runtime/pkg/kata-monitor/metrics.go index e5d9477670..98ecb68f09 100644 --- a/src/runtime/pkg/kata-monitor/metrics.go +++ b/src/runtime/pkg/kata-monitor/metrics.go @@ -15,6 +15,7 @@ import ( "sync" "time" + containerdshim "github.com/kata-containers/kata-containers/src/runtime/pkg/containerd-shim-v2" mutils "github.com/kata-containers/kata-containers/src/runtime/pkg/utils" "github.com/kata-containers/kata-containers/src/runtime/pkg/utils/shimclient" "github.com/prometheus/client_golang/prometheus" @@ -239,7 +240,7 @@ func (km *KataMonitor) aggregateSandboxMetrics(encoder expfmt.Encoder) error { } func getParsedMetrics(sandboxID string, sandboxMetadata sandboxCRIMetadata) ([]*dto.MetricFamily, error) { - body, err := shimclient.DoGet(sandboxID, defaultTimeout, "metrics") + body, err := shimclient.DoGet(sandboxID, defaultTimeout, containerdshim.MetricsUrl) if err != nil { return nil, err } @@ -249,7 +250,7 @@ func getParsedMetrics(sandboxID string, sandboxMetadata sandboxCRIMetadata) ([]* // GetSandboxMetrics will get sandbox's metrics from shim func GetSandboxMetrics(sandboxID string) (string, error) { - body, err := shimclient.DoGet(sandboxID, defaultTimeout, "metrics") + body, err := shimclient.DoGet(sandboxID, defaultTimeout, containerdshim.MetricsUrl) if err != nil { return "", err } diff --git a/src/runtime/pkg/utils/shimclient/shim_management_client.go b/src/runtime/pkg/utils/shimclient/shim_management_client.go index 835b6f9b98..81c0d70dec 100644 --- a/src/runtime/pkg/utils/shimclient/shim_management_client.go +++ b/src/runtime/pkg/utils/shimclient/shim_management_client.go @@ -48,7 +48,7 @@ func DoGet(sandboxID string, timeoutInSeconds time.Duration, urlPath string) ([] return nil, err } - resp, err := client.Get(fmt.Sprintf("http://shim/%s", urlPath)) + resp, err := client.Get(fmt.Sprintf("http://shim%s", urlPath)) if err != nil { return nil, err } @@ -72,7 +72,7 @@ func DoPut(sandboxID string, timeoutInSeconds time.Duration, urlPath, contentTyp return err } - req, err := http.NewRequest(http.MethodPut, fmt.Sprintf("http://shim/%s", urlPath), bytes.NewBuffer(payload)) + req, err := http.NewRequest(http.MethodPut, fmt.Sprintf("http://shim%s", urlPath), bytes.NewBuffer(payload)) if err != nil { return err } @@ -94,7 +94,7 @@ func DoPost(sandboxID string, timeoutInSeconds time.Duration, urlPath, contentTy return err } - resp, err := client.Post(fmt.Sprintf("http://shim/%s", urlPath), contentType, bytes.NewBuffer(payload)) + resp, err := client.Post(fmt.Sprintf("http://shim%s", urlPath), contentType, bytes.NewBuffer(payload)) defer func() { if resp != nil { resp.Body.Close()