Skip to content
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

Add TLS listener and config for s3 broker #3397

Merged
merged 1 commit into from
Sep 21, 2023
Merged

Add TLS listener and config for s3 broker #3397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions manifests/cf-manifest/operations.d/700-broker-ca.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: replace
path: /variables/-
value:
name: broker_tls_ca
type: certificate
options:
is_ca: true
common_name: "PaaS Broker CA"
20 changes: 16 additions & 4 deletions manifests/cf-manifest/operations.d/750-s3-broker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
path: /releases/-
value:
name: s3-broker
version: 0.1.19
url: https://s3-eu-west-1.amazonaws.com/gds-paas-build-releases/s3-broker-0.1.19.tgz
sha1: 91f190c89d77cc7aa1fc23c49209c742f4b31955
version: 0.1.21
url: https://s3-eu-west-1.amazonaws.com/gds-paas-build-releases/s3-broker-0.1.21.tgz
sha1: 31818e98cd5b420a64c9c695f866a97d7d8497f7

- type: replace
path: /addons/name=loggregator_agent/exclude/jobs/-
Expand All @@ -31,7 +31,7 @@
release: s3-broker
properties:
s3-broker:
port: 80
port: 443
basic_auth_username: s3-broker
basic_auth_password: ((secrets_s3_broker_admin_password))
log_level: INFO
Expand All @@ -40,6 +40,7 @@
iam_user_path: "/paas-s3-broker/"
iam_ip_restriction_policy_arn: "((terraform_outputs_s3_broker_ip_restriction_policy_arn))"
deploy_environment: "((environment))"
tls: ((secrets_s3_broker_tls_cert))
locket:
api_location: "locket.service.cf.internal:8891"
ca_cert: "((diego_locket_client.ca))"
Expand Down Expand Up @@ -87,3 +88,14 @@
value:
name: secrets_s3_broker_admin_password
type: password
- type: replace
path: /variables/-
value:
name: secrets_s3_broker_tls_cert
type: certificate
update_mode: converge
options:
ca: broker_tls_ca
common_name: "s3-broker.service.cf.internal"
alternative_names:
- "s3-broker.service.cf.internal"
7 changes: 3 additions & 4 deletions terraform/cloudfoundry/s3_broker.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ resource "aws_elb" "s3_broker" {
}

health_check {
target = "HTTP:80/healthcheck"
target = "HTTPS:443/healthcheck"
interval = var.health_check_interval
timeout = var.health_check_timeout
healthy_threshold = var.health_check_healthy
unhealthy_threshold = var.health_check_unhealthy
}

listener {
instance_port = 80
instance_protocol = "http"
instance_port = 443
instance_protocol = "https"
lb_port = 443
lb_protocol = "https"
ssl_certificate_id = data.aws_acm_certificate.system.arn
Expand All @@ -47,4 +47,3 @@ resource "aws_iam_policy" "s3_broker_user_ip_restriction" {
name = "${var.env}S3BrokerUserIpRestriction"
description = "Restricts S3 API Access to just the NAT Gateway IPs"
}