Skip to content

Commit f718f67

Browse files
Merge pull request #8812 from zalando-incubator/skipper/update-main-v0.21.257
skipper: update main to v0.21.257
2 parents e6352e3 + 0d0bee0 commit f718f67

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

cluster/config-defaults.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,11 @@ skipper_edit_route_placeholders: ""
132132
skipper_ingress_inline_routes: ""
133133
skipper_ingress_refuse_payload: ""
134134
skipper_endpointslices_enabled: "true"
135+
135136
skipper_kubernetes_annotation_predicates: ''
137+
skipper_kubernetes_annotation_filters_append: ''
136138
skipper_kubernetes_east_west_range_annotation_predicates: ''
139+
skipper_kubernetes_east_west_range_annotation_filters_append: ''
137140

138141
skipper_compress_encodings: "gzip,deflate,br"
139142

cluster/manifests/skipper/deployment.yaml

Lines changed: 5 additions & 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.21.247-1070" }}
3+
{{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.21.257-1079" }}
44
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.257-1079" }}
55

66

@@ -174,7 +174,9 @@ spec:
174174
- "-kubernetes-east-west-range-domains=ingress.cluster.local"
175175
- "-kubernetes-east-west-range-predicates=ClientIP(\"10.2.0.0/15\", \"{{ .Values.vpc_ipv4_cidr }}\")"
176176
- '-kubernetes-annotation-predicates={{ .Cluster.ConfigItems.skipper_kubernetes_annotation_predicates }}'
177+
- '-kubernetes-annotation-filters-append={{ .Cluster.ConfigItems.skipper_kubernetes_annotation_filters_append }}'
177178
- '-kubernetes-east-west-range-annotation-predicates={{ .Cluster.ConfigItems.skipper_kubernetes_east_west_range_annotation_predicates }}'
179+
- '-kubernetes-east-west-range-annotation-filters-append={{ .Cluster.ConfigItems.skipper_kubernetes_east_west_range_annotation_filters_append }}'
178180
- "-reverse-source-predicate"
179181
{{ end }}
180182
- "-proxy-preserve-host"
@@ -543,7 +545,9 @@ spec:
543545
- "-kubernetes-east-west-range-domains=ingress.cluster.local"
544546
- "-kubernetes-east-west-range-predicates=ClientIP(\"10.2.0.0/15\", \"{{ .Values.vpc_ipv4_cidr }}\")"
545547
- '-kubernetes-annotation-predicates={{ .Cluster.ConfigItems.skipper_kubernetes_annotation_predicates }}'
548+
- '-kubernetes-annotation-filters-append={{ .Cluster.ConfigItems.skipper_kubernetes_annotation_filters_append }}'
546549
- '-kubernetes-east-west-range-annotation-predicates={{ .Cluster.ConfigItems.skipper_kubernetes_east_west_range_annotation_predicates }}'
550+
- '-kubernetes-east-west-range-annotation-filters-append={{ .Cluster.ConfigItems.skipper_kubernetes_east_west_range_annotation_filters_append }}'
547551
- "-reverse-source-predicate"
548552
- "-default-filters-dir=/etc/config/default-filters"
549553
- '-default-filters-prepend={{ .Cluster.ConfigItems.skipper_default_filters }}'

0 commit comments

Comments
 (0)