diff --git a/cdk_infra/lib/config/cluster-config/clusters.yml b/cdk_infra/lib/config/cluster-config/clusters.yml index 571c41486..1cc3ffea8 100644 --- a/cdk_infra/lib/config/cluster-config/clusters.yml +++ b/cdk_infra/lib/config/cluster-config/clusters.yml @@ -1,17 +1,6 @@ --- clusters: # collector test clusters - - name: collector-ci-arm64-1-27 - version: "1.27" - launch_type: ec2 - instance_type: m6g.large - - name: collector-ci-amd64-1-27 - version: "1.27" - launch_type: ec2 - instance_type: "m5.large" - - name: collector-ci-fargate-1-27 - version: "1.27" - launch_type: fargate - name: collector-ci-arm64-1-28 version: "1.28" launch_type: ec2 @@ -57,16 +46,6 @@ clusters: version: "1.31" launch_type: fargate # operator test clusters - - name: operator-ci-amd64-1-27 - version: "1.27" - launch_type: ec2 - instance_type: m5.large - cert_manager: true - - name: operator-ci-arm64-1-27 - version: "1.27" - launch_type: ec2 - instance_type: m6g.large - cert_manager: true - name: operator-ci-amd64-1-28 version: "1.28" launch_type: ec2 diff --git a/cdk_infra/lib/utils/eks/kubectlLayer.ts b/cdk_infra/lib/utils/eks/kubectlLayer.ts index 6f895acdb..ea02208e9 100644 --- a/cdk_infra/lib/utils/eks/kubectlLayer.ts +++ b/cdk_infra/lib/utils/eks/kubectlLayer.ts @@ -1,7 +1,6 @@ import { aws_eks } from 'aws-cdk-lib'; import { ILayerVersion } from 'aws-cdk-lib/aws-lambda'; import { Construct } from 'constructs/lib/construct'; -import { KubectlV27Layer } from '@aws-cdk/lambda-layer-kubectl-v27'; import { KubectlV28Layer } from '@aws-cdk/lambda-layer-kubectl-v28'; import { KubectlV29Layer } from '@aws-cdk/lambda-layer-kubectl-v29'; import { KubectlV30Layer } from '@aws-cdk/lambda-layer-kubectl-v30'; @@ -12,8 +11,6 @@ export function GetLayer( k8sVersion: aws_eks.KubernetesVersion ): ILayerVersion { switch (k8sVersion.version) { - case '1.27': - return new KubectlV27Layer(scope, 'v27Layer'); case '1.28': return new KubectlV28Layer(scope, 'v28Layer'); case '1.29': diff --git a/cdk_infra/test/test_config/test_clusters.yml b/cdk_infra/test/test_config/test_clusters.yml index 08cc07f11..2ed921412 100644 --- a/cdk_infra/test/test_config/test_clusters.yml +++ b/cdk_infra/test/test_config/test_clusters.yml @@ -1,9 +1,5 @@ --- clusters: - - name: m6g-arm64-Cluster-1-27 - launch_type: ec2 - instance_type: m6g.large - version: "1.27" - name: m6g-arm64-Cluster-1-28 launch_type: ec2 instance_type: m6g.large diff --git a/terraform/eks/adot-operator/adot-operator-values.yaml b/terraform/eks/adot-operator/adot-operator-values.yaml index dbe5695e6..f3161a433 100644 --- a/terraform/eks/adot-operator/adot-operator-values.yaml +++ b/terraform/eks/adot-operator/adot-operator-values.yaml @@ -1,4 +1,4 @@ kubeRBACProxy: image: repository: public.ecr.aws/aws-observability/mirror-kube-rbac-proxy - tag: "v0.18.1" + tag: "v0.19.1" diff --git a/terraform/eks/adot-operator/adot_operator.tf b/terraform/eks/adot-operator/adot_operator.tf index 2cc7aaf4a..f171c3da6 100644 --- a/terraform/eks/adot-operator/adot_operator.tf +++ b/terraform/eks/adot-operator/adot_operator.tf @@ -46,7 +46,7 @@ resource "helm_release" "adot-operator" { repository = "https://open-telemetry.github.io/opentelemetry-helm-charts" chart = "opentelemetry-operator" - version = "0.70.0" + version = "0.93.1" namespace = "adot-operator-${var.testing_id}-ns" wait = true timeout = 600 diff --git a/terraform/eks/otlp.tf b/terraform/eks/otlp.tf index 15be94777..94c62a21a 100644 --- a/terraform/eks/otlp.tf +++ b/terraform/eks/otlp.tf @@ -281,7 +281,7 @@ resource "kubectl_manifest" "aoc_deployment_adot_operator" { count = local.is_otlp_base_scenario && local.is_operator_testcase ? 1 : 0 yaml_body = <<-EOF - apiVersion: opentelemetry.io/v1alpha1 + apiVersion: opentelemetry.io/v1beta1 kind: OpenTelemetryCollector metadata: name: aoc @@ -290,7 +290,7 @@ resource "kubectl_manifest" "aoc_deployment_adot_operator" { image: ${module.common.aoc_image} mode: ${var.aoc_deploy_mode} serviceAccount: aoc-role-${module.common.testing_id} - config: | + config: ${module.basic_components.0.otconfig_content} EOF depends_on = [module.adot_operator] diff --git a/terraform/eks/variables.tf b/terraform/eks/variables.tf index 67bdcb0f7..5ad86ddf6 100644 --- a/terraform/eks/variables.tf +++ b/terraform/eks/variables.tf @@ -63,7 +63,7 @@ variable "operator_repository" { variable "operator_tag" { type = string - default = "v0.109.0" + default = "v0.131.0" } // This will only fetch data from the MSK cluster in case this value is set diff --git a/terraform/testcases/otlp_metric_adot_operator/otconfig.tpl b/terraform/testcases/otlp_metric_adot_operator/otconfig.tpl index 7717a5fac..31aeece6c 100644 --- a/terraform/testcases/otlp_metric_adot_operator/otconfig.tpl +++ b/terraform/testcases/otlp_metric_adot_operator/otconfig.tpl @@ -6,10 +6,6 @@ extensions: protocols: grpc: endpoint: 0.0.0.0:${grpc_port} - - processors: - batch: - exporters: awsemf: region: '${region}' @@ -18,7 +14,6 @@ extensions: pipelines: metrics: receivers: [otlp] - processors: [batch] exporters: [awsemf] extensions: [pprof] telemetry: diff --git a/terraform/testcases/otlp_trace_adot_operator/otconfig.tpl b/terraform/testcases/otlp_trace_adot_operator/otconfig.tpl index 18fafdcad..7add4ccf4 100644 --- a/terraform/testcases/otlp_trace_adot_operator/otconfig.tpl +++ b/terraform/testcases/otlp_trace_adot_operator/otconfig.tpl @@ -7,19 +7,14 @@ extensions: grpc: endpoint: 0.0.0.0:${grpc_port} - processors: - batch: - exporters: awsxray: - local_mode: true region: '${region}' service: pipelines: traces: receivers: [otlp] - processors: [batch] exporters: [awsxray] extensions: [pprof] telemetry: