Skip to content

Commit c08e018

Browse files
authored
Merge pull request #7036 from zalando-incubator/ephemeralcontainers-admission
Add admission for ephemeralcontainers
2 parents e15b232 + 95f1037 commit c08e018

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ webhooks:
1818
- operations: [ "CREATE", "UPDATE" ]
1919
apiGroups: [""]
2020
apiVersions: ["v1"]
21-
resources: ["pods"]
21+
resources: ["pods", "pods/ephemeralcontainers"]
2222
{{- if eq .Cluster.ConfigItems.teapot_admission_controller_inject_environment_variables "true" }}
2323
- name: pod-binding-admitter.teapot.zalan.do
2424
clientConfig:

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

0 commit comments

Comments
 (0)