From 73723e99f4a7e3108b524b6cdac035ba2a7793d1 Mon Sep 17 00:00:00 2001 From: Paramadon Date: Wed, 18 Dec 2024 00:17:51 +0100 Subject: [PATCH 1/5] adding windows 2025 test --- .../ec2_windows_performance_test_matrix.json | 21 +++++++++ .../ec2_windows_stress_test_matrix.json | 28 +++++++++++ .../resources/ec2_windows_test_matrix.json | 12 +++++ generator/test_case_generator.go | 5 ++ terraform/eks/daemon/windows/2025/main.tf | 14 ++++++ .../eks/daemon/windows/2025/variables.tf | 47 +++++++++++++++++++ 6 files changed, 127 insertions(+) create mode 100644 terraform/eks/daemon/windows/2025/main.tf create mode 100644 terraform/eks/daemon/windows/2025/variables.tf diff --git a/generator/resources/ec2_windows_performance_test_matrix.json b/generator/resources/ec2_windows_performance_test_matrix.json index daa899710..495beabdc 100644 --- a/generator/resources/ec2_windows_performance_test_matrix.json +++ b/generator/resources/ec2_windows_performance_test_matrix.json @@ -19,5 +19,26 @@ "arc": "amd64", "valuesPerMinute": 5000, "family": "windows" + }, + { + "os": "win-2025", + "ami": "cloudwatch-agent-integration-test-win-2025*", + "arc": "amd64", + "valuesPerMinute": 100, + "family": "windows" + }, + { + "os": "win-2022", + "ami": "cloudwatch-agent-integration-test-win-2025*", + "arc": "amd64", + "valuesPerMinute": 1000, + "family": "windows" + }, + { + "os": "win-2022", + "ami": "cloudwatch-agent-integration-test-win-2025*", + "arc": "amd64", + "valuesPerMinute": 5000, + "family": "windows" } ] \ No newline at end of file diff --git a/generator/resources/ec2_windows_stress_test_matrix.json b/generator/resources/ec2_windows_stress_test_matrix.json index effa360e0..293be285c 100644 --- a/generator/resources/ec2_windows_stress_test_matrix.json +++ b/generator/resources/ec2_windows_stress_test_matrix.json @@ -26,5 +26,33 @@ "arc": "amd64", "valuesPerMinute": 50000, "family": "windows" + }, + { + "os": "win-2025", + "ami": "cloudwatch-agent-integration-test-win-2025*", + "arc": "amd64", + "valuesPerMinute": 1000, + "family": "windows" + }, + { + "os": "win-2025", + "ami": "cloudwatch-agent-integration-test-win-2025*", + "arc": "amd64", + "valuesPerMinute": 5000, + "family": "windows" + }, + { + "os": "win-2025", + "ami": "cloudwatch-agent-integration-test-win-2025*", + "arc": "amd64", + "valuesPerMinute": 10000, + "family": "windows" + }, + { + "os": "win-2025", + "ami": "cloudwatch-agent-integration-test-win-2025*", + "arc": "amd64", + "valuesPerMinute": 50000, + "family": "windows" } ] \ No newline at end of file diff --git a/generator/resources/ec2_windows_test_matrix.json b/generator/resources/ec2_windows_test_matrix.json index d0874d62c..f8cec8eac 100644 --- a/generator/resources/ec2_windows_test_matrix.json +++ b/generator/resources/ec2_windows_test_matrix.json @@ -28,5 +28,17 @@ "instanceType":"t3a.medium", "ami": "cloudwatch-agent-integration-test-win-2022*", "useSSM": true + }, + { + "os": "win-2025", + "instanceType":"t3a.medium", + "ami": "cloudwatch-agent-integration-test-win-2025*", + "useSSM": false + }, + { + "os": "win-2025", + "instanceType":"t3a.medium", + "ami": "cloudwatch-agent-integration-test-win-2025*", + "useSSM": true } ] \ No newline at end of file diff --git a/generator/test_case_generator.go b/generator/test_case_generator.go index dc9a5d308..544599094 100644 --- a/generator/test_case_generator.go +++ b/generator/test_case_generator.go @@ -210,6 +210,11 @@ var testTypeToTestConfig = map[string][]testConfig{ terraformDir: "terraform/eks/daemon/windows/2022", targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, }, + { + testDir: "./test/metric_value_benchmark", + terraformDir: "terraform/eks/daemon/windows/2025", + targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, + }, { testDir: "./test/statsd", terraformDir: "terraform/eks/daemon/statsd", targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, diff --git a/terraform/eks/daemon/windows/2025/main.tf b/terraform/eks/daemon/windows/2025/main.tf new file mode 100644 index 000000000..38ee4dcb3 --- /dev/null +++ b/terraform/eks/daemon/windows/2025/main.tf @@ -0,0 +1,14 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +module "windows" { + source = "../" + windows_ami_type = var.windows_ami_type + windows_os_version = var.windows_os_version + test_dir = var.test_dir + ami_type = var.ami_type + instance_type = var.instance_type + k8s_version = var.k8s_version + cwagent_image_repo = var.cwagent_image_repo + cwagent_image_tag = var.cwagent_image_tag +} \ No newline at end of file diff --git a/terraform/eks/daemon/windows/2025/variables.tf b/terraform/eks/daemon/windows/2025/variables.tf new file mode 100644 index 000000000..5859f76d2 --- /dev/null +++ b/terraform/eks/daemon/windows/2025/variables.tf @@ -0,0 +1,47 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +variable "region" { + type = string + default = "us-west-2" +} + +variable "test_dir" { + type = string + default = "./test/metric_value_benchmark" +} + +variable "cwagent_image_repo" { + type = string + default = "public.ecr.aws/cloudwatch-agent/cloudwatch-agent" +} + +variable "cwagent_image_tag" { + type = string + default = "latest" +} + +variable "k8s_version" { + type = string + default = "1.24" +} + +variable "ami_type" { + type = string + default = "AL2_x86_64" +} + +variable "instance_type" { + type = string + default = "t3a.medium" +} + +variable "windows_ami_type" { + type = string + default = "WINDOWS_CORE_2025_x86_64" +} + +variable "windows_os_version" { + type = string + default = "2025" +} From f111016558430ad371ede3e4f221804205d53f13 Mon Sep 17 00:00:00 2001 From: Paramadon Date: Wed, 18 Dec 2024 15:16:34 +0100 Subject: [PATCH 2/5] adding fluent for windows 2025 --- generator/test_case_generator.go | 1 + .../eks/daemon/fluent/windows/2025/main.tf | 12 +++++ .../daemon/fluent/windows/2025/variables.tf | 47 +++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 terraform/eks/daemon/fluent/windows/2025/main.tf create mode 100644 terraform/eks/daemon/fluent/windows/2025/variables.tf diff --git a/generator/test_case_generator.go b/generator/test_case_generator.go index 544599094..1e158a213 100644 --- a/generator/test_case_generator.go +++ b/generator/test_case_generator.go @@ -229,6 +229,7 @@ var testTypeToTestConfig = map[string][]testConfig{ }, {testDir: "./test/fluent", terraformDir: "terraform/eks/daemon/fluent/bit"}, {testDir: "./test/fluent", terraformDir: "terraform/eks/daemon/fluent/windows/2022"}, + {testDir: "./test/fluent", terraformDir: "terraform/eks/daemon/fluent/windows/2025"}, { testDir: "./test/gpu", terraformDir: "terraform/eks/daemon/gpu", targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, diff --git a/terraform/eks/daemon/fluent/windows/2025/main.tf b/terraform/eks/daemon/fluent/windows/2025/main.tf new file mode 100644 index 000000000..85422989c --- /dev/null +++ b/terraform/eks/daemon/fluent/windows/2025/main.tf @@ -0,0 +1,12 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +module "windows" { + source = "../" + windows_ami_type = var.windows_ami_type + windows_os_version = var.windows_os_version + test_dir = var.test_dir + ami_type = var.ami_type + instance_type = var.instance_type + k8s_version = var.k8s_version +} \ No newline at end of file diff --git a/terraform/eks/daemon/fluent/windows/2025/variables.tf b/terraform/eks/daemon/fluent/windows/2025/variables.tf new file mode 100644 index 000000000..e3f048843 --- /dev/null +++ b/terraform/eks/daemon/fluent/windows/2025/variables.tf @@ -0,0 +1,47 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +variable "region" { + type = string + default = "us-west-2" +} + +variable "test_dir" { + type = string + default = "./test/metric_value_benchmark" +} + +variable "cwagent_image_repo" { + type = string + default = "public.ecr.aws/cloudwatch-agent/cloudwatch-agent" +} + +variable "cwagent_image_tag" { + type = string + default = "latest" +} + +variable "k8s_version" { + type = string + default = "1.24" +} + +variable "ami_type" { + type = string + default = "AL2_x86_64" +} + +variable "instance_type" { + type = string + default = "t3a.medium" +} + +variable "windows_ami_type" { + type = string + default = "WINDOWS_CORE_2025_x86_64" +} + +variable "windows_os_version" { + type = string + default = "2025" +} \ No newline at end of file From 9dea31de0e97ceabffacd79bbba53b3fb36b29cb Mon Sep 17 00:00:00 2001 From: Paramadon Date: Wed, 18 Dec 2024 15:21:47 +0100 Subject: [PATCH 3/5] fixing naming --- generator/resources/ec2_windows_performance_test_matrix.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generator/resources/ec2_windows_performance_test_matrix.json b/generator/resources/ec2_windows_performance_test_matrix.json index 495beabdc..b0360d480 100644 --- a/generator/resources/ec2_windows_performance_test_matrix.json +++ b/generator/resources/ec2_windows_performance_test_matrix.json @@ -28,14 +28,14 @@ "family": "windows" }, { - "os": "win-2022", + "os": "win-2025", "ami": "cloudwatch-agent-integration-test-win-2025*", "arc": "amd64", "valuesPerMinute": 1000, "family": "windows" }, { - "os": "win-2022", + "os": "win-2025", "ami": "cloudwatch-agent-integration-test-win-2025*", "arc": "amd64", "valuesPerMinute": 5000, From a24f03633f9d8fcc7af30b14bddc8f2574551041 Mon Sep 17 00:00:00 2001 From: Paramadon Date: Wed, 18 Dec 2024 18:26:19 +0100 Subject: [PATCH 4/5] removing EKS windows 2025 test --- generator/test_case_generator.go | 6 --- .../eks/daemon/fluent/windows/2025/main.tf | 12 ----- .../daemon/fluent/windows/2025/variables.tf | 47 ------------------- 3 files changed, 65 deletions(-) delete mode 100644 terraform/eks/daemon/fluent/windows/2025/main.tf delete mode 100644 terraform/eks/daemon/fluent/windows/2025/variables.tf diff --git a/generator/test_case_generator.go b/generator/test_case_generator.go index 1e158a213..dc9a5d308 100644 --- a/generator/test_case_generator.go +++ b/generator/test_case_generator.go @@ -210,11 +210,6 @@ var testTypeToTestConfig = map[string][]testConfig{ terraformDir: "terraform/eks/daemon/windows/2022", targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, }, - { - testDir: "./test/metric_value_benchmark", - terraformDir: "terraform/eks/daemon/windows/2025", - targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, - }, { testDir: "./test/statsd", terraformDir: "terraform/eks/daemon/statsd", targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, @@ -229,7 +224,6 @@ var testTypeToTestConfig = map[string][]testConfig{ }, {testDir: "./test/fluent", terraformDir: "terraform/eks/daemon/fluent/bit"}, {testDir: "./test/fluent", terraformDir: "terraform/eks/daemon/fluent/windows/2022"}, - {testDir: "./test/fluent", terraformDir: "terraform/eks/daemon/fluent/windows/2025"}, { testDir: "./test/gpu", terraformDir: "terraform/eks/daemon/gpu", targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, diff --git a/terraform/eks/daemon/fluent/windows/2025/main.tf b/terraform/eks/daemon/fluent/windows/2025/main.tf deleted file mode 100644 index 85422989c..000000000 --- a/terraform/eks/daemon/fluent/windows/2025/main.tf +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: MIT - -module "windows" { - source = "../" - windows_ami_type = var.windows_ami_type - windows_os_version = var.windows_os_version - test_dir = var.test_dir - ami_type = var.ami_type - instance_type = var.instance_type - k8s_version = var.k8s_version -} \ No newline at end of file diff --git a/terraform/eks/daemon/fluent/windows/2025/variables.tf b/terraform/eks/daemon/fluent/windows/2025/variables.tf deleted file mode 100644 index e3f048843..000000000 --- a/terraform/eks/daemon/fluent/windows/2025/variables.tf +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: MIT - -variable "region" { - type = string - default = "us-west-2" -} - -variable "test_dir" { - type = string - default = "./test/metric_value_benchmark" -} - -variable "cwagent_image_repo" { - type = string - default = "public.ecr.aws/cloudwatch-agent/cloudwatch-agent" -} - -variable "cwagent_image_tag" { - type = string - default = "latest" -} - -variable "k8s_version" { - type = string - default = "1.24" -} - -variable "ami_type" { - type = string - default = "AL2_x86_64" -} - -variable "instance_type" { - type = string - default = "t3a.medium" -} - -variable "windows_ami_type" { - type = string - default = "WINDOWS_CORE_2025_x86_64" -} - -variable "windows_os_version" { - type = string - default = "2025" -} \ No newline at end of file From c4435f807321a1ebb2f371a45e8a92e5fbeb3f6b Mon Sep 17 00:00:00 2001 From: Paramadon Date: Wed, 18 Dec 2024 18:30:35 +0100 Subject: [PATCH 5/5] restoring eks file --- terraform/eks/daemon/windows/2025/main.tf | 14 ------ .../eks/daemon/windows/2025/variables.tf | 47 ------------------- 2 files changed, 61 deletions(-) delete mode 100644 terraform/eks/daemon/windows/2025/main.tf delete mode 100644 terraform/eks/daemon/windows/2025/variables.tf diff --git a/terraform/eks/daemon/windows/2025/main.tf b/terraform/eks/daemon/windows/2025/main.tf deleted file mode 100644 index 38ee4dcb3..000000000 --- a/terraform/eks/daemon/windows/2025/main.tf +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: MIT - -module "windows" { - source = "../" - windows_ami_type = var.windows_ami_type - windows_os_version = var.windows_os_version - test_dir = var.test_dir - ami_type = var.ami_type - instance_type = var.instance_type - k8s_version = var.k8s_version - cwagent_image_repo = var.cwagent_image_repo - cwagent_image_tag = var.cwagent_image_tag -} \ No newline at end of file diff --git a/terraform/eks/daemon/windows/2025/variables.tf b/terraform/eks/daemon/windows/2025/variables.tf deleted file mode 100644 index 5859f76d2..000000000 --- a/terraform/eks/daemon/windows/2025/variables.tf +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: MIT - -variable "region" { - type = string - default = "us-west-2" -} - -variable "test_dir" { - type = string - default = "./test/metric_value_benchmark" -} - -variable "cwagent_image_repo" { - type = string - default = "public.ecr.aws/cloudwatch-agent/cloudwatch-agent" -} - -variable "cwagent_image_tag" { - type = string - default = "latest" -} - -variable "k8s_version" { - type = string - default = "1.24" -} - -variable "ami_type" { - type = string - default = "AL2_x86_64" -} - -variable "instance_type" { - type = string - default = "t3a.medium" -} - -variable "windows_ami_type" { - type = string - default = "WINDOWS_CORE_2025_x86_64" -} - -variable "windows_os_version" { - type = string - default = "2025" -}