diff --git a/terraform/layer1-aws/outputs.tf b/terraform/layer1-aws/outputs.tf index 29e600af..9bf23d8a 100644 --- a/terraform/layer1-aws/outputs.tf +++ b/terraform/layer1-aws/outputs.tf @@ -103,6 +103,7 @@ output "eks_kubectl_console_config" { output "eks_config_map_aws_auth" { description = "A kubernetes configuration to authenticate to this EKS cluster." value = module.eks.config_map_aws_auth + sensitive = true } output "eks_cluster_id" { diff --git a/terraform/layer2-k8s/.terraform.lock.hcl b/terraform/layer2-k8s/.terraform.lock.hcl index 8475a946..4abb8b6f 100644 --- a/terraform/layer2-k8s/.terraform.lock.hcl +++ b/terraform/layer2-k8s/.terraform.lock.hcl @@ -73,6 +73,24 @@ provider "registry.terraform.io/hashicorp/null" { ] } +provider "registry.terraform.io/hashicorp/random" { + version = "3.1.0" + hashes = [ + "h1:rKYu5ZUbXwrLG1w81k7H3nce/Ys6yAxXhWcbtk36HjY=", + "zh:2bbb3339f0643b5daa07480ef4397bd23a79963cc364cdfbb4e86354cb7725bc", + "zh:3cd456047805bf639fbf2c761b1848880ea703a054f76db51852008b11008626", + "zh:4f251b0eda5bb5e3dc26ea4400dba200018213654b69b4a5f96abee815b4f5ff", + "zh:7011332745ea061e517fe1319bd6c75054a314155cb2c1199a5b01fe1889a7e2", + "zh:738ed82858317ccc246691c8b85995bc125ac3b4143043219bd0437adc56c992", + "zh:7dbe52fac7bb21227acd7529b487511c91f4107db9cc4414f50d04ffc3cab427", + "zh:a3a9251fb15f93e4cfc1789800fc2d7414bbc18944ad4c5c98f466e6477c42bc", + "zh:a543ec1a3a8c20635cf374110bd2f87c07374cf2c50617eee2c669b3ceeeaa9f", + "zh:d9ab41d556a48bd7059f0810cf020500635bfc696c9fc3adab5ea8915c1d886b", + "zh:d9e13427a7d011dbd654e591b0337e6074eef8c3b9bb11b2e39eaaf257044fd7", + "zh:f7605bd1437752114baf601bdf6931debe6dc6bfe3006eb7e9bb9080931dca8a", + ] +} + provider "registry.terraform.io/hashicorp/template" { version = "2.2.0" hashes = [ diff --git a/terraform/layer2-k8s/aws-ssm-gitlab-secrets.tf b/terraform/layer2-k8s/aws-ssm-gitlab-secrets.tf index a40d7352..0b8b0a47 100644 --- a/terraform/layer2-k8s/aws-ssm-gitlab-secrets.tf +++ b/terraform/layer2-k8s/aws-ssm-gitlab-secrets.tf @@ -4,7 +4,7 @@ locals { grafana_gitlab_client_id = data.aws_ssm_parameter.grafana_gitlab_client_id.value grafana_gitlab_client_secret = data.aws_ssm_parameter.grafana_gitlab_client_secret.value gitlab_registration_token = data.aws_ssm_parameter.gitlab_registration_token.value - alertmanager_slack_url = data.aws_ssm_parameter.alertmanager_slack_url + alertmanager_slack_url = data.aws_ssm_parameter.alertmanager_slack_url.value } data "aws_ssm_parameter" "kibana_gitlab_client_id" { diff --git a/terraform/layer2-k8s/templates/external-dns.yaml b/terraform/layer2-k8s/templates/external-dns.yaml index 88a4e911..d6e6da37 100644 --- a/terraform/layer2-k8s/templates/external-dns.yaml +++ b/terraform/layer2-k8s/templates/external-dns.yaml @@ -24,4 +24,4 @@ metrics: sources: - service - ingress - - istio-virtualservice +# - istio-virtualservice diff --git a/terraform/layer2-k8s/variables.tf b/terraform/layer2-k8s/variables.tf index 071b774c..4ca3d748 100644 --- a/terraform/layer2-k8s/variables.tf +++ b/terraform/layer2-k8s/variables.tf @@ -36,7 +36,7 @@ variable "oauth2_proxy_version" { # External DNS variable "external_dns_version" { description = "Version of external-dns helm chart" - default = "4.6.0" + default = "4.9.4" } # Cert Manager