Skip to content

Commit

Permalink
Merge pull request #7150 from zalando-incubator/update-components-v1.26
Browse files Browse the repository at this point in the history
Update components to v1.26
  • Loading branch information
katyanna authored Mar 12, 2024
2 parents 3ae1d34 + c42c1a5 commit a68852f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
operator: Exists
containers:
- name: cluster-lifecycle-controller
image: container-registry.zalando.net/teapot/cluster-lifecycle-controller:master-35
image: container-registry.zalando.net/teapot/cluster-lifecycle-controller:master-36
args:
- --drain-grace-period={{.Cluster.ConfigItems.drain_grace_period}}
- --drain-min-pod-lifetime={{.Cluster.ConfigItems.drain_min_pod_lifetime}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
effect: NoSchedule
containers:
- name: controller
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-21
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-22
resources:
requests:
cpu: {{.Cluster.ConfigItems.kube_node_ready_controller_cpu}}
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/kube-node-ready/daemonset.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ $version := "master-29" }}
{{ $version := "master-30" }}

apiVersion: apps/v1
kind: DaemonSet
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/master-default/userdata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ write_files:
limits:
memory: {{ .Values.InstanceInfo.MemoryFraction (parseInt64 .Cluster.ConfigItems.apiserver_memory_limit_percent)}}
{{- end }}
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-196
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-197
name: admission-controller
lifecycle:
preStop:
Expand Down

0 comments on commit a68852f

Please sign in to comment.