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

fix(aws): support for cross-application CLBs with the sql backend #4141

Merged
merged 1 commit into from
Nov 4, 2019
Merged

fix(aws): support for cross-application CLBs with the sql backend #4141

merged 1 commit into from
Nov 4, 2019

Conversation

asher
Copy link
Contributor

@asher asher commented Nov 4, 2019

asher
asher commented Nov 4, 2019
View reviewed changes
.../spinnaker/clouddriver/aws/provider/agent/AmazonLoadBalancerInstanceStateCachingAgent.groovy
if (instances[instanceId] != null) {
String application = instances[instanceId].attributes.get("application")
if (application != null) {
attributes.put("application", application)
Copy link
Contributor Author

@asher asher Nov 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This ensures that health objects stored by AmazonLoadBalancerInstanceStateCachingAgent are indexed by the application of instances the objects relate to, instead of the application of the load balancer itself. This was already done by EddaLoadBalancerCachingAgent which runs instead of AmazonLoadBalancerInstanceStateCachingAgent when edda is enabled.

@asher asher requested a review from cfieber November 4, 2019 19:30
@asher asher merged commit 12fd7b4 into spinnaker:master Nov 4, 2019
@asher asher deleted the sql branch November 4, 2019 20:45
@asher
Copy link
Contributor Author

asher commented Nov 4, 2019

@spinnakerbot cherry-pick 1.17

spinnakerbot pushed a commit that referenced this pull request Nov 4, 2019
@asher
fix(aws): support for cross-application CLBs with the sql backend (#4141
9a08649 
)
@spinnakerbot
Copy link
Contributor

Cherry pick successful: #4142

@costimuraru
Copy link
Contributor

@asher do you think it's possible to cherry pick this in 1.16 as well? Not seeing any breaking changes. Furthermore, I made a custom build where I cherry picked this commit over the release-1.16.x branch and it seems to be working, but it would be great to not use custom images for our prod spinnaker deployment. Thanks.

ttomsu pushed a commit that referenced this pull request Nov 11, 2019
@spinnakerbot
fix(aws): support for cross-application CLBs with the sql backend (#4141
e192026 
) (#4142)
@jonsie
Copy link
Contributor

jonsie commented Dec 2, 2019

@spinnakerbot cherry-pick 1.16

spinnakerbot pushed a commit that referenced this pull request Dec 2, 2019
@asher
fix(aws): support for cross-application CLBs with the sql backend (#4141
087f254 
)
@spinnakerbot
Copy link
Contributor

Cherry pick successful: #4192

ttomsu pushed a commit that referenced this pull request Dec 2, 2019
@spinnakerbot
fix(aws): support for cross-application CLBs with the sql backend (#4141
e0c12ea 
) (#4192)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cfieber cfieber Awaiting requested review from cfieber

Assignees
No one assigned
Labels
target-release/1.18
Projects
None yet
Milestone
No milestone
4 participants
@asher @spinnakerbot @costimuraru @jonsie