Skip to content

Commit b865ca3

Browse files
authored
Merge pull request #6973 from zalando-incubator/dev-to-kube-1.26
dev to kube-1.26
2 parents d2d5a3f + 4685516 commit b865ca3

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
operator: Exists
3636
containers:
3737
- name: cluster-lifecycle-controller
38-
image: container-registry.zalando.net/teapot/cluster-lifecycle-controller:master-34
38+
image: container-registry.zalando.net/teapot/cluster-lifecycle-controller:master-35
3939
args:
4040
- --drain-grace-period={{.Cluster.ConfigItems.drain_grace_period}}
4141
- --drain-min-pod-lifetime={{.Cluster.ConfigItems.drain_min_pod_lifetime}}

cluster/manifests/coredns-local/daemonset-coredns.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
containers:
4040
{{ if eq .Cluster.ConfigItems.dns_cache "unbound" }}
4141
- name: unbound
42-
image: container-registry.zalando.net/teapot/unbound:1.19.0-master-7
42+
image: container-registry.zalando.net/teapot/unbound:1.19.1-master-8
4343
args:
4444
- -d
4545
- -c

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-168"
32+
image: "container-registry.zalando.net/teapot/deployment-controller:master-169"
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-168" }}
2+
{{ $version := "master-169" }}
33

44
apiVersion: apps/v1
55
kind: Deployment

cluster/manifests/kube-metrics-adapter/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
serviceAccountName: custom-metrics-apiserver
2828
containers:
2929
- name: kube-metrics-adapter
30-
image: container-registry.zalando.net/teapot/kube-metrics-adapter:v0.2.2
30+
image: container-registry.zalando.net/teapot/kube-metrics-adapter:v0.2.2-11-g91acacb
3131
env:
3232
- name: AWS_REGION
3333
value: {{ .Cluster.Region }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
effect: NoSchedule
3737
containers:
3838
- name: controller
39-
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-20
39+
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-21
4040
resources:
4141
requests:
4242
cpu: {{.Cluster.ConfigItems.kube_node_ready_controller_cpu}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{ $version := "master-27" }}
1+
{{ $version := "master-29" }}
22

33
apiVersion: apps/v1
44
kind: DaemonSet

cluster/node-pools/master-default/userdata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ write_files:
202202
limits:
203203
memory: {{ .Values.InstanceInfo.MemoryFraction (parseInt64 .Cluster.ConfigItems.apiserver_memory_limit_percent)}}
204204
{{- end }}
205-
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-190
205+
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-191
206206
name: admission-controller
207207
lifecycle:
208208
preStop:

0 commit comments

Comments
 (0)