Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

beta to stable #8602

Merged
merged 14 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cluster/config-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ skipper_default_filters: 'disableAccessLog(2,3,404,429) -> fifo(2000,20,"1s")'
# skipper_default_filters_authentication defines filters that implement default request authentication
skipper_default_filters_authentication: ''
skipper_default_filters_append: 'stateBagToTag("auth-user", "client.uid")'
skipper_disabled_filters: "static,bearerinjector,setRequestHeaderFromSecret"
skipper_disabled_filters: "static,bearerinjector,setRequestHeaderFromSecret,basicAuth"
skipper_lua_sources: "file"
skipper_edit_route_placeholders: ""
skipper_ingress_inline_routes: ""
Expand Down Expand Up @@ -1171,7 +1171,7 @@ sysctl_settings: ""
# must ensure that no existing resources should be annotated with a TTL.
# This can happen in the case where a test deployment is deployed to production
# as is. Currently, it's a no-op since kube-janitor doesn't run in production.
#
#
# This is needed until we can implement namespace prefix matching to reduce
# the scope of kube-janitor to a set of namespace names that aren't known
# at the time of enaling kube-janitor. Once the feature is in place, it would
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
effect: NoSchedule
containers:
- name: controller
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-29
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-30
resources:
requests:
cpu: {{.Cluster.ConfigItems.kube_node_ready_controller_cpu}}
Expand Down
2 changes: 2 additions & 0 deletions cluster/manifests/kubenurse/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ metadata:
labels:
application: kubernetes
component: kubenurse
annotations:
node-ready.cluster.zalando.org/exclude: "true"
name: kubenurse
namespace: kubenurse
spec:
Expand Down
2 changes: 1 addition & 1 deletion 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.220-1043" }}
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.220-1043" }}
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.224-1047" }}


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