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.

Sign up for GitHub

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

Jump to bottom

New IBM MQ Scaler #1259

Merged
merged 17 commits into from Oct 23, 2020
Merged

New IBM MQ Scaler #1259

merged 17 commits into from Oct 23, 2020

Conversation

jessm12
Copy link
Contributor

@jessm12 jessm12 commented Oct 15, 2020 •
edited

As outlined in issue #1253:

Add the Scaler file and switch case for an IBM MQ scaler that scales depending on queue depth of an IBM MQ Queue.
Add the unit tests for this scaler.

Checklist

  • Commits are signed with Developer Certificate of Origin (DCO)
  • Tests have been added
  • A PR is opened to update the documentation on https://github.com/kedacore/keda-docs
  • Changelog has been updated

(Replaces PR #1254 - fixes DCO/squashed commits)

chughts and others added 3 commits October 14, 2020 18:49
@chughts
Merge pull request #9 from kedacore/v2
305a210 
Rebasing with V2
@cpilton
IBM MQ Scaler
0e44b7f 
Signed-off-by: cpilton <pilton.callum@gmail.com>
@chughts
Merge pull request #13 from cpilton/IBM-MQ-Scaler-v2
8a94530 
IBM MQ Scaler
@cpilton cpilton mentioned this pull request Oct 15, 2020
Closed
4 tasks
@zroubalik
Copy link
Member

Could you please update Changelog with this feature? (New section)

cpilton and others added 3 commits October 15, 2020 13:07
@cpilton
Copyright Notice removed
6e7b887 
Signed-off-by: cpilton <pilton.callum@gmail.com>
@chughts
Merge pull request #14 from cpilton/IBM-MQ-Scaler-v2
96ddc03 
Copyright Notice removed
@chughts
Revert "Copyright Notice removed"
5a61737
@chughts chughts deleted the IBM-MQ-Scaler-v2 branch October 15, 2020 12:37
@cpilton cpilton restored the IBM-MQ-Scaler-v2 branch October 15, 2020 12:49
@chughts
Merge pull request #15 from ibm-messaging/revert-14-IBM-MQ-Scaler-v2
cb49399 
Revert "Copyright Notice removed"

Signed-off-by: Soheel Chughtai <soheel_chughtai@uk.ibm.com>
@zroubalik
Copy link
Member

Nevermind the DCO for now, I'll try to fix that before the merge

@chughts
Revert "Revert "Copyright Notice removed""
6e0a979 
This reverts commit 5a61737.

Signed-off-by: Soheel Chughtai <soheel_chughtai@uk.ibm.com>
cpilton and others added 2 commits October 15, 2020 16:17
@cpilton
Ensure metric name is unique
786c6e9 
Signed-off-by: cpilton <pilton.callum@gmail.com>
@chughts
Merge pull request #16 from cpilton/IBM-MQ-Scaler-v2
68ee863 
Ensure metric name is unique
@jeffhollan
Copy link
Member

Discussed in standup, I will help contact CNCF around the license stuff. We also discussed changed username and password to usernameFromEnv and passwordFromEnv and also adding in the code path for those to load up from env / inline secrets

@caniszczyk
Copy link

FYI for copyright notices in CNCF projects, see https://github.com/cncf/foundation/blob/master/copyright-notices.md

@cpilton
Copy link
Contributor

cpilton commented Oct 16, 2020

IBM Copyright and Apache 2.0 comments removed from file headers at the request of the KEDA project so that our contribution presents consistently with the wider codebase ‘house style’. In accordance with the KEDA and CNCF contribution guidelines, IBM copyright is unaffected and this contribution is made under Apache 2.0 license.

@zroubalik
Copy link
Member

@cpilton @jessm12 as I mentioned above, could you please update Changelog with this feature? (New section). I think we can proceed with the merge

Bimsara Y Pilapitiya and others added 2 commits October 23, 2020 11:36
Added IBM MQ to changelog
78a24c9 
Signed-off-by: Bimsara Y Pilapitiya <Bimsara.Pilapitiya@ibm.com>
@jessm12
Add resolvedEnv for username and password
41dbe02 
Signed-off-by: Jess McCreery <jessica.mccreery@ibm.com>
@jessm12
Copy link
Contributor Author

jessm12 commented Oct 23, 2020

@cpilton @jessm12 as I mentioned above, could you please update Changelog with this feature? (New section). I think we can proceed with the merge

Getting this sorted now, thanks Zbynek!

@cpilton
Copy link
Contributor

cpilton commented Oct 23, 2020

We've added a commit to update the changelog as requested 👍
We have another change to allow username & password from env which we will add in shortly.

@zroubalik
Copy link
Member

@cpilton okay, let me know once it is done :)

@jessm12
Remove duplicate code
38a1f8a 
Signed-off-by: Jess McCreery <jessica.mccreery@ibm.com>
@zroubalik
Copy link
Member

btw, please follow the naming convetion https://keda.sh/docs/2.0/migration/#improved-flexibility--usability-of-trigger-metadata

jessm12 and others added 3 commits October 23, 2020 13:48
@jessm12
Username not password
cce952f 
Signed-off-by: Jess McCreery <jessica.mccreery@ibm.com>
@jessm12
Username/pass from env via trigger metadata
00e3f63 
Signed-off-by: Jess McCreery <jessica.mccreery@ibm.com>
@rcoppen
Merge pull request #18 from jessm12/IBM-MQ-Scaler-v2
0fcbdb0 
Add resolvedEnv for username and password
@cpilton
Copy link
Contributor

cpilton commented Oct 23, 2020

@zroubalik, we have added the commit which allows a username & password from env 👍

@zroubalik zroubalik merged commit dfc8604 into kedacore:v2 Oct 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zroubalik zroubalik zroubalik approved these changes

@ahmelsayed ahmelsayed Awaiting requested review from ahmelsayed

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@jessm12 @zroubalik @jeffhollan @caniszczyk @cpilton @chughts @rcoppen