Skip to content

Commit

Permalink
Merge beta to beta-to-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
k8s-on-aws-manager-app[bot] authored Oct 8, 2024
2 parents 3d9a124 + 5f60085 commit 4111e9d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cluster/node-pools/master-default/userdata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,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-218
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-219
name: admission-controller
lifecycle:
preStop:
Expand Down Expand Up @@ -247,7 +247,7 @@ write_files:
name: admission-controller-kubeconfig
readOnly: true
- name: skipper-admission-webhook
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.212
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.216
args:
- webhook
- --address=:9085
Expand Down Expand Up @@ -424,7 +424,7 @@ write_files:
value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }}
{{ end }}
- name: skipper-proxy
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.212
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.216
args:
- skipper
- -access-log-strip-query
Expand Down Expand Up @@ -475,7 +475,7 @@ write_files:
name: ssl-certs-kubernetes
readOnly: true
- name: skipper-metrics
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.212
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.216
args:
- skipper
- -access-log-strip-query
Expand Down

0 comments on commit 4111e9d

Please sign in to comment.