Skip to content

Commit 02c27f1

Browse files
authored
Merge pull request #9702 from zalando-incubator/dev-to-alpha
dev to alpha
2 parents c4e93f3 + 28467be commit 02c27f1

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

cluster/manifests/fabric-gateway/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{ $image := "container-registry.zalando.net/gwproxy/fabric-gateway:master-333" }}
1+
# {{ $image := "container-registry.zalando.net/gwproxy/fabric-gateway:master-334" }}
22
# {{ $version := index (split $image ":") 1 }}
33
apiVersion: apps/v1
44
kind: Deployment

cluster/manifests/ingress-controller/deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{ $image := "926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/kube-ingress-aws-controller:v0.17.7" }}
1+
# {{ $image := "926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/kube-ingress-aws-controller:v0.18.3" }}
22
# {{ $version := index (split $image ":") 1 }}
33

44
apiVersion: apps/v1
@@ -75,9 +75,9 @@ spec:
7575
requests:
7676
cpu: 50m
7777
memory: 4Gi
78-
{{- if eq .Cluster.Provider "zalando-eks"}}
78+
# {{ if eq .Cluster.Provider "zalando-eks" }}
7979
tolerations:
8080
- key: dedicated
8181
value: cluster-seed
8282
effect: NoSchedule
83-
{{- end}}
83+
# {{ end }}

cluster/manifests/skipper/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{/* image-updater-bot detects *image variables so use print to disable it for main image */}}
22

3-
{{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.22.59-1166" }}
3+
{{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.22.62-1169" }}
44
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.22.62-1169" }}
55

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

cluster/manifests/skipper/hostname-credentials-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# {{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true" }}
2-
# {{ $image := "container-registry.zalando.net/gwproxy/hostname-credentials-controller:main-24" }}
2+
# {{ $image := "container-registry.zalando.net/gwproxy/hostname-credentials-controller:main-27" }}
33
# {{ $version := index (split $image ":") 1 }}
44
apiVersion: v1
55
kind: ServiceAccount

0 commit comments

Comments
 (0)