Merge pull request #7030 from zalando-incubator/dev-to-kube-1.26

mikkeloscar · web-flow · commit ffbf6eb401ee · 2024-02-21T12:14:51.000+01:00
dev to kube-1.26
diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
@@ -317,7 +317,7 @@ skipper_open_policy_agent_styra_token: ""
 #   - production: runs the controller
 #
 fabric_gateway_controller_mode: "disabled"
-fabric_gateway_controller_version: "master-237"
+fabric_gateway_controller_version: "master-240"
 fabric_gateway_controller_cpu: "50m"
 fabric_gateway_controller_memory: "150Mi"
 fabric_gateway_crd_v1_enabled: "false"
diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml
@@ -1,5 +1,5 @@
 {{ $internal_version := "v0.20.5-813" }}
-{{ $canary_internal_version := "v0.20.5-813" }}
+{{ $canary_internal_version := "v0.20.15-824" }}
 
 {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
 {{ $canary_args := "" }}

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ skipper_open_policy_agent_styra_token: ""`
`317`	`317`	`# - production: runs the controller`
`318`	`318`	`#`
`319`	`319`	`fabric_gateway_controller_mode: "disabled"`
`320`		`-fabric_gateway_controller_version: "master-237"`
	`320`	`+fabric_gateway_controller_version: "master-240"`
`321`	`321`	`fabric_gateway_controller_cpu: "50m"`
`322`	`322`	`fabric_gateway_controller_memory: "150Mi"`
`323`	`323`	`fabric_gateway_crd_v1_enabled: "false"`