Skip to content

Fix/prom template error and external dns timeout #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 1, 2021
Merged

Fix/prom template error and external dns timeout #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceb7cad
#18 fixed slack url
halfb00t Apr 1, 2021
2800f6f
#18 commecnted istio in external-dns, bunped version
halfb00t Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions terraform/layer1-aws/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
18 changes: 18 additions & 0 deletions terraform/layer2-k8s/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion terraform/layer2-k8s/aws-ssm-gitlab-secrets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/layer2-k8s/templates/external-dns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ metrics:
sources:
- service
- ingress
- istio-virtualservice
# - istio-virtualservice
2 changes: 1 addition & 1 deletion terraform/layer2-k8s/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down