Skip to content

Commit

Permalink
add: fix webhook & Filter the istio VirtualService retries field
Browse files Browse the repository at this point in the history
Signed-off-by: 赵禹 <[email protected]>
  • Loading branch information
赵禹 committed Dec 11, 2023
1 parent 9dcf365 commit c9d31fe
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
1 change: 1 addition & 0 deletions config/webhook/manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ webhooks:
- rollouts.kruise.io
apiVersions:
- v1alpha1
- v1beta1
operations:
- CREATE
- UPDATE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ function GetRulesToPatch(spec, stableService, protocol)
local matchedRoutes = {}
if (spec[protocol] ~= nil) then
for _, rule in ipairs(spec[protocol]) do
if next(rule.retries) == nil then
rule.retries = nil
end
-- skip routes contain matches
if (rule.match == nil) then
for _, route in ipairs(rule.route) do
Expand All @@ -44,6 +47,13 @@ end

-- generate routes with matches, insert a rule before other rules, only support http headers, cookies etc.
function GenerateRoutesWithMatches(spec, matches, stableService, canaryService)
local http = spec.http
for _, rule in ipairs(http) do
if next(rule.retries) == nil then
rule.retries = nil
end
end

for _, match in ipairs(matches) do
local route = {}
route["match"] = {}
Expand Down Expand Up @@ -79,7 +89,7 @@ function GenerateRoutesWithMatches(spec, matches, stableService, canaryService)
else
route.route[1].destination.host = canaryService
end
table.insert(spec.http, 1, route)
table.insert(http, 1, route)
end
end

Expand Down

0 comments on commit c9d31fe

Please sign in to comment.