fix: respect all required demands in azure pipeline scaler #4405

EugeneLugovtsov · 2023-03-23T20:15:42Z

Fix issue with Azure Pipelines Scaler. When Azure DevOps does not provide Agent.Version keda may scale a wrong agent.

Checklist

When introducing a new scaler, I agree with the scaling governance policy
I have verified that my change is according to the deprecations & breaking changes policy
Tests have been added
Changelog has been updated and is aligned with our changelog requirements
A PR is opened to update our Helm chart (repo) (if applicable, ie. when deployment manifests are modified)
A PR is opened to update the documentation on (repo) (if applicable)
Commits are signed with Developer Certificate of Origin (DCO - learn more)

Fixes #
#4404
Relates to #

Signed-off-by: Eugene Lugovtsov <lug.zhenia@gmail.com>

EugeneLugovtsov · 2023-03-24T06:53:48Z

@zroubalik may I ask you to review this PR?

JorTurFer · 2023-03-26T20:16:51Z

@Eldarrin, could you take a look?

Eldarrin

Can you replace the function with this and resubmit, may fix the issue.

`
func stripAgentVFromArray(array []string) []string {
var result []string
for _, item := range array {
if !strings.HasPrefix(item, "Agent.Version") {
result = append(result, item)
}
}
return result
}

func getCanAgentDemandFulfilJob(jr JobRequest, metadata *azurePipelinesMetadata) bool {
countDemands := 0
demandsInJob := stripAgentVFromArray(jr.Demands)
demandsInScaler := stripAgentVFromArray(strings.Split(metadata.demands, ","))
for _, demandInJob := range demandsInJob {
for _, demandInScaler := range demandsInScaler {
if demandInJob == demandInScaler {
countDemands++
}
}
}
if metadata.requireAllDemands {
return countDemands == len(demandsInJob) && countDemands == len(demandsInScaler)
} else {
return countDemands == len(demandsInJob)
}
}`

Signed-off-by: Eugene Lugovtsov <lug.zhenia@gmail.com>

EugeneLugovtsov · 2023-03-27T18:31:33Z

@Eldarrin thanks for your help. I updated PR

Signed-off-by: Eugene Lugovtsov <lug.zhenia@gmail.com>

EugeneLugovtsov · 2023-03-28T07:50:15Z

@Eldarrin could you please help with it?

Eldarrin · 2023-03-28T08:14:40Z

@Eldarrin could you please help with it?

HI @EugeneLugovtsov I can't see anything wrong with it, @JorTurFer is there some sort of idiomatic thing I'm missing or is it possible to //nolint this?

zroubalik · 2023-03-28T13:19:28Z

@Eldarrin could you please help with it?

HI @EugeneLugovtsov I can't see anything wrong with it, @JorTurFer is there some sort of idiomatic thing I'm missing or is it possible to //nolint this?

What is potentially suspicious is, that we are comparing the same property countDemands against different 2 properties but these should have the same value, because we have AND there. If this is really what we want to have, then we should add exception to https://github.com/kedacore/keda/blob/main/.golangci.yml

Signed-off-by: Eugene Lugovtsov <lug.zhenia@gmail.com>

EugeneLugovtsov · 2023-03-28T13:28:33Z

@zroubalik yep, we want to be sure, that countDemands, len(demandsInJob), and len(demandsInScaler) are the same.

Signed-off-by: Eugene Lugovtsov <lug.zhenia@gmail.com>

zroubalik · 2023-03-28T13:54:15Z

/run-e2e azure*
Update: You can check the progress here

Eldarrin · 2023-03-29T17:46:05Z

/run-e2e azure* Update: You can check the progress here

@zroubalik can you do the e2e with pipelines, not the whole of azure? looks like those are failing.

Cheers :)

JorTurFer · 2023-03-29T20:45:05Z

/run-e2e pipeline*
Update: You can check the progress here

JorTurFer · 2023-03-29T20:46:25Z

Yeah, Azure test are failing because this commit is required

EugeneLugovtsov · 2023-03-31T08:21:57Z

@JorTurFer @Eldarrin do I need to do something? do I need to add this commit ?

Eldarrin · 2023-03-31T08:57:39Z

@JorTurFer @Eldarrin do I need to do something? do I need to add this commit ?

Think you just need to complete the task list by checking the boxes at the top.

EugeneLugovtsov · 2023-04-04T13:07:59Z

@JorTurFer @Eldarrin could you help with the next steps? what do we need to do?

Eldarrin

Approved from my end, all looks good

JorTurFer

LGTM! Thanks for the fix! ❤️

JorTurFer · 2023-04-05T06:04:07Z

/run-e2e pipeline*
Update: You can check the progress here

JorTurFer · 2023-04-05T06:15:36Z

/run-e2e pipeline
Update: You can check the progress here

JorTurFer · 2023-04-11T15:08:59Z

The e2e tests are failing due to expired PAT, I'll fix it asap

JorTurFer · 2023-04-11T17:43:57Z

/run-e2e pipeline
Update: You can check the progress here

…4405)

…4405) Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl>

…<Jorge_turrado@hotmail.es> Co-authored-by: Andy Ward <mortx@toothless.eldarrin.io> Co-authored-by: Tom Kerkhove <kerkhove.tom@gmail.com> Co-authored-by: Zbynek Roubalik <zroubalik@gmail.com> Co-authored-by: Eldarrin <32762846+Eldarrin@users.noreply.github.com> Co-authored-by: Eugene Lugovtsov <34510252+EugeneLugovtsov@users.noreply.github.com> fix(aws-sqs): Respect `scaleOnInFlight` value (#4358) fix odd number of arguments passed as key-value pairs for logging (#4369) fix: Azure Pipelines Scaler uses correct endpoint when demands are set (#4387) (#4401) fix: respect all required demands in azure pipeline scaler (#4405) fix: Allow to remove the finalizer even if the ScaledObject isn't valid (#4397) * Drop a transitive dependency on bou.ke/monkey (#4366) Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * fix(aws-sqs): Respect `scaleOnInFlight` value (#4358) Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * chore: update supported versions in the welcome message (#4360) Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * fix odd number of arguments passed as key-value pairs for logging (#4369) Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * fix: Azure Pipelines Scaler uses correct endpoint when demands are set (#4387) (#4401) Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Co-authored-by: Andy Ward <mortx@toothless.eldarrin.io> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * fix: respect all required demands in azure pipeline scaler (#4405) Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * fix: Allow to remove the finalizer even if the ScaledObject isn't valid (#4397) Co-authored-by: Tom Kerkhove <kerkhove.tom@gmail.com> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * update changelog Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> --------- Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> Co-authored-by: Zbynek Roubalik <zroubalik@gmail.com> Co-authored-by: Eldarrin <32762846+Eldarrin@users.noreply.github.com> Co-authored-by: Andy Ward <mortx@toothless.eldarrin.io> Co-authored-by: Eugene Lugovtsov <34510252+EugeneLugovtsov@users.noreply.github.com> Co-authored-by: Tom Kerkhove <kerkhove.tom@gmail.com>

fix: respect all required demands in azure pipeline scaler

df4ef95

Signed-off-by: Eugene Lugovtsov <lug.zhenia@gmail.com>

EugeneLugovtsov requested a review from a team as a code owner March 23, 2023 20:15

fix: respect all required demands in azure pipeline scaler

12168cb

Signed-off-by: Eugene Lugovtsov <lug.zhenia@gmail.com>

Eldarrin suggested changes Mar 27, 2023

View reviewed changes

fix: respect all required demands in azure pipeline scaler

54501f8

Signed-off-by: Eugene Lugovtsov <lug.zhenia@gmail.com>

fix: respect all required demands in azure pipeline scaler

413d7b0

Signed-off-by: Eugene Lugovtsov <lug.zhenia@gmail.com>

fix: respect all required demands in azure pipeline scaler

c6ed056

Signed-off-by: Eugene Lugovtsov <lug.zhenia@gmail.com>

fix: respect all required demands in azure pipeline scaler

8ff5bd9

Signed-off-by: Eugene Lugovtsov <lug.zhenia@gmail.com>

Eldarrin mentioned this pull request Mar 29, 2023

Azure DevOps Scaler Demands Must Be a Subset #4195

Closed

Merge branch 'main' into bugfix/azure-devops-pipelines-required-demands

58888c9

Eldarrin approved these changes Apr 4, 2023

View reviewed changes

JorTurFer approved these changes Apr 5, 2023

View reviewed changes

JorTurFer enabled auto-merge (squash) April 5, 2023 06:04

JorTurFer mentioned this pull request Apr 5, 2023

Release: 2.10.1 #4374

Closed

17 tasks

JorTurFer merged commit 3dc157b into kedacore:main Apr 11, 2023

JorTurFer pushed a commit to JorTurFer/keda that referenced this pull request Apr 13, 2023

fix: respect all required demands in azure pipeline scaler (kedacore#…

91bf046

…4405)

JorTurFer pushed a commit to JorTurFer/keda that referenced this pull request Apr 13, 2023

fix: respect all required demands in azure pipeline scaler (kedacore#…

4485672

…4405) Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: respect all required demands in azure pipeline scaler #4405

fix: respect all required demands in azure pipeline scaler #4405

EugeneLugovtsov commented Mar 23, 2023 •

edited

Loading

EugeneLugovtsov commented Mar 24, 2023

JorTurFer commented Mar 26, 2023

Eldarrin left a comment •

edited

Loading

EugeneLugovtsov commented Mar 27, 2023

EugeneLugovtsov commented Mar 28, 2023

Eldarrin commented Mar 28, 2023

zroubalik commented Mar 28, 2023 •

edited

Loading

EugeneLugovtsov commented Mar 28, 2023

zroubalik commented Mar 28, 2023 •

edited by github-actions bot

Loading

Eldarrin commented Mar 29, 2023

JorTurFer commented Mar 29, 2023 •

edited by github-actions bot

Loading

JorTurFer commented Mar 29, 2023

EugeneLugovtsov commented Mar 31, 2023

Eldarrin commented Mar 31, 2023

EugeneLugovtsov commented Apr 4, 2023

Eldarrin left a comment

JorTurFer left a comment

JorTurFer commented Apr 5, 2023 •

edited by github-actions bot

Loading

JorTurFer commented Apr 5, 2023 •

edited by github-actions bot

Loading

JorTurFer commented Apr 11, 2023

JorTurFer commented Apr 11, 2023 •

edited by github-actions bot

Loading

fix: respect all required demands in azure pipeline scaler #4405

fix: respect all required demands in azure pipeline scaler #4405

Conversation

EugeneLugovtsov commented Mar 23, 2023 • edited Loading

Checklist

EugeneLugovtsov commented Mar 24, 2023

JorTurFer commented Mar 26, 2023

Eldarrin left a comment • edited Loading

Choose a reason for hiding this comment

EugeneLugovtsov commented Mar 27, 2023

EugeneLugovtsov commented Mar 28, 2023

Eldarrin commented Mar 28, 2023

zroubalik commented Mar 28, 2023 • edited Loading

EugeneLugovtsov commented Mar 28, 2023

zroubalik commented Mar 28, 2023 • edited by github-actions bot Loading

Eldarrin commented Mar 29, 2023

JorTurFer commented Mar 29, 2023 • edited by github-actions bot Loading

JorTurFer commented Mar 29, 2023

EugeneLugovtsov commented Mar 31, 2023

Eldarrin commented Mar 31, 2023

EugeneLugovtsov commented Apr 4, 2023

Eldarrin left a comment

Choose a reason for hiding this comment

JorTurFer left a comment

Choose a reason for hiding this comment

JorTurFer commented Apr 5, 2023 • edited by github-actions bot Loading

JorTurFer commented Apr 5, 2023 • edited by github-actions bot Loading

JorTurFer commented Apr 11, 2023

JorTurFer commented Apr 11, 2023 • edited by github-actions bot Loading

EugeneLugovtsov commented Mar 23, 2023 •

edited

Loading

Eldarrin left a comment •

edited

Loading

zroubalik commented Mar 28, 2023 •

edited

Loading

zroubalik commented Mar 28, 2023 •

edited by github-actions bot

Loading

JorTurFer commented Mar 29, 2023 •

edited by github-actions bot

Loading

JorTurFer commented Apr 5, 2023 •

edited by github-actions bot

Loading

JorTurFer commented Apr 5, 2023 •

edited by github-actions bot

Loading

JorTurFer commented Apr 11, 2023 •

edited by github-actions bot

Loading