Skip to content

Commit b28edaa

Browse files
author
Martin Linkhorst
committed
make deployment-service's S3 bucket name configurable
1 parent ce02edb commit b28edaa

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

cluster/cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1528,7 +1528,7 @@ Resources:
15281528
Type: AWS::S3::Bucket
15291529
DeletionPolicy: Delete
15301530
Properties:
1531-
BucketName: "zalando-deployment-service-{{accountID .Cluster.InfrastructureAccount}}-{{.Cluster.LocalID}}"
1531+
BucketName: "{{ .Cluster.ConfigItems.deployment_service_bucket_name }}"
15321532
PublicAccessBlockConfiguration:
15331533
BlockPublicAcls: true
15341534
BlockPublicPolicy: true

cluster/config-defaults.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,6 +1044,7 @@ deployment_service_cf_auto_expand_enabled: "false"
10441044
deployment_service_cf_update_source_branch_changes: "true"
10451045
deployment_service_executor_cdp_permissions: "false"
10461046
deployment_service_skip_mustache_rendering: "true"
1047+
deployment_service_bucket_name: "zalando-deployment-service-{{ .Cluster.InfrastructureAccount | getAWSAccountID }}-{{ .Cluster.LocalID }}"
10471048
{{- if eq .Cluster.Environment "test" }}
10481049
# disable CF update of source branch changes in test to avoid updating CF stacks
10491050
# on any PR.

cluster/manifests/deployment-service/01-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ data:
4242
oidc-trust-relationship-template: '{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Principal":{"Federated":"{{$oidc_provider_arn_aws}}"},"Action":"sts:AssumeRoleWithWebIdentity","Condition":{"StringLike":{"{{$oidc_subject_key_aws}}":"system:serviceaccount:${SERVICE_ACCOUNT}"}}}]}'
4343
{{- end }}
4444
{{- end }}
45-
s3-bucket-name: "zalando-deployment-service-{{accountID .Cluster.InfrastructureAccount}}-{{.Cluster.LocalID}}"
45+
s3-bucket-name: "{{ .Cluster.ConfigItems.deployment_service_bucket_name }}"
4646
status-service-url: "https://depl-status-{{.Cluster.Alias}}.{{.Values.hosted_zone}}"
4747
status-service-url-local: "http://deployment-status-service.ingress.cluster.local."
4848
deployment-role-arn: "arn:aws:iam::{{accountID .Cluster.InfrastructureAccount}}:role/{{.Cluster.LocalID}}-deployment-service-deployment"

0 commit comments

Comments
 (0)