Skip to content

Commit 4e540b5

Browse files
committed
deployment-service: Inject source information tags in CF stacks
Signed-off-by: Mikkel Oscar Lyderik Larsen <[email protected]>
1 parent e0ec987 commit 4e540b5

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

cluster/config-defaults.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,13 @@ deployment_service_tokeninfo_url: ""
945945
deployment_service_lightstep_token: ""
946946
deployment_service_ml_experiments_enabled: "true"
947947
deployment_service_cf_auto_expand_enabled: "false"
948+
deployment_service_cf_update_source_branch_changes: "true"
949+
{{- if eq .Cluster.Environment "test" }}
950+
# disable CF update of source branch changes in test to avoid updating CF stacks
951+
# on any PR.
952+
deployment_service_cf_update_source_branch_changes: "false"
953+
{{- end }}
954+
948955

949956
# Will be dropped after the migration
950957
deployment_service_enabled: "true"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ data:
2020
ml-experiment-deployment-role-arn: "arn:aws:iam::{{accountID .Cluster.InfrastructureAccount}}:role/{{.Cluster.LocalID}}-deployment-service-ml-experiment-deployment"
2121
{{- end }}
2222
cloudformation-enable-auto-expand: "{{.Cluster.ConfigItems.deployment_service_cf_auto_expand_enabled}}"
23-
probe-for-traffic-segments: "{{.Cluster.ConfigItems.stackset_enable_traffic_segments}}"
23+
probe-for-traffic-segments: "{{.Cluster.ConfigItems.stackset_enable_traffic_segments}}"
24+
cloudformation-allow-update-source-branch-changes: "{{.Cluster.ConfigItems.deployment_service_cf_update_source_branch_changes}}"

cluster/manifests/deployment-service/controller-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
terminationGracePeriodSeconds: 300
3030
containers:
3131
- name: "deployment-service-controller"
32-
image: "container-registry.zalando.net/teapot/deployment-controller:master-165"
32+
image: "container-registry.zalando.net/teapot/deployment-controller:master-168"
3333
args:
3434
- "--config-namespace=kube-system"
3535
- "--decrypt-kms-alias-arn=arn:aws:kms:{{ .Cluster.Region }}:{{ .Cluster.InfrastructureAccount | getAWSAccountID }}:alias/deployment-secret"

cluster/manifests/deployment-service/status-service-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ $image := "container-registry.zalando.net/teapot/deployment-status-service" }}
2-
{{ $version := "master-165" }}
2+
{{ $version := "master-168" }}
33

44
apiVersion: apps/v1
55
kind: Deployment

0 commit comments

Comments
 (0)