Skip to content

Commit 1545ff9

Browse files
authored
Merge pull request #9983 from zalando-incubator/beta-to-stable
beta to stable
2 parents 4ff17d9 + 9951db0 commit 1545ff9

File tree

28 files changed

+1332
-1385
lines changed

28 files changed

+1332
-1385
lines changed

cluster/manifests/02-admission-control/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
priorityClassName: system-cluster-critical
3434
containers:
3535
- name: admission-controller
36-
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-270
36+
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-274
3737
lifecycle:
3838
preStop:
3939
exec:

cluster/manifests/audittrail-adapter/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
hostNetwork: true
3939
containers:
4040
- name: audittrail-adapter
41-
image: container-registry.zalando.net/teapot/audittrail-adapter:master-80
41+
image: container-registry.zalando.net/teapot/audittrail-adapter:master-82
4242
env:
4343
- name: AWS_REGION
4444
value: "{{ .Cluster.Region }}"

cluster/manifests/cluster-lifecycle-controller/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
serviceAccountName: cluster-lifecycle-controller
3030
containers:
3131
- name: cluster-lifecycle-controller
32-
image: container-registry.zalando.net/teapot/cluster-lifecycle-controller:master-54
32+
image: container-registry.zalando.net/teapot/cluster-lifecycle-controller:master-55
3333
args:
3434
- --drain-grace-period={{.Cluster.ConfigItems.drain_grace_period}}
3535
- --drain-min-pod-lifetime={{.Cluster.ConfigItems.drain_min_pod_lifetime}}

cluster/manifests/cronjob-fixer/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
serviceAccountName: cronjob-fixer
2828
containers:
2929
- name: cronjob-fixer
30-
image: "container-registry.zalando.net/teapot/cronjob-fixer:master-26"
30+
image: "container-registry.zalando.net/teapot/cronjob-fixer:master-27"
3131
resources:
3232
limits:
3333
cpu: 5m

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-272"
32+
image: "container-registry.zalando.net/teapot/deployment-controller:master-273"
3333
args:
3434
- "--config-namespace=kube-system"
3535
- "--decrypt-kms-alias-arn=arn:aws:kms:{{ .Cluster.Region }}:{{ .Cluster.InfrastructureAccountID }}: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,4 +1,4 @@
1-
# {{ $image := "container-registry.zalando.net/teapot/deployment-status-service:master-272" }}
1+
# {{ $image := "container-registry.zalando.net/teapot/deployment-status-service:master-273" }}
22
# {{ $version := index (split $image ":") 1 }}
33

44
apiVersion: apps/v1

cluster/manifests/event-logger/statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
serviceAccountName: kubernetes-event-logger
3131
containers:
3232
- name: logger
33-
image: container-registry.zalando.net/teapot/event-logger:master-24
33+
image: container-registry.zalando.net/teapot/event-logger:master-25
3434
args:
3535
- --snapshot-namespace=kube-system
3636
- --snapshot-name=kubernetes-event-logger

cluster/manifests/fabric-gateway/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{ $image := "container-registry.zalando.net/gwproxy/fabric-gateway:master-352" }}
1+
# {{ $image := "container-registry.zalando.net/gwproxy/fabric-gateway:master-355" }}
22
# {{ $version := index (split $image ":") 1 }}
33
apiVersion: apps/v1
44
kind: Deployment

cluster/manifests/flannel/daemonset.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
component: flannel
1111
spec:
1212
updateStrategy:
13-
type: OnDelete
13+
type: RollingUpdate
1414
selector:
1515
matchLabels:
1616
daemonset: kube-flannel
@@ -39,7 +39,7 @@ spec:
3939
memory: 50Mi
4040
containers:
4141
- name: delayed-install-cni
42-
image: container-registry.zalando.net/teapot/flannel-awaiter:master-23
42+
image: container-registry.zalando.net/teapot/flannel-awaiter:master-24
4343
env:
4444
- name: NODE_NAME
4545
valueFrom:
@@ -112,7 +112,7 @@ spec:
112112
- /tc-flannel.sh
113113
command:
114114
- /bin/bash
115-
image: container-registry.zalando.net/teapot/flannel-tc:master-14
115+
image: container-registry.zalando.net/teapot/flannel-tc:master-15
116116
name: flannel-tc
117117
resources:
118118
requests:

cluster/manifests/kube-node-ready-controller/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
dnsPolicy: Default
4040
containers:
4141
- name: controller
42-
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-37
42+
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-38
4343
resources:
4444
requests:
4545
cpu: {{.Cluster.ConfigItems.kube_node_ready_controller_cpu}}

0 commit comments

Comments
 (0)