Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@morga471
morga471 committed Mar 13, 2025
1 parent 7c9a31e commit e3d15ce
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 51 deletions.
73 changes: 31 additions & 42 deletions lab/_envcommon/default-versions.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ locals {
#####################
# Namespaces Config
#####################
operator_namespace = "operator"
telemetry_namespace = "telemetry"
namespaces = {
cert-manager = "kube-system"
karpenter = "kube-system"
Expand All @@ -43,16 +45,6 @@ locals {
#####################
# EKS Config
#####################
operator_namespace = "operator"
telemetry_namespace = "telemetry"
# kubectl_image_tag = "1.30.4"

################
# k8s-dashboard
################
dashboard_hostname = "dashboard"
k8s_dashboard_metrics_scraper = "1.0.8"
k8s_dashboard_version = "6.0.6"

################
# Cert-Manager
Expand All @@ -62,29 +54,35 @@ locals {
cert_manager_controller_tag = "v${local.cert_manager_version}"
cert_manager_helm_chart = "${local.cert_manager_version}"
cert_manager_startupapicheck_tag = "v${local.cert_manager_version}"
cert_manager_version = "1.16.4"
cert_manager_version = "1.17.1"
cert_manager_webhook_tag = "v${local.cert_manager_version}"

################
# Grafana
################
download_dashboards_image_tag = "2.1.0"
grafana_chart_version = "8.10.1"
grafana_hostname = "grafana"
grafana_tag = "11.5.2"

################
# Istio
################
istio_namespace = "istio-system"
istio_version = "1.24.2"
istio_version = "1.25.0"

################
# Grafana
# k8s-dashboard
################
download_dashboards_image_tag = "7.85.0"
grafana_chart_version = "8.8.5"
grafana_hostname = "grafana"
grafana_tag = "11.4.0"
init_chown_data_image_tag = "1.31.1"
dashboard_hostname = "dashboard"
k8s_dashboard_metrics_scraper = "1.0.8"
k8s_dashboard_version = "6.0.6"

################
# Karpenter
################
karpenter_helm_chart = "1.1.1"
karpenter_tag = "1.1.1"
karpenter_helm_chart = "1.3.0"
karpenter_tag = "1.3.0"

################
# Keycloak
Expand All @@ -106,44 +104,35 @@ locals {
################
# Loki
################
loki_chart_version = "6.25.0"
loki_tag = "3.3.2"
loki_chart_version = "6.27.0"
loki_tag = "3.4.2"
canary_tag = "3.0.0"
enterprise_logs_provisioner_tag = "v1.7.0"
gateway_tag = "1.25.2-alpine"
memcached_tag = "1.6.23-alpine"
memcached_tag = "1.6.37"
exporter_tag = "v0.14.4"
sidecar_tag = "1.27.4"

################
# Metrics Server
################
metrics_server_helm_chart = "3.12.1"
metrics_server_tag = "v0.7.1"

################
# PostgreSQL
################
os_shell_tag = "12"
postgres_exporter_tag = "0.16.0"
postgresql_repmgr_tag = "17.4.0"
pgpool_tag = "4.5.5"
postgresql_chart_version = "15.3.0"
metrics_server_helm_chart = "3.12.2"
metrics_server_tag = "0.7.2"

################
# Prometheus
################
prometheus_chart_version = "25.26.0"
prometheus_server_tag = "v2.54.0"
prometheus_chart_version = "27.5.1"
prometheus_server_tag = "v3.2.1"
prometheus_config_reloader_tag = "v0.75.2"
alertmanager_tag = "v0.27.0"
kube_state_metrics_tag = "v2.13.0"
node_exporter_tag = "v1.8.2"
pushgateway_tag = "v1.9.0"
alertmanager_tag = "v0.28.0"
kube_state_metrics_tag = "v2.15.0"
node_exporter_tag = "v1.9.0"
pushgateway_tag = "v1.11.0"

################
# Tempo
################
tempo_chart_version = "1.18.1"
tempo_tag = "2.7.0"
tempo_chart_version = "1.18.2"
tempo_tag = "2.7.1"
}
5 changes: 3 additions & 2 deletions lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include "root" {
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=${include.root.inputs.release_version}"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git?ref=cicd"

extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
Expand All @@ -17,7 +17,8 @@ dependencies {
paths = [
"../eks",
"../eks-config",
"../eks-karpenter"
"../eks-karpenter",
"../eks-metrics-server",
]
}

Expand Down
3 changes: 2 additions & 1 deletion lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ include "root" {
dependencies {
paths = [
"../eks",
"../eks-karpenter"
"../eks-karpenter",
"../eks-metrics-server",
]
}

Expand Down
4 changes: 3 additions & 1 deletion lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ dependency "eks-istio" {

dependencies {
paths = [
"../eks",
"../eks-config",
"../eks-istio",
"../eks-karpenter"
"../eks-karpenter",
"../eks-metrics-server",
]
}

Expand Down
3 changes: 1 addition & 2 deletions lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include "root" {
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=${include.root.inputs.release_version}"
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-grafana.git?ref=namespaces"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20s"]
Expand Down Expand Up @@ -57,7 +57,6 @@ inputs = {
grafana_chart_version = include.root.inputs.grafana_chart_version
grafana_tag = include.root.inputs.grafana_tag
download_dashboards_image_tag = include.root.inputs.download_dashboards_image_tag
init_chown_data_image_tag = include.root.inputs.init_chown_data_image_tag
namespace = include.root.inputs.namespaces["grafana"]
service_name = "grafana"
}
4 changes: 3 additions & 1 deletion lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ terraform {
dependencies {
paths = [
"../eks",
"../eks-config"
"../eks-cert-manager",
"../eks-config",
"../eks-metrics-server",
]
}

Expand Down
5 changes: 4 additions & 1 deletion lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ terraform {
}

dependencies {
paths = ["../eks"]
paths = [
"../eks",
"../eks-metrics-server",
]
}

dependency "eks" {
Expand Down
1 change: 0 additions & 1 deletion lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-metrics-server/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ include "root" {
dependencies {
paths = [
"../eks",
"../eks-config"
]
}

Expand Down

0 comments on commit e3d15ce

Please sign in to comment.