Skip to content

Commit c6df785

Browse files
authored
Merge pull request #7867 from zalando-incubator/container-registry.zalando.net/teapot/deployment-controller
deployment-controller: Update to version master-222
2 parents f5ccd8f + d5dcfba commit c6df785

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

cluster/manifests/deployment-service/00-crd-cleanup-task.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ spec:
9797
status:
9898
description: CDPResourceCleanupTaskStatus is the status part of the CDPResourceCleanupTask.
9999
properties:
100+
finishedAt:
101+
description: |-
102+
The timestamp when this resource cleanup task has finished.
103+
The main purpose is to be able to determine age of finished tasks and clean them up.
104+
format: date-time
105+
type: string
100106
phase:
101107
default: Created
102108
description: |-

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-220"
32+
image: "container-registry.zalando.net/teapot/deployment-controller:master-222"
3333
args:
3434
- "--config-namespace=kube-system"
3535
- "--decrypt-kms-alias-arn=arn:aws:kms:{{ .Cluster.Region }}:{{ .Cluster.InfrastructureAccount | getAWSAccountID }}:alias/deployment-secret"

0 commit comments

Comments
 (0)