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

Add checks for static tags from env and instance config #34387

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
+15 −5
Draft

Add checks for static tags from env and instance config #34387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27facce
Add checks for static tags from env and instance config
justin-lesko Feb 24, 2025
e2fb53d
Fix tag assertions to include both key and value
justin-lesko Feb 25, 2025
e0e37d6
Bump test-infra-definitions to check e2e tests
justin-lesko Feb 25, 2025
1cf2696
Go mod tidy
justin-lesko Feb 26, 2025
b5fb911
Update tests to reference latest tag values and bump test-infra-defs
justin-lesko Feb 26, 2025
ea6c5c7
Use different string concatenation method for stackid tag
justin-lesko Feb 26, 2025
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
4 changes: 2 additions & 2 deletions .gitlab/common/test_infra_version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@

---
variables:
TEST_INFRA_DEFINITIONS_BUILDIMAGES: 93e0ad6d6460
TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ''
TEST_INFRA_DEFINITIONS_BUILDIMAGES: 7dd3747e4e68
TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: '-dev'
2 changes: 1 addition & 1 deletion test/new-e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ 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-20250221150201-93e0ad6d6460
github.com/DataDog/test-infra-definitions v0.0.0-20250226194045-7dd3747e4e68
github.com/aws/aws-sdk-go-v2 v1.36.1
github.com/aws/aws-sdk-go-v2/config v1.29.6
github.com/aws/aws-sdk-go-v2/service/ec2 v1.203.0
Expand Down
4 changes: 2 additions & 2 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: 10 additions & 0 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 @@ -504,6 +504,8 @@ func (suite *k8sSuite) TestNginx() {
`^team:contp$`,
`^mail:[email protected]$`,
`^sub-team:contint$`,
`^kube_instance_tag:static$`,
`^stackid:` + regexp.QuoteMeta(suite.clusterName) + `$`,
},
Value: &testMetricExpectValueArgs{
Max: 5,
Expand Down Expand Up @@ -600,6 +602,8 @@ func (suite *k8sSuite) TestRedis() {
`^kube_cluster_name:`,
`^kube_deployment:redis$`,
`^kube_namespace:workload-redis$`,
`^kube_instance_tag:static$`,
`^stackid:` + regexp.QuoteMeta(suite.clusterName) + `$`,
},
Value: &testMetricExpectValueArgs{
Max: 5,
Expand Down Expand Up @@ -810,6 +814,8 @@ func (suite *k8sSuite) TestKSM() {
`^org:agent-org$`,
`^team:contp$`,
`^mail:[email protected]$`,
`^kube_instance_tag:static$`,
`^stackid:` + regexp.QuoteMeta(suite.clusterName) + `$`,
},
Value: &testMetricExpectValueArgs{
Max: 1,
Expand All @@ -830,6 +836,8 @@ func (suite *k8sSuite) TestKSM() {
Tags: &[]string{
`^kube_cluster_name:` + regexp.QuoteMeta(suite.clusterName) + `$`,
`^kube_namespace:workload-redis$`,
`^kube_instance_tag:static$`,
`^stackid:` + regexp.QuoteMeta(suite.clusterName) + `$`,
},
Value: &testMetricExpectValueArgs{
Max: 1,
Expand All @@ -851,6 +859,8 @@ func (suite *k8sSuite) TestKSM() {
`^cr_type:ddm$`,
`^ddm_namespace:workload-(?:nginx|redis)$`,
`^ddm_name:(?:nginx|redis)$`,
`^kube_instance_tag:static$`,
`^stackid:` + regexp.QuoteMeta(suite.clusterName) + `$`,
},
},
})
Expand Down