Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CONTP-337] add e2e tests for kubernetes resources metadata as tags #32161

Closed
wants to merge 5 commits into from
Closed

[CONTP-337] add e2e tests for kubernetes resources metadata as tags #32161

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32167a1
add e2e tests for kubernetes resources metadata as tags
adel121 Dec 13, 2024
42fb94e
bump test-infra-def
adel121 Dec 13, 2024
3c35ff8
run inv tidy
adel121 Dec 16, 2024
996ff3b
Merge remote-tracking branch 'origin/main' into adelhajhassan/add_e2e…
pducolin Dec 16, 2024
94918e0
Merge branch 'main' into adelhajhassan/add_e2e_test_for_kube_metadata…
adel121 Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitlab/common/test_infra_version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ variables:
# and check the job creating the image to make sure you have the right SHA prefix
TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ""
# Make sure to update test-infra-definitions version in go.mod as well
TEST_INFRA_DEFINITIONS_BUILDIMAGES: 9c7c5005ca28
TEST_INFRA_DEFINITIONS_BUILDIMAGES: a4ab67f6572f
42 changes: 21 additions & 21 deletions test/new-e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ replace (
require (
github.com/DataDog/agent-payload/v5 v5.0.138
github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def v0.56.2
github.com/DataDog/datadog-agent/pkg/util/optional v0.59.0
github.com/DataDog/datadog-agent/pkg/util/optional v0.59.1
github.com/DataDog/datadog-agent/pkg/util/pointer v0.59.0
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.59.0
github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.2
Expand All @@ -58,9 +58,9 @@ require (
// `TEST_INFRA_DEFINITIONS_BUILDIMAGES` matches the commit sha in the module version
// Example: github.com/DataDog/test-infra-definitions v0.0.0-YYYYMMDDHHmmSS-0123456789AB
// => TEST_INFRA_DEFINITIONS_BUILDIMAGES: 0123456789AB
github.com/DataDog/test-infra-definitions v0.0.0-20241211124138-9c7c5005ca28
github.com/aws/aws-sdk-go-v2 v1.32.5
github.com/aws/aws-sdk-go-v2/config v1.28.5
github.com/DataDog/test-infra-definitions v0.0.0-20241216092632-a4ab67f6572f
github.com/aws/aws-sdk-go-v2 v1.32.6
github.com/aws/aws-sdk-go-v2/config v1.28.6
github.com/aws/aws-sdk-go-v2/service/ec2 v1.190.0
github.com/aws/aws-sdk-go-v2/service/eks v1.44.1
github.com/aws/aws-sdk-go-v2/service/ssm v1.50.7
Expand Down Expand Up @@ -109,23 +109,23 @@ require (
github.com/alessio/shellescape v1.4.2 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.46 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.20 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.24 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.24 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.47 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.19 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.36.2 // indirect
github.com/aws/aws-sdk-go-v2/service/ecs v1.47.4
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.36.7 // indirect
github.com/aws/aws-sdk-go-v2/service/ecs v1.52.2
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.0 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.65.0
github.com/aws/aws-sdk-go-v2/service/sso v1.24.6 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.6 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.71.0
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
github.com/aws/smithy-go v1.22.1 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
Expand Down Expand Up @@ -220,7 +220,7 @@ require (
github.com/pulumi/esc v0.10.0 // indirect
github.com/pulumi/pulumi-command/sdk v1.0.1 // indirect
github.com/pulumi/pulumi-docker/sdk/v4 v4.5.5 // indirect
github.com/pulumi/pulumi-libvirt/sdk v0.4.7 // indirect
github.com/pulumi/pulumi-libvirt/sdk v0.5.3 // indirect
github.com/pulumi/pulumi-random/sdk/v4 v4.16.7 // indirect
github.com/pulumi/pulumi-tls/sdk/v4 v4.11.1 // indirect
github.com/pulumiverse/pulumi-time/sdk v0.1.0 // indirect
Expand Down Expand Up @@ -309,7 +309,7 @@ require (
github.com/pulumi/pulumi-azure-native-sdk/managedidentity/v2 v2.73.1 // indirect
github.com/pulumi/pulumi-azure-native-sdk/network/v2 v2.73.1 // indirect
github.com/pulumi/pulumi-azure-native-sdk/v2 v2.73.1 // indirect
github.com/pulumi/pulumi-eks/sdk/v3 v3.3.0 // indirect
github.com/pulumi/pulumi-eks/sdk/v3 v3.4.0 // indirect
github.com/pulumi/pulumi-gcp/sdk/v7 v7.38.0 // indirect
github.com/twinj/uuid v0.0.0-20151029044442-89173bcdda19 // indirect
github.com/x448/float16 v0.8.4 // indirect
Expand Down
46 changes: 42 additions & 4 deletions test/new-e2e/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions test/new-e2e/tests/containers/k8s_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,10 @@ func (suite *k8sSuite) TestNginx() {
`^pod_name:nginx-[[:alnum:]]+-[[:alnum:]]+$`,
`^pod_phase:running$`,
`^short_image:apps-nginx-server$`,
`^email:[email protected]$`,
`^domain:deployment$`,
`^mail:[email protected]$`,
`^org:agent-org$`,
`^parent-name:nginx$`,
`^team:contp$`,
},
AcceptUnexpectedTags: true,
Expand Down Expand Up @@ -543,7 +546,10 @@ func (suite *k8sSuite) TestNginx() {
`^pod_name:nginx-[[:alnum:]]+-[[:alnum:]]+$`,
`^pod_phase:running$`,
`^short_image:apps-nginx-server$`,
`^email:[email protected]$`,
`^domain:deployment$`,
`^mail:[email protected]$`,
`^org:agent-org$`,
`^parent-name:nginx$`,
`^team:contp$`,
},
Message: `GET / HTTP/1\.1`,
Expand Down
Loading