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.

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

Fix issue https://github.com/cloudfoundry/bosh/issues/2236 #2246

Merged
merged 2 commits into from
Aug 12, 2020
Merged

Fix issue https://github.com/cloudfoundry/bosh/issues/2236 #2246

merged 2 commits into from
Aug 12, 2020

Conversation

gu-bin
Copy link
Contributor

@gu-bin gu-bin commented Feb 27, 2020

This is to fix issue #2236

@cf-gitbot
Copy link

We have created an issue in Pivotal Tracker to manage this:

https://www.pivotaltracker.com/story/show/171513194

The labels on this github issue will be updated when the story is started.

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Feb 27, 2020

CLA Check
The committers are authorized under a signed CLA.

@cjnosal
Copy link
Contributor

cjnosal commented Feb 27, 2020

Hi @gu-bin

There are also unit tests for the ERB templating. Please update the tests and ensure bundle exec rake spec:release_unit passes

@cjnosal
Copy link
Contributor

cjnosal commented Mar 24, 2020

Might also want to add the domain to the local_dns feature in the /info response for consistency https://github.com/cloudfoundry/bosh/blob/master/src/bosh-director/lib/bosh/director/api/controllers/info_controller.rb#L26-L32

@h4xnoodle
Copy link
Contributor

@gu-bin we'll be able to merge this once the CLA passes, there are tests, and the recommended addition. Thanks.

@gu-bin
Copy link
Contributor Author

gu-bin commented Apr 1, 2020

@xtreme-conor-nosal @h4xnoodle I've addressed all the comments. Please review again. Thanks.

@gu-bin
Copy link
Contributor Author

gu-bin commented Apr 3, 2020

Anything else do I need to do to get this PR merged?

params['dns']['domain_name'] = domain_name
end
if_p('dns.domain_name') do |domain_name|
params['dns'] = {
Copy link
Contributor

Choose a reason for hiding this comment

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

won't this assignment drop any other dns fields that were set? The powerdns case still needs to be able to set the domain_name. This block should probably create the hash only if it's nil, then insert the value. Please add a test for that case as well.

@gu-bin
Copy link
Contributor Author

gu-bin commented Apr 8, 2020

@xtreme-conor-nosal @h4xnoodle Please review again. This time I didn't modify the original powerdns case but only add .else for the bosh-dns case. Any other problem please let me know. Thanks.

@gu-bin
Copy link
Contributor Author

gu-bin commented Apr 22, 2020

@xtreme-conor-nosal @h4xnoodle Any comments for this?

@gu-bin
Copy link
Contributor Author

gu-bin commented Jun 8, 2020

@xtreme-conor-nosal @h4xnoodle Any update for this PR? We need it to be fixed. Thanks.

@mrosecrance
Copy link
Member

Both people you've requested for review have rotated off the team, so I apologize for the delay getting back to you.

@gu-bin
Copy link
Contributor Author

gu-bin commented Jul 14, 2020

@mrosecrance I've addressed your comments. Anything else do I need to do before it can be merged?

@mrosecrance mrosecrance merged commit 240cb1c into cloudfoundry:master Aug 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants