diff --git a/README.md b/README.md index 7aeaa20..05a270e 100644 --- a/README.md +++ b/README.md @@ -47,13 +47,18 @@ This modules installs the OpenTelemetry Collector operator and two Collectors. O | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [account\_id](#input\_account\_id) | aws account number | `string` | `""` | no | +| [auto\_instrumentation\_java\_version](#input\_auto\_instrumentation\_java\_version) | Which version of auto\_instrumentation for java | `string` | `"2.9.0"` | no | | [cluster\_name](#input\_cluster\_name) | EKS cluster name name component used through out the EKS cluster describing its purpose (ex: dice-dev) | `string` | n/a | yes | +| [collector\_contrib\_version](#input\_collector\_contrib\_version) | Which version of collector\_contrib | `string` | `"0.113.0"` | no | +| [collector\_version](#input\_collector\_version) | Which version of collector | `string` | `"0.100.0"` | no | | [eecr\_account\_id](#input\_eecr\_account\_id) | enterpirse ecr source aws account number | `string` | `""` | no | | [loki\_endpoint](#input\_loki\_endpoint) | The internal endpoint for the loki service | `string` | n/a | yes | | [namespace](#input\_namespace) | Namespace in which to install open telemetry | `string` | `"telemetry"` | no | | [otel\_helm\_repo](#input\_otel\_helm\_repo) | Helm repo for official opentelemetry | `string` | `"https://open-telemetry.github.io/opentelemetry-helm-charts"` | no | | [otel\_helm\_version](#input\_otel\_helm\_version) | Which helm chart version of opentelemetry | `string` | `"0.71.2"` | no | +| [otel\_version](#input\_otel\_version) | Which version of opentelemetry | `string` | `"0.100.0"` | no | | [profile](#input\_profile) | AWS config profile | `string` | `""` | no | +| [rbac\_proxy\_version](#input\_rbac\_proxy\_version) | Which version of rbac\_proxy | `string` | `"0.100.0"` | no | | [region](#input\_region) | AWS region | `string` | n/a | yes | | [tags](#input\_tags) | AWS Tags to apply to appropriate resources | `map(string)` | `{}` | no | | [tempo\_endpoint](#input\_tempo\_endpoint) | Internal otlp endpoint of tempo | `string` | n/a | yes | diff --git a/copy_images.tf b/copy_images.tf index 1d6836c..f656bc0 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -1,24 +1,24 @@ locals { auto_instrumentation_java_name = "autoinstrumentation-java" - auto_instrumentation_java_version = "2.9.0" + auto_instrumentation_java_version = var.auto_instrumentation_java_version auto_instrumentation_java_key = format("%v#%v", local.auto_instrumentation_java_name, local.auto_instrumentation_java_version) collector_name = "opentelemetry-collector-k8s" - collector_version = "0.111.0-amd64" + collector_version = var.collector_version collector_key = format("%v#%v", local.collector_name, local.collector_version) collector_contrib_name = "opentelemetry-collector-contrib" - collector_contrib_version = "0.113.0-amd64" + collector_contrib_version = var.collector_contrib_version collector_contrib_key = format("%v#%v", local.collector_contrib_name, local.collector_contrib_version) ent_ecr_source = format("%v.%v.%v.%v", var.eecr_account_id, "dkr.ecr", var.region, "amazonaws.com/ent-images") otel_name = "opentelemetry-operator" - otel_version = "0.110.0" + otel_version = var.otel_version otel_key = format("%v#%v", local.otel_name, local.otel_version) rbac_proxy_name = "kube-rbac-proxy" - rbac_proxy_version = "v0.18.1" + rbac_proxy_version = var.rbac_proxy_version rbac_proxy_key = format("%v#%v", local.rbac_proxy_name, local.rbac_proxy_version) @@ -28,7 +28,7 @@ locals { dest_path = null name = local.otel_name source_image = local.otel_name - source_registry = format("%v/%v", local.ent_ecr_source, "docker") + source_registry = format("%v/%v", local.ent_ecr_source, "docker-io") source_tag = local.otel_version tag = local.otel_version }, @@ -37,7 +37,7 @@ locals { dest_path = null name = local.collector_name source_image = local.collector_name - source_registry = format("%v/%v", local.ent_ecr_source, "docker") + source_registry = format("%v/%v", local.ent_ecr_source, "docke-ior") source_tag = local.collector_version tag = local.collector_version }, @@ -46,7 +46,7 @@ locals { dest_path = null name = local.collector_contrib_name source_image = local.collector_contrib_name - source_registry = format("%v/%v", local.ent_ecr_source, "docker") + source_registry = format("%v/%v", local.ent_ecr_source, "docker-io") source_tag = local.collector_contrib_version tag = local.collector_contrib_version }, diff --git a/variables.tf b/variables.tf index d945735..32d37a5 100644 --- a/variables.tf +++ b/variables.tf @@ -4,11 +4,29 @@ variable "account_id" { default = "" } +variable "auto_instrumentation_java_version" { + description = "Which version of auto_instrumentation for java" + type = string + default = "2.9.0" +} + variable "cluster_name" { description = "EKS cluster name name component used through out the EKS cluster describing its purpose (ex: dice-dev)" type = string } +variable "collector_contrib_version" { + description = "Which version of collector_contrib" + type = string + default = "0.113.0" +} + +variable "collector_version" { + description = "Which version of collector" + type = string + default = "0.100.0" +} + variable "eecr_account_id" { description = "enterpirse ecr source aws account number" type = string @@ -38,12 +56,24 @@ variable "otel_helm_version" { default = "0.71.2" } +variable "otel_version" { + description = "Which version of opentelemetry" + type = string + default = "0.100.0" +} + variable "profile" { description = "AWS config profile" type = string default = "" } +variable "rbac_proxy_version" { + description = "Which version of rbac_proxy" + type = string + default = "0.100.0" +} + variable "region" { description = "AWS region" type = string