Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
@morga471
morga471 committed Mar 12, 2025
1 parent 0581d08 commit d9135bd
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 38 deletions.
4 changes: 4 additions & 0 deletions .github/platform-tg-infra.code-workspace
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@
"name": "tfmod-metrics-server",
"path": "../../tfmod-metrics-server"
},
{
"name": "tfmod-open-telemetry",
"path": "../../tfmod-open-telemetry"
},
{
"name": "tfmod-prometheus",
"path": "../../tfmod-prometheus"
Expand Down
12 changes: 6 additions & 6 deletions lab/_envcommon/default-versions.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ locals {
custom_service_eks_account = "${local.release_version}"
eks_module_version = "20.33.1"
istio_ingress_version = "${local.release_version}"
release_version = "main" # "main" # change to main when testing updated modules
release_version = "mcmCluster" # "main" # change to main when testing updated modules

#####################
# TF Providers
Expand Down Expand Up @@ -61,7 +61,7 @@ locals {
################
# GoGatekeeper
################
gogatekeeper_tag = "3.2.1"
gogatekeeper_tag = "3.2.1"
gogatekeeper_chart_version = "0.1.53"

################
Expand Down Expand Up @@ -98,10 +98,10 @@ locals {
keycloak_chart_version = "24.4.11"
keycloak_tag = "26.1.3"
keycloak_hostname = "keycloak"
keycloak_database = "bitnami_keycloak"
keycloak_username = "bn_keycloak"
keycloak_password = "this is my very secure and totally random password horse battery staple now"
postgresql_tag = "17.4.0-debian-12-r2"
keycloak_database = "bitnami_keycloak"
keycloak_username = "bn_keycloak"
keycloak_password = "this is my very secure and totally random password horse battery staple now"
postgresql_tag = "17.4.0-debian-12-r2"

################
# Kiali
Expand Down
14 changes: 7 additions & 7 deletions lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-gogatekeeper/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@ dependency "eks_dns" {
config_path = "../eks-dns"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
cluster_domain = "mock.example.com"
cluster_domain = "mock.example.com"
}
}

dependency "eks_grafana" {
config_path = "../eks-grafana"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
public_endpoint = "mock.grafaba.example.com"
public_endpoint = "mock.grafaba.example.com"
}
}

dependency "eks_keycloak" {
config_path = "../eks-keycloak"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
public_endpoint = "mock.keycloak.example.com"
public_endpoint = "mock.keycloak.example.com"
}
}

Expand All @@ -63,15 +63,15 @@ inputs = {
region = include.root.inputs.aws_region

# Gatekeeper Config
gogatekeeper_tag = include.root.inputs.gogatekeeper_tag
gogatekeeper_tag = include.root.inputs.gogatekeeper_tag
gogatekeeper_chart_version = include.root.inputs.gogatekeeper_chart_version
keycloak_public_url = dependency.eks_keycloak.outputs.public_endpoint
keycloak_public_url = dependency.eks_keycloak.outputs.public_endpoint

# Service Behind Gatekeeper Config
service_name = "grafana"
service_name = "grafana"
redirection_url = dependency.eks_grafana.outputs.public_endpoint
# client_id = dependency.eks_keycloak.outputs.client_id
# client_secret = dependency.eks_keycloak.outputs.client_secret
client_id = "client_id"
client_id = "client_id"
client_secret = "client_secret"
}
6 changes: 3 additions & 3 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 @@ -25,16 +25,16 @@ dependency "eks_dns" {
config_path = "../eks-dns"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
cluster_domain = "mock.domain.example.com"
cluster_domain = "mock.domain.example.com"
}
}

dependency "eks_loki" {
config_path = "../eks-loki"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
rwo_storage_class = "gp3-mocked"
loki_internal_endpoint = {
rwo_storage_class = "gp3-mocked"
gateway_internal_endpoint = {
url = "mock.loki.enpoint.example.com"
}
}
Expand Down
2 changes: 1 addition & 1 deletion lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-keycloak/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ inputs = {

# # Database configuration
keycloak_database = include.root.inputs.keycloak_database
keycloak_user = include.root.inputs.keycloak_username
keycloak_user = include.root.inputs.keycloak_username
keycloak_password = include.root.inputs.keycloak_password

# Project information
Expand Down
1 change: 0 additions & 1 deletion lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-kiali/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ dependencies {
paths = [
"../eks",
"../eks-config",
"../eks-dns",
"../eks-grafana",
"../eks-istio",
"../eks-prometheus"
Expand Down
1 change: 0 additions & 1 deletion lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-loki/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies {
"../eks",
"../eks-config",
"../eks-metrics-server",
"../eks-dns"
]
}

Expand Down
12 changes: 6 additions & 6 deletions lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-otel/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ dependency "eks-loki" {
config_path = "../eks-loki"
mock_outputs = {
gateway_internal_endpoint = {
hostname = "loki-gateway.telemetry.svc.cluster.local"
portNumber = "80"
url = "http://loki-gateway.telemetry.svc.cluster.local:80/"
hostname = "loki-gateway.mock.svc.cluster.local"
portNumber = 3210
url = "http://loki-gateway.mock.svc.cluster.local:3210/"
}
}
}
Expand All @@ -44,9 +44,9 @@ dependency "eks-tempo" {
config_path = "../eks-tempo"
mock_outputs = {
tempo_otlp_endpoint = {
hostname = "tempo.telemetry.svc.cluster.local"
portNumber = 4317
url = "http://tempo.telemetry.svc.cluster.local:4317/"
hostname = "tempo.mock.svc.cluster.local"
portNumber = 1234
url = "http://tempo.mock.svc.cluster.local:1234/"
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-prometheus/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ dependencies {
"../eks",
"../eks-config",
"../eks-metrics-server",
"../eks-dns"
]
}

Expand All @@ -30,7 +29,7 @@ dependency "eks" {
}
}

dependency "eks-config" {
dependency "eks_config" {
config_path = "../eks-config"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
Expand All @@ -57,5 +56,5 @@ inputs = {
namespace = include.root.inputs.namespaces["prometheus"]
node_exporter_tag = include.root.inputs.node_exporter_tag
pushgateway_tag = include.root.inputs.pushgateway_tag
rwo_storage_class = dependency.eks-config.outputs.rwo_storage_class
rwo_storage_class = dependency.eks_config.outputs.rwo_storage_class
}
4 changes: 2 additions & 2 deletions lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-tempo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ dependency "eks-prometheus" {
mock_outputs = {
prometheus_namespace = "prometheus"
prometheus_server_internal_endpoint = {
hostname = "prometheus-server.prometheus.svc.cluster.local"
hostname = "prometheus-server.mock.svc.cluster.local"
port_number = 9090
url = "http://prometheus-server.prometheus.svc.cluster.local:9090/"
url = "http://prometheus-server.mock.svc.cluster.local:9090/"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions lab/development/us-gov-east-1/vpc/platform-eng-eks-srn/eks-keycloak/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependency "eks_postgresql" {
config_path = "../eks-postgresql"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
internal_endpoint = {
internal_endpoint = {
url = "mock-internal-endpoint-url"
}
}
Expand Down Expand Up @@ -76,10 +76,10 @@ inputs = {
telemetry_namespace = include.root.inputs.telemetry_namespace

# Database configuration
db_host = dependency.eks_postgresql.outputs.internal_endpoint.url
db_name = include.root.inputs.postgresql_database
db_host = dependency.eks_postgresql.outputs.internal_endpoint.url
db_name = include.root.inputs.postgresql_database
db_password = include.root.inputs.postgresql_password
db_user = include.root.inputs.postgresql_username
db_user = include.root.inputs.postgresql_username

# Project information
project_name = include.root.inputs.project_name
Expand Down
6 changes: 3 additions & 3 deletions lab/development/us-gov-east-1/vpc/platform-eng-eks-srn/eks-tempo/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ dependency "eks-prometheus" {
config_path = "../eks-prometheus"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
prometheus_svc = "prometheus-server"
prometheus_svc = "prometheus-server"
prometheus_namespace = "prometheus"
prometheus_port = 80
prometheus_port = 80
prometheus_server_internal_endpoint = {
hostname = "prometheus-server.prometheus.svc.cluster.local"
port_number = 9090
Expand Down Expand Up @@ -55,7 +55,7 @@ inputs = {
oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn

# Prometheus Configuration
prometheus_svc = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.hostname
prometheus_svc = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.hostname
prometheus_namespace = dependency.eks-prometheus.outputs.prometheus_namespace
prometheus_port = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.port_number

Expand Down
2 changes: 1 addition & 1 deletion lab/development/us-gov-east-1/vpc/platform-test-z/eks-kiali/terragrunt.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ inputs = {

# grafana_secret_name = dependency.eks-grafana.outputs.secret_name
tempo_internal_url = dependency.eks-tempo.outputs.tempo_internal_endpoint.url
namespace = include.root.inputs.namespaces["kiali"]
namespace = include.root.inputs.namespaces["kiali"]


# client_id = var.sso_client_id
Expand Down

0 comments on commit d9135bd

Please sign in to comment.