Merge pull request #21 from maddevsio/fix/prom-template-error

halfb00t · web-flow · commit 574b98461917 · 2021-04-01T15:28:31.000+06:00
Fix/prom template error and external dns timeout
diff --git 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
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ output "eks_kubectl_console_config" {`
`103`	`103`	`output "eks_config_map_aws_auth" {`
`104`	`104`	`description = "A kubernetes configuration to authenticate to this EKS cluster."`
`105`	`105`	`value = module.eks.config_map_aws_auth`
	`106`	`+ sensitive = true`
`106`	`107`	`}`
`107`	`108`
`108`	`109`	`output "eks_cluster_id" {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ locals {`
`4`	`4`	`grafana_gitlab_client_id = data.aws_ssm_parameter.grafana_gitlab_client_id.value`
`5`	`5`	`grafana_gitlab_client_secret = data.aws_ssm_parameter.grafana_gitlab_client_secret.value`
`6`	`6`	`gitlab_registration_token = data.aws_ssm_parameter.gitlab_registration_token.value`
`7`		`- alertmanager_slack_url = data.aws_ssm_parameter.alertmanager_slack_url`
	`7`	`+ alertmanager_slack_url = data.aws_ssm_parameter.alertmanager_slack_url.value`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`data "aws_ssm_parameter" "kibana_gitlab_client_id" {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ variable "oauth2_proxy_version" {`
`36`	`36`	`# External DNS`
`37`	`37`	`variable "external_dns_version" {`
`38`	`38`	`description = "Version of external-dns helm chart"`
`39`		`- default = "4.6.0"`
	`39`	`+ default = "4.9.4"`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`# Cert Manager`