File tree Expand file tree Collapse file tree 2 files changed +28
-18
lines changed
modules/opentelemetry-operator Expand file tree Collapse file tree 2 files changed +28
-18
lines changed Original file line number Diff line number Diff line change @@ -535,6 +535,15 @@ module "opentelemetry_operator" {
535535
536536 values = concat (
537537 [local . universal_values_string ],
538+ [
539+ <<- EOT
540+ %{ if var . enable_victoriametrics_operator == true }
541+ manager:
542+ serviceMonitor:
543+ enabled: true
544+ %{ endif }
545+ EOT
546+ ],
538547 var. opentelemetry_operator_values
539548 )
540549}
Original file line number Diff line number Diff line change 1+ locals {
2+ # https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-operator/values.yaml
3+ values = [
4+ <<- EOT
5+ manager:
6+ collectorImage:
7+ repository: "otel/opentelemetry-collector-k8s"
8+ admissionWebhooks:
9+ certManager:
10+ enabled: false
11+ EOT
12+ ]
13+ }
14+
115module "opentelemetry_operator" {
216 source = " aws-ia/eks-blueprints-addon/aws"
317 version = " ~> 1.1"
418
5- set = concat (
6- [
7- {
8- name = " admissionWebhooks.certManager.enabled"
9- value = " false"
10- },
11-
12- # Error: values don't meet the specifications of the schema(s) in the following chart(s):
13- # │ opentelemetry-operator:
14- # │ - admissionWebhooks.certManager: Additional property autoGenerateCert is not allowed
15- # {
16- # name = "admissionWebhooks.certManager.autoGenerateCert.enabled"
17- # value = "true"
18- # },
19-
20- ],
21- var. set
19+ values = concat (
20+ local. values ,
21+ var. values
2222 )
2323
24+ set = var. set
25+
2426 create = var. create
2527 tags = var. tags
2628 create_release = var. create_release
@@ -31,7 +33,6 @@ module "opentelemetry_operator" {
3133 chart = var. chart
3234 chart_version = var. chart_version
3335 repository = var. repository
34- values = var. values
3536 timeout = var. timeout
3637 repository_key_file = var. repository_key_file
3738 repository_cert_file = var. repository_cert_file
You can’t perform that action at this time.
0 commit comments