Add support to customize HPA name #3068

aviadlevy · 2022-05-25T11:50:40Z

Provide a description of what has been changed

Checklist

Commits are signed with Developer Certificate of Origin (DCO - learn more)
Tests have been added
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)
Changelog has been updated and is aligned with our changelog requirements

Fixes #3057
Docs PR kedacore/keda-docs#768

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

CHANGELOG.md

Co-authored-by: Tom Kerkhove <kerkhove.tom@gmail.com> Signed-off-by: Aviad Levy <aviadlevy1@gmail.com>

apis/keda/v1alpha1/scaledobject_types.go

controllers/keda/scaledobject_controller.go

zroubalik · 2022-05-26T09:13:07Z

@aviadlevy you should also run make build to regenerate ScaledObject resources, as this PR adds a new field.

aviadlevy · 2022-05-26T09:53:46Z

@aviadlevy you should also run make build to regenerate ScaledObject resources, as this PR adds a new field.

No git changes after make build

keda on  main [⇡] via 🐹 v1.17.10 ➜  make build     
/Users/aviadl/Code/keda/bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
go fmt ./...
go vet ./...
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X=github.com/kedacore/keda/v2/version.GitCommit=64647753313420a59b0c0c2f764e8347c9770dce -X=github.com/kedacore/keda/v2/version.Version=main" -o bin/keda main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X=github.com/kedacore/keda/v2/version.GitCommit=64647753313420a59b0c0c2f764e8347c9770dce -X=github.com/kedacore/keda/v2/version.Version=main" -o bin/keda-adapter adapter/main.go

What am I missing? What did you expected to see?

zroubalik · 2022-05-26T10:11:20Z

@aviadlevy you should also run make build to regenerate ScaledObject resources, as this PR adds a new field.

No git changes after make build

keda on  main [⇡] via 🐹 v1.17.10 ➜  make build     
/Users/aviadl/Code/keda/bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
go fmt ./...
go vet ./...
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X=github.com/kedacore/keda/v2/version.GitCommit=64647753313420a59b0c0c2f764e8347c9770dce -X=github.com/kedacore/keda/v2/version.Version=main" -o bin/keda main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X=github.com/kedacore/keda/v2/version.GitCommit=64647753313420a59b0c0c2f764e8347c9770dce -X=github.com/kedacore/keda/v2/version.Version=main" -o bin/keda-adapter adapter/main.go

What am I missing? What did you expected to see?

What about make manifests?

The new field should be present in the CRD yaml file.

controllers/keda/hpa.go

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

aviadlevy · 2022-05-26T12:59:31Z

@aviadlevy you should also run make build to regenerate ScaledObject resources, as this PR adds a new field.

No git changes after make build

keda on  main [⇡] via 🐹 v1.17.10 ➜  make build     
/Users/aviadl/Code/keda/bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
go fmt ./...
go vet ./...
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X=github.com/kedacore/keda/v2/version.GitCommit=64647753313420a59b0c0c2f764e8347c9770dce -X=github.com/kedacore/keda/v2/version.Version=main" -o bin/keda main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X=github.com/kedacore/keda/v2/version.GitCommit=64647753313420a59b0c0c2f764e8347c9770dce -X=github.com/kedacore/keda/v2/version.Version=main" -o bin/keda-adapter adapter/main.go

What am I missing? What did you expected to see?

What about make manifests?

The new field should be present in the CRD yaml file.

make generate did the trick, though it seems like too many changes: 16b2a01
@zroubalik Do you want me to revert it and leave only the new fields that added?

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

zroubalik · 2022-05-30T08:40:12Z

make generate did the trick, though it seems like too many changes: 16b2a01 @zroubalik Do you want me to revert it and leave only the new fields that added?

Would be nice if you could keep here in the PR only relevant changes. Would you mind opening a new PR with the extra files? We need to update them anyway. Thanks!

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

aviadlevy · 2022-05-30T11:38:44Z

make generate did the trick, though it seems like too many changes: 16b2a01 @zroubalik Do you want me to revert it and leave only the new fields that added?

Would be nice if you could keep here in the PR only relevant changes. Would you mind opening a new PR with the extra files? We need to update them anyway. Thanks!

Kept only relevant changes.
Once this MR will be merged I'll open MR for general CRD updates

zroubalik · 2022-05-31T08:24:08Z

/run-e2e
Update: You can check the progres here

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

aviadlevy · 2022-06-16T15:12:06Z

Added e2e tests 😎
Who can review them? @zroubalik @v-shenoy

tests/scalers_go/custom_hpa_name/custom_hpa_name_test.go

JorTurFer · 2022-06-16T16:06:47Z

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

aviadlevy · 2022-06-16T16:47:26Z

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

I increased the time waiting for hpa in e2e.

locally the e2e is working (see below), but probably on the github runner it takes more time for things to work?

➜  go test -v ./scalers_go/custom_hpa_name/custom_hpa_name_test.go
=== RUN   TestCustomToDefault
    custom_hpa_name_test.go:136: --- validate hpa is with custom name ---
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:140: --- change hpa name ---
    custom_hpa_name_test.go:144: --- validate new hpa is with default name ---
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:148: --- validate hpa with custom name does not exists ---
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
--- PASS: TestCustomToDefault (14.00s)
=== RUN   TestDefaultToCustom
    custom_hpa_name_test.go:136: --- validate hpa is with default name ---
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:140: --- change hpa name ---
    custom_hpa_name_test.go:144: --- validate new hpa is with custom name ---
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:148: --- validate hpa with default name does not exists ---
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
    custom_hpa_name_test.go:171: Waiting for hpa creation
--- PASS: TestDefaultToCustom (12.36s)
PASS
ok      command-line-arguments  26.894s

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

JorTurFer · 2022-06-16T17:11:16Z

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

zroubalik

Looking good! Just a nit in imports.

tests/scalers_go/custom_hpa_name/custom_hpa_name_test.go

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

zroubalik · 2022-06-17T08:10:20Z

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

aviadlevy · 2022-06-19T07:01:12Z

@zroubalik @JorTurFer
Can you please define what's missing for this MR to get merged?

JorTurFer · 2022-06-19T11:34:14Z

Can you please define what's missing for this MR to get merged?

I think is ready, at least from my side I don't see any other thing to be done, let's wait till @zroubalik too

zroubalik · 2022-06-20T11:35:10Z

There's a conflict brought by another PR :( could you please fix that? Then we can merge this PR. Thanks for the contribution!

# Conflicts: # CHANGELOG.md

JorTurFer · 2022-06-20T12:34:52Z

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

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

JorTurFer · 2022-06-20T12:56:32Z

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

JorTurFer · 2022-06-20T13:24:17Z

thanks for this contribution! ❤️

aviadlevy · 2022-06-20T13:28:21Z

thanks for this contribution! ❤️

Thanks. it was fun and very enriching.
Looking forward to contribute more in the future 😎

aviadlevy added 2 commits May 25, 2022 10:56

Add support for custom hpa name

12b681c

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

Add Changelog entry

6c666dc

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

aviadlevy force-pushed the main branch from e5aa0fd to 6c666dc Compare May 25, 2022 12:12

Merge branch 'kedacore:main' into main

f2a5f18

aviadlevy mentioned this pull request May 25, 2022

Add support to customize HPA name kedacore/keda-docs#768

Merged

1 task

fix import linting

68623bf

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

aviadlevy marked this pull request as ready for review May 25, 2022 12:56

aviadlevy requested a review from a team as a code owner May 25, 2022 12:56

edit small comment

2007bde

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

tomkerkhove approved these changes May 25, 2022

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

fix CR comment

fe46bc5

Co-authored-by: Tom Kerkhove <kerkhove.tom@gmail.com> Signed-off-by: Aviad Levy <aviadlevy1@gmail.com>

aviadlevy changed the title ~~Add support to custom hpa name~~ Add support to customize HPA name May 25, 2022

JorTurFer requested review from zroubalik and JorTurFer May 25, 2022 14:42

zroubalik reviewed May 26, 2022

View reviewed changes

apis/keda/v1alpha1/scaledobject_types.go Outdated Show resolved Hide resolved

controllers/keda/scaledobject_controller.go Show resolved Hide resolved

zroubalik reviewed May 26, 2022

View reviewed changes

controllers/keda/hpa.go Outdated Show resolved Hide resolved

controllers/keda/hpa.go Outdated Show resolved Hide resolved

Change variable name

cfb0c38

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

re-organize the flow

3b27a0a

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

aviadlevy force-pushed the main branch from b48e875 to 16b2a01 Compare May 26, 2022 13:08

aviadlevy requested a review from zroubalik May 30, 2022 07:56

make generate

a2ef4dd

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

aviadlevy force-pushed the main branch from 16b2a01 to a2ef4dd Compare May 30, 2022 11:35

verify that HPA name defined in SO

eba4dc2

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

Add e2e test

3ef9f29

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

aviadlevy force-pushed the main branch 2 times, most recently from 1c57a93 to 3ef9f29 Compare June 16, 2022 15:08

Merge remote-tracking branch 'keda/main'

274aec9

JorTurFer reviewed Jun 16, 2022

View reviewed changes

tests/scalers_go/custom_hpa_name/custom_hpa_name_test.go Outdated Show resolved Hide resolved

aviadlevy added 3 commits June 16, 2022 20:07

e2e - increase iteration waiting to hpa

ed77aa8

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

e2e - move func to helper.go

372e555

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

e2e - downgrade to autoscalingv2beta2

09ade1f

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

aviadlevy force-pushed the main branch from d20a66a to 09ade1f Compare June 16, 2022 17:07

zroubalik reviewed Jun 17, 2022

View reviewed changes

tests/scalers_go/custom_hpa_name/custom_hpa_name_test.go Outdated Show resolved Hide resolved

aviadlevy added 2 commits June 17, 2022 10:52

e2e - fix import blocks

d452176

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

Merge remote-tracking branch 'keda/main'

aeadb7f

JorTurFer approved these changes Jun 19, 2022

View reviewed changes

zroubalik approved these changes Jun 20, 2022

View reviewed changes

Merge remote-tracking branch 'keda/main'

1f6d51c

# Conflicts: # CHANGELOG.md

e2e - fix linting

c3163d9

Signed-off-by: aviadlevy <aviadlevy1@gmail.com>

aviadlevy force-pushed the main branch from 6f68fb3 to c3163d9 Compare June 20, 2022 12:37

JorTurFer merged commit 40cd0a9 into kedacore:main Jun 20, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support to customize HPA name #3068

Add support to customize HPA name #3068

aviadlevy commented May 25, 2022 •

edited

Loading

zroubalik commented May 26, 2022

aviadlevy commented May 26, 2022

zroubalik commented May 26, 2022 •

edited

Loading

aviadlevy commented May 26, 2022 •

edited

Loading

zroubalik commented May 30, 2022

aviadlevy commented May 30, 2022 •

edited

Loading

zroubalik commented May 31, 2022 •

edited by github-actions bot

Loading

aviadlevy commented Jun 16, 2022

JorTurFer commented Jun 16, 2022 •

edited by github-actions bot

Loading

aviadlevy commented Jun 16, 2022

JorTurFer commented Jun 16, 2022 •

edited by github-actions bot

Loading

zroubalik left a comment

zroubalik commented Jun 17, 2022 •

edited by github-actions bot

Loading

aviadlevy commented Jun 19, 2022

JorTurFer commented Jun 19, 2022

zroubalik commented Jun 20, 2022

JorTurFer commented Jun 20, 2022 •

edited by github-actions bot

Loading

JorTurFer commented Jun 20, 2022 •

edited by github-actions bot

Loading

JorTurFer commented Jun 20, 2022

aviadlevy commented Jun 20, 2022

Add support to customize HPA name #3068

Add support to customize HPA name #3068

Conversation

aviadlevy commented May 25, 2022 • edited Loading

Checklist

zroubalik commented May 26, 2022

aviadlevy commented May 26, 2022

zroubalik commented May 26, 2022 • edited Loading

aviadlevy commented May 26, 2022 • edited Loading

zroubalik commented May 30, 2022

aviadlevy commented May 30, 2022 • edited Loading

zroubalik commented May 31, 2022 • edited by github-actions bot Loading

aviadlevy commented Jun 16, 2022

JorTurFer commented Jun 16, 2022 • edited by github-actions bot Loading

aviadlevy commented Jun 16, 2022

JorTurFer commented Jun 16, 2022 • edited by github-actions bot Loading

zroubalik left a comment

Choose a reason for hiding this comment

zroubalik commented Jun 17, 2022 • edited by github-actions bot Loading

aviadlevy commented Jun 19, 2022

JorTurFer commented Jun 19, 2022

zroubalik commented Jun 20, 2022

JorTurFer commented Jun 20, 2022 • edited by github-actions bot Loading

JorTurFer commented Jun 20, 2022 • edited by github-actions bot Loading

JorTurFer commented Jun 20, 2022

aviadlevy commented Jun 20, 2022

aviadlevy commented May 25, 2022 •

edited

Loading

zroubalik commented May 26, 2022 •

edited

Loading

aviadlevy commented May 26, 2022 •

edited

Loading

aviadlevy commented May 30, 2022 •

edited

Loading

zroubalik commented May 31, 2022 •

edited by github-actions bot

Loading

JorTurFer commented Jun 16, 2022 •

edited by github-actions bot

Loading

JorTurFer commented Jun 16, 2022 •

edited by github-actions bot

Loading

zroubalik commented Jun 17, 2022 •

edited by github-actions bot

Loading

JorTurFer commented Jun 20, 2022 •

edited by github-actions bot

Loading

JorTurFer commented Jun 20, 2022 •

edited by github-actions bot

Loading