Skip to content

Commit

Permalink
update ordering is istio is after otel
Browse files Browse the repository at this point in the history
  • Loading branch information
morga471 committed Apr 18, 2025
1 parent 25df5e1 commit 3d81059
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 110 deletions.
4 changes: 0 additions & 4 deletions .github/platform-tg-infra.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
"name": "tfmod-ersi-arcgis",
"path": "../../tfmod-ersi-arcgis"
},
{
"name": "tfmod-gogatekeeper",
"path": "../../tfmod-gogatekeeper"
},
{
"name": "tfmod-grafana",
"path": "../../tfmod-grafana"
Expand Down
5 changes: 3 additions & 2 deletions lab/_envcommon/default-versions.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ locals {
grafana_operator_chart_version = "4.9.8"
grafana_operator_tag = "5.16.0"
grafana_tag = "11.5.2"
os_shell_image_tag = "12"
os_shell_image_tag = local.utilities_tag

################
# Istio
Expand Down Expand Up @@ -139,6 +139,7 @@ locals {
keycloak_username = "keycloak"
keycloak_password = "this is my very secure and totally random password horse battery staple now"
postgresql_tag = "17.4.0-debian-12-r2"
utilities_tag = "1.0.3"

################
# Kiali
Expand Down Expand Up @@ -166,7 +167,7 @@ locals {
################
# PostgreSQL
################
os_shell_tag = "12"
os_shell_tag = local.utilities_tag
postgres_exporter_tag = "0.16.0"
postgresql_repmgr_tag = "17.4.0-alpine"
pgpool_tag = "4.5.5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@ locals {
eks_ng_desired_size = 2
eks_ng_max_size = 10
eks_ng_min_size = 2
organization = "census:ocio:csvd"
finops_project_name = "csvd_platformbaseline"
finops_project_number = "fs0000000078"
finops_project_role = "csvd_platformbaseline_app"
organization = "census:ocio:csvd"
finops_project_name = "csvd_platformbaseline"
finops_project_number = "fs0000000078"
finops_project_role = "csvd_platformbaseline_app"

tags = {
"slim:schedule" = "8:00-17:00"
"cluster:size" = "min:${local.eks_ng_min_size}-max:${local.eks_ng_max_size}-desired:${local.eks_ng_desired_size}"
}
module_enablement_overrides = {
"eks-arcgis" = false
"eks-arcgis" = false
"eks-postgresql" = false
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dependencies {
paths = [
"../eks",
"../eks-cert-manager",
"../eks-otel"
]
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,9 @@ inputs = {
cluster_domain = dependency.eks_dns.outputs.cluster_domain
cluster_name = dependency.eks.outputs.cluster_name
eecr_account_id = include.root.inputs.eecr_account_id

namespace = include.root.inputs.namespaces["keycloak"]
# AWS Configuration
account_id = include.root.inputs.aws_account_id
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region
namespace = include.root.inputs.namespaces["keycloak"]
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region

# keycloak config
default_storage_class = dependency.eks_config.outputs.rwo_storage_class
Expand All @@ -79,6 +76,7 @@ inputs = {
realm_username = include.root.inputs.keycloak_username
service_name = "keycloak"
telemetry_namespace = include.root.inputs.telemetry_namespace
admin_email = include.root.inputs.cluster_mailing_list

# # Database configuration
keycloak_database = include.root.inputs.keycloak_database
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ inputs = {
# AWS Configuration
account_id = include.root.inputs.aws_account_id
eecr_account_id = include.root.inputs.eecr_account_id
eecr_profile = include.root.inputs.eecr_profile
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dependencies {
paths = [
"../eks",
"../eks-config",
"../eks-karpenter",
"../eks-metrics-server",
]
}
Expand Down

0 comments on commit 3d81059

Please sign in to comment.