Skip to content

Commit 550aa42

Browse files
Merge dev to dev-to-kube-1.26
2 parents c3c9578 + ae09db2 commit 550aa42

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
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/manifests/skipper/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ $internal_version := "v0.20.5-813" }}
2-
{{ $canary_internal_version := "v0.20.15-824" }}
2+
{{ $canary_internal_version := "v0.20.15-825" }}
33

44
{{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
55
{{ $canary_args := "" }}

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)