Skip to content

Commit

Permalink
Merge pull request #8695 from zalando-incubator/alpha-to-beta
Browse files Browse the repository at this point in the history
alpha to beta
  • Loading branch information
katyanna authored Jan 2, 2025
2 parents d2a0194 + b7b6d77 commit f4c2ba9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions cluster/manifests/skipper/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{/* image-updater-bot detects *image variables so use print to disable it for main image */}}

{{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.21.224-1047" }}
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.224-1047" }}
{{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.21.240-1063" }}
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.240-1063" }}


{{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# {{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true" }}
# {{ $image := "container-registry.zalando.net/gwproxy/hostname-credentials-controller:main-14" }}
# {{ $image := "container-registry.zalando.net/gwproxy/hostname-credentials-controller:main-16" }}
# {{ $version := index (split $image ":") 1 }}
apiVersion: v1
kind: ServiceAccount
Expand Down
6 changes: 3 additions & 3 deletions cluster/node-pools/master-default/userdata.yaml
Original file line number Diff line number Diff line change
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.230
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.240
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.230
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.240
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.230
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.240
args:
- skipper
- -access-log-strip-query
Expand Down

0 comments on commit f4c2ba9

Please sign in to comment.