Skip to content

Commit 142e37c

Browse files
committed
Merge branch 'release/v0.45.x' into mergerel
2 parents 422515f + 5ffff3f commit 142e37c

5 files changed

Lines changed: 23 additions & 7 deletions

File tree

terraform/eks/memcached-service/memcached.tf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,22 @@ resource "helm_release" "bitnami" {
3535
chart = "memcached"
3636
version = "5.8.1"
3737

38+
set {
39+
name = "image.repository"
40+
value = "bitnamilegacy/memcached"
41+
}
42+
set {
43+
name = "image.tag"
44+
value = "1.6.23-debian-11-r9"
45+
}
46+
set {
47+
name = "metrics.image.repository"
48+
value = "bitnamilegacy/memcached-exporter"
49+
}
50+
set {
51+
name = "metrics.image.tag"
52+
value = "0.14.2-debian-11-r9"
53+
}
3854
set {
3955
name = "metrics.enabled"
4056
value = "true"

terraform/eks/otlp.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ resource "kubernetes_config_map" "aoc_config_map" {
130130

131131
data = {
132132
"aoc-config.yml" = module.basic_components.0.otconfig_content
133-
"client.qps" = "100"
134-
"client.burst" = "400"
133+
"client.qps" = "100"
134+
"client.burst" = "400"
135135
}
136136
depends_on = [kubernetes_service_account.sample-app-sa]
137137
}

terraform/eks/otlp/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ terraform {
99
kubernetes = {
1010
version = "2.36.0"
1111
}
12-
helm ={
13-
source = "hashicorp/helm"
12+
helm = {
13+
source = "hashicorp/helm"
1414
version = "2.17.0"
1515
}
1616
kubectl = {

terraform/eks/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ terraform {
99
kubernetes = {
1010
version = "2.36.0"
1111
}
12-
helm ={
13-
source = "hashicorp/helm"
12+
helm = {
13+
source = "hashicorp/helm"
1414
version = "2.17.0"
1515
}
1616
kubectl = {

terraform/testcases/otlp_mock/parameters.tfvars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ sample_app = "spark"
55

66
sample_app_image = "public.ecr.aws/aws-otel-test/aws-otel-java-spark:f3c87ee4c0e3fc7cd8bf6d0eb7d8e570f75ae6dc"
77

8-
mock_endpoint ="mocked-server:443/put-data"
8+
mock_endpoint = "mocked-server:443/put-data"

0 commit comments

Comments
 (0)