diff --git a/README.md b/README.md index a631255..83ffbf2 100644 --- a/README.md +++ b/README.md @@ -99,9 +99,7 @@ sys 0m3.489s | [alertmanager\_tag](#input\_alertmanager\_tag) | The image tag of the alertmanager image. | `string` | `"v0.27.0"` | no | | [cluster\_name](#input\_cluster\_name) | The name of the cluster into which prometheus will be installed. | `string` | n/a | yes | | [eecr\_info](#input\_eecr\_info) | Enterprise ECR source information |
object({
account_id = string
alias = string
profile = string
region = string
}) | {
"account_id": "269222635945",
"alias": "lab-gov-shared-nonprod",
"profile": "269222635945-lab-gov-shared-nonprod",
"region": "us-gov-east-1"
} | no |
-| [kube\_state\_metrics\_tag](#input\_kube\_state\_metrics\_tag) | The image tag of the kube-state-metrics image. | `string` | `"v2.13.0"` | no |
| [namespace](#input\_namespace) | The namespace to install the prometheus components. Defaults to 'prometheus' | `string` | `"prometheus"` | no |
-| [node\_exporter\_tag](#input\_node\_exporter\_tag) | The image tag of the node-exporter image. | `string` | `"v1.8.2"` | no |
| [profile](#input\_profile) | AWS\_PROFILE to use to apply the terraform script. | `string` | `""` | no |
| [prometheus\_chart\_version](#input\_prometheus\_chart\_version) | The version of prometheus to install into the cluster. | `string` | `"25.26.0"` | no |
| [prometheus\_config\_reloader\_tag](#input\_prometheus\_config\_reloader\_tag) | The image tag of the prometheus-config-reloader image. | `string` | `"v0.75.2"` | no |
diff --git a/copy_images.tf b/copy_images.tf
index 47cff78..1b74503 100644
--- a/copy_images.tf
+++ b/copy_images.tf
@@ -4,12 +4,6 @@ locals {
ent_ecr_source = format("%v.%v.%v.%v", var.eecr_info.account_id, "dkr.ecr", var.region, "amazonaws.com/ent-images")
- ksm_name = "prometheus/kube-state-metrics"
- ksm_key = format("%v#%v", local.ksm_name, var.kube_state_metrics_tag)
-
- node_exporter_name = "prometheus/node-exporter"
- node_exporter_key = format("%v#%v", local.node_exporter_name, var.node_exporter_tag)
-
prom_config_reload_name = "prometheus/prometheus-config-reloader"
prom_config_reload_key = format("%v#%v", local.prom_config_reload_name, var.prometheus_config_reloader_tag)
@@ -47,30 +41,12 @@ locals {
source_tag = var.alertmanager_tag
tag = var.alertmanager_tag
},
- {
- enabled = true
- dest_path = null
- name = local.ksm_name
- source_image = "opensource/kubernetes/kube-state-metrics"
- source_registry = format("%v/%v", local.ent_ecr_source, "ironbank")
- source_tag = var.kube_state_metrics_tag
- tag = var.kube_state_metrics_tag
- },
- {
- enabled = true
- dest_path = null
- name = local.node_exporter_name
- source_image = "opensource/prometheus/node-exporter"
- source_registry = format("%v/%v", local.ent_ecr_source, "ironbank")
- source_tag = var.node_exporter_tag
- tag = var.node_exporter_tag
- },
{
enabled = true
dest_path = null
name = local.pushgateway_name
- source_image = "prometheus/pushgateway"
- source_registry = format("%v/%v", local.ent_ecr_source, "quay")
+ source_image = "opensource/prometheus/pushgateway"
+ source_registry = format("%v/%v", local.ent_ecr_source, "ironbank")
source_tag = var.pushgateway_tag
tag = var.pushgateway_tag
},
diff --git a/main.tf b/main.tf
index 8af0705..0f546ea 100644
--- a/main.tf
+++ b/main.tf
@@ -72,30 +72,6 @@ resource "helm_release" "prometheus" {
name = "alertmanager.persistence.storageClass"
value = var.rwo_storage_class
},
- {
- name = "kube-state-metrics.image.registry"
- value = module.images.images[local.ksm_key].dest_registry
- },
- {
- name = "kube-state-metrics.image.repository"
- value = module.images.images[local.ksm_key].dest_repository
- },
- {
- name = "kube-state-metrics.image.tag"
- value = module.images.images[local.ksm_key].tag
- },
- {
- name = "prometheus-node-exporter.image.registry"
- value = module.images.images[local.node_exporter_key].dest_registry
- },
- {
- name = "prometheus-node-exporter.image.repository"
- value = module.images.images[local.node_exporter_key].dest_repository
- },
- {
- name = "prometheus-node-exporter.image.tag"
- value = module.images.images[local.node_exporter_key].tag
- },
{
name = "prometheus-pushgateway.image.repository"
value = split(":", module.images.images[local.pushgateway_key].dest_full_path)[0]
@@ -104,6 +80,14 @@ resource "helm_release" "prometheus" {
name = "prometheus-pushgateway.image.tag"
value = module.images.images[local.pushgateway_key].tag
},
+ {
+ name = "kube-state-metrics.enabled"
+ value = "false"
+ },
+ {
+ name = "prometheus-node-exporter.enabled"
+ value = "false"
+ },
{
name = "server.resources.requests.cpu"
value = "100m"
diff --git a/variables.tf b/variables.tf
index 4563349..715be52 100644
--- a/variables.tf
+++ b/variables.tf
@@ -33,28 +33,12 @@ variable "eecr_info" {
}
}
-# The `APP VERSION` of the output:
-# helm search repo prometheus-community/kube-state-metrics
-variable "kube_state_metrics_tag" {
- description = "The image tag of the kube-state-metrics image."
- type = string
- default = "v2.13.0"
-}
-
variable "namespace" {
description = "The namespace to install the prometheus components. Defaults to 'prometheus'"
type = string
default = "prometheus"
}
-# The `APP VERSION` of the output:
-# helm search repo prometheus-community/prometheus-node-exporter
-variable "node_exporter_tag" {
- description = "The image tag of the node-exporter image."
- type = string
- default = "v1.8.2"
-}
-
variable "profile" {
description = "AWS_PROFILE to use to apply the terraform script."
type = string