Skip to content

Commit d9e5ae8

Browse files
Merge dev to dev-to-kube-1.26
2 parents ce77cc6 + 03764cc commit d9e5ae8

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

cluster/manifests/01-admission-control/config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ data:
152152
{{- range $group, $provider := nodeLifeCycleProviderPerNodePoolGroup .Cluster.NodePools }}
153153
pod.node-lifecycle.provider.{{ $group }}: "{{ $provider }}"
154154
{{- end}}
155+
pod.node-lifecycle.provider.master: "zalando"
155156

156157
pod.runtime-policy.enable: "{{ .Cluster.ConfigItems.teapot_admission_controller_runtime_policy_enabled }}"
157158
pod.runtime-policy.default: "{{ .Cluster.ConfigItems.teapot_admission_controller_runtime_policy_default }}"

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-191
205+
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-194
206206
name: admission-controller
207207
lifecycle:
208208
preStop:

0 commit comments

Comments
 (0)