update image sources

README.md

@@ -47,13 +47,18 @@ This modules installs the OpenTelemetry Collector operator and two Collectors. O
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_account_id"></a> [account\_id](#input\_account\_id) | aws account number | `string` | `""` | no |
+| <a name="input_auto_instrumentation_java_version"></a> [auto\_instrumentation\_java\_version](#input\_auto\_instrumentation\_java\_version) | Which version of auto\_instrumentation for java | `string` | `"2.9.0"` | no |
 | <a name="input_cluster_name"></a> [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 |
+| <a name="input_collector_contrib_version"></a> [collector\_contrib\_version](#input\_collector\_contrib\_version) | Which version of collector\_contrib | `string` | `"0.113.0"` | no |
+| <a name="input_collector_version"></a> [collector\_version](#input\_collector\_version) | Which version of collector | `string` | `"0.100.0"` | no |
 | <a name="input_eecr_account_id"></a> [eecr\_account\_id](#input\_eecr\_account\_id) | enterpirse ecr source aws account number | `string` | `""` | no |
 | <a name="input_loki_endpoint"></a> [loki\_endpoint](#input\_loki\_endpoint) | The internal endpoint for the loki service | `string` | n/a | yes |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | Namespace in which to install open telemetry | `string` | `"telemetry"` | no |
 | <a name="input_otel_helm_repo"></a> [otel\_helm\_repo](#input\_otel\_helm\_repo) | Helm repo for official opentelemetry | `string` | `"https://open-telemetry.github.io/opentelemetry-helm-charts"` | no |
 | <a name="input_otel_helm_version"></a> [otel\_helm\_version](#input\_otel\_helm\_version) | Which helm chart version of opentelemetry | `string` | `"0.71.2"` | no |
+| <a name="input_otel_version"></a> [otel\_version](#input\_otel\_version) | Which version of opentelemetry | `string` | `"0.100.0"` | no |
 | <a name="input_profile"></a> [profile](#input\_profile) | AWS config profile | `string` | `""` | no |
+| <a name="input_rbac_proxy_version"></a> [rbac\_proxy\_version](#input\_rbac\_proxy\_version) | Which version of rbac\_proxy | `string` | `"0.100.0"` | no |
 | <a name="input_region"></a> [region](#input\_region) | AWS region | `string` | n/a | yes |
 | <a name="input_tags"></a> [tags](#input\_tags) | AWS Tags to apply to appropriate resources | `map(string)` | `{}` | no |
 | <a name="input_tempo_endpoint"></a> [tempo\_endpoint](#input\_tempo\_endpoint) | Internal otlp endpoint of tempo | `string` | n/a | yes |

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
     },

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