Skip to content

Commit

Permalink
namespace changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@morga471
morga471 committed Mar 13, 2025
1 parent 77e8f9d commit 8356128
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 51 deletions.
1 change: 1 addition & 0 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 @@ -59,4 +59,5 @@ inputs = {
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"
}
114 changes: 63 additions & 51 deletions 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 @@ -4,95 +4,107 @@ include "root" {
expose = true
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=${include.root.inputs.release_version}"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20s"]
}
}

dependencies {
paths = [
"../eks",
"../eks-cert-manager",
"../eks-config",
"../eks-dns",
"../eks-istio",
"../eks-karpenter",
"../eks-prometheus",
"../eks-grafana",
"../eks-k8s-dashboard",
"../eks-istio",
"../eks-prometheus"
]
}

terraform {
source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-kiali.git?ref=mcmCluster"
extra_arguments "retry_lock" {
commands = get_terraform_commands_that_need_locking()
arguments = ["-lock-timeout=20s"]
}
}

dependency "eks" {
config_path = "../eks"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
cluster_name = "a-cluster-name"
cluster_name = "mock-cluster"
oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
}
}

dependency "eks-cert-manager" {
config_path = "../eks-cert-manager"
dependency "eks_config" {
config_path = "../eks-config"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
cluster_issuer_name = "mock-clusterissuer"
operators_namespace = "mock-namespace"
}
}

dependency "eks-prometheus" {
config_path = "../eks-prometheus"
dependency "eks_dns" {
config_path = "../eks-dns"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
prometheus_server_internal_endpoint = {
hostname = "prometheus.mock.svc.cluster.local"
port_number = 9090
url = "http://prometheus.mock.svc.cluster.local:9090/"
}
cluster_domain = "mock.example.com"
oidc_provider_arn = "arn:aws-us-gov:iam::123456789012:oidc-provider/mock"
}
}

dependency "eks-grafana" {
config_path = "../eks-grafana"
dependency "eks_grafana" {
config_path = "../eks-grafana"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
internal_endpoint = {
hostname = "grafana.mock.svc.cluster.local"
port_number = "80"
url = "https://grafana.mock.svc.cluster.local:80/"
}
namespace = "mock"
public_endpoint = "https://grafana.mock.mock.mock.census.gov:80/"
secret_name = "mock"
namespace = "grafana"
public_endpoint = {
hostname = "grafana.mock.lab.csp2.census.gov"
port_number = "80"
url = "https://grafana.mock.lab.csp2.census.gov:80/"
}
secret_name = "grafana"
}
}

dependency "eks_istio" {
config_path = "../eks-istio"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
namespace = "mock-namespace-istio"
}
}

dependency "eks_prometheus" {
config_path = "../eks-prometheus"
mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
mock_outputs = {
prometheus_internal_url = "mock-internal-url"
}
}

inputs = {
kiali_operator_version = include.root.inputs.kiali_operator_version
kiali_application_version = include.root.inputs.kiali_application_version
# AWS Configuration
account_id = include.root.inputs.aws_account_id
profile = include.root.inputs.aws_profile
region = include.root.inputs.aws_region

# Cluster Configuration
cluster_domain = dependency.eks_dns.outputs.cluster_domain
cluster_name = dependency.eks.outputs.cluster_name

profile = include.root.inputs.aws_profile
cluster_domain = dependency.eks.inputs.vpc_domain_name
operator_namespace = include.root.inputs.operator_namespace
cluster_name = dependency.eks.outputs.cluster_name
certificate_issuer = dependency.eks-cert-manager.outputs.cluster_issuer_name
prometheus_internal_url = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.url
grafana_internal_url = dependency.eks-grafana.outputs.internal_endpoint.url
grafana_namespace = dependency.eks-grafana.outputs.namespace
grafana_public_url = dependency.eks-grafana.outputs.public_endpoint
# grafana_secret_name = "grafana"
grafana_secret_name = dependency.eks-grafana.outputs.secret_name
jaeger_internal_url = ""
namespace = include.root.inputs.namespaces["kiali"]
# Kiali Configuration
service_name = "kiali"
namespace = include.root.inputs.namespaces["kiali"]
grafana_internal_url = dependency.eks_grafana.outputs.internal_endpoint.url
grafana_namespace = dependency.eks_grafana.outputs.namespace
grafana_secret_name = dependency.eks_grafana.outputs.secret_name
grafana_public_url = dependency.eks_grafana.outputs.public_endpoint

kiali_operator_version = include.root.inputs.kiali_operator_version
operator_namespace = dependency.eks_config.outputs.operator_namespace

# client_id = var.sso_client_id
# client_secret = var.sso_client_secret
# keycloak_public_url = var.keycloak_public_url
# gogatekeeper_chart_version = var.gogatekeeper_chart_version
# gogatekeeper_registry = var.gogatekeeper_registry
# gogatekeeper_repository = var.gogatekeeper_repository
# gogatekeeper_tag = var.gogatekeeper_tag
prometheus_internal_url = dependency.eks_prometheus.outputs.internal_endpoint.url
# jager_internal_url = dependency.eks_prometheus.outputs.jager_internal_url
}

0 comments on commit 8356128

Please sign in to comment.