This repository was archived by the owner on Apr 1, 2025. It is now read-only.
File tree 6 files changed +11
-45
lines changed
6 files changed +11
-45
lines changed Original file line number Diff line number Diff line change @@ -11,12 +11,21 @@ resource "kubernetes_namespace" "qareports_k8s_namespace" {
11
11
}
12
12
}
13
13
14
+ #
15
+ # Use a manually-created, ACM-issued, DNS-validated certificate
16
+ #
17
+ data "aws_acm_certificate" "qareports_acm_certificate" {
18
+ domain = " ${ var . canonical_dns_name } "
19
+ types = [" AMAZON_ISSUED" ]
20
+ most_recent = true
21
+ }
22
+
14
23
resource "kubernetes_service" "qareports_web_service" {
15
24
metadata {
16
25
name = " qareports-web-service"
17
26
namespace = " qareports-${ var . environment } "
18
27
annotations {
19
- " service.beta.kubernetes.io/aws-load-balancer-ssl-cert" = " ${ aws_acm_certificate . qareports_acm_certificate . arn } "
28
+ " service.beta.kubernetes.io/aws-load-balancer-ssl-cert" = " ${ data . aws_acm_certificate . qareports_acm_certificate . arn } "
20
29
" service.beta.kubernetes.io/aws-load-balancer-backend-protocol" = " http"
21
30
" service.beta.kubernetes.io/aws-load-balancer-ssl-ports" = " 443"
22
31
}
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1
1
environment = " production"
2
2
canonical_dns_name = " qa-reports.linaro.org"
3
- dns_name = " qa-reports.ctt.linaro.org"
4
3
mq_node_type = " t3.micro"
5
4
db_node_type = " t3.xlarge"
6
5
db_storage = 749
7
6
db_max_storage = 3000
8
- db_engine_version = " 9.6.18 "
7
+ db_engine_version = " 12.3 "
9
8
db_parameter_group = " default.postgres12"
10
- dns_validation_method = " EMAIL"
Original file line number Diff line number Diff line change 1
1
environment = " staging"
2
2
canonical_dns_name = " staging-qa-reports.linaro.org"
3
- dns_name = " staging-qa-reports.ctt.linaro.org"
4
3
mq_node_type = " t3a.nano"
5
4
db_node_type = " t2.medium"
6
5
db_storage = 500
7
6
db_max_storage = 750
8
7
db_engine_version = " 12.3"
9
8
db_parameter_group = " default.postgres12"
10
- dns_validation_method = " EMAIL"
Original file line number Diff line number Diff line change 1
1
environment = " testing"
2
2
canonical_dns_name = " testing-qa-reports.linaro.org"
3
- dns_name = " testing-qa-reports.ctt.linaro.org"
4
3
mq_node_type = " t3.nano"
5
4
db_node_type = " t3.medium"
6
5
db_storage = 500
7
6
db_max_storage = 600
8
7
db_engine_version = " 12.3"
9
8
db_parameter_group = " default.postgres12"
10
- dns_validation_method = " EMAIL"
Original file line number Diff line number Diff line change @@ -20,8 +20,6 @@ variable "db_username" { type = "string" }
20
20
variable "db_password" { type = " string" }
21
21
variable "route53_zone_id" { type = " string" }
22
22
variable "canonical_dns_name" { type = " string" }
23
- variable "dns_name" { type = " string" }
24
- variable "dns_validation_method" { type = " string" }
25
23
variable "openid_provider_arn" { type = " string" }
26
24
variable "openid_provider_url" { type = " string" }
27
25
You can’t perform that action at this time.
0 commit comments