From 455ee73f7bca7e664348e7e2ab1241d9609575a3 Mon Sep 17 00:00:00 2001 From: Hisar Balik Date: Mon, 27 Jan 2025 09:31:13 +0100 Subject: [PATCH] add cloud provider attribute tests --- hack/make/provision.mk | 2 +- test/e2e/metrics_runtime_input_test.go | 2 +- test/testkit/metrics/runtime/pod.go | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hack/make/provision.mk b/hack/make/provision.mk index f4ae87424..16057cff2 100644 --- a/hack/make/provision.mk +++ b/hack/make/provision.mk @@ -1,7 +1,7 @@ ##@ k3d .PHONY: provision-k3d provision-k3d: $(K3D) - $(K3D) cluster create --image rancher/k3s:v$(strip $(K3S_K8S_VERSION))-k3s1 --config .k3d-kyma.yaml + $(K3D) cluster create --image rancher/k3s:v$(strip $(K3S_K8S_VERSION))-k3s1 --config .k3d-kyma.yaml --k3s-node-label "topology.kubernetes.io/region=testregion@server:0" --k3s-node-label "topology.kubernetes.io/zone=testzone@server:0" --k3s-node-label "node.kubernetes.io/instance-type=testmach@server:0" --k3s-node-label "kubernetes.io/arch=testarch@server:0" kubectl create ns kyma-system .PHONY: provision-k3d-istio diff --git a/test/e2e/metrics_runtime_input_test.go b/test/e2e/metrics_runtime_input_test.go index a40dde19a..7119e6d0c 100644 --- a/test/e2e/metrics_runtime_input_test.go +++ b/test/e2e/metrics_runtime_input_test.go @@ -31,7 +31,7 @@ import ( "github.com/kyma-project/telemetry-manager/test/testkit/suite" ) -var _ = Describe(suite.ID(), Label(suite.LabelMetrics), Label(suite.LabelSetA), Ordered, func() { +var _ = Describe(suite.ID(), Label(suite.LabelMetrics), Label("ttt"), Ordered, func() { Context("When metric pipelines with runtime resources metrics enabled exist", Ordered, func() { var ( mockNs = suite.ID() diff --git a/test/testkit/metrics/runtime/pod.go b/test/testkit/metrics/runtime/pod.go index 71a0a559b..aaab0c379 100644 --- a/test/testkit/metrics/runtime/pod.go +++ b/test/testkit/metrics/runtime/pod.go @@ -33,6 +33,10 @@ var ( "k8s.pod.name", "k8s.pod.uid", "service.name", + "cloud.region", + "cloud.availability_zone", + "host.type", + "host.arch", } PodMetricsAttributes = map[string][]string{