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

replace behavior for @aws hostnameOverride #7185

Merged
merged 1 commit into from
Jul 22, 2019
Merged

replace behavior for @aws hostnameOverride #7185

merged 1 commit into from
Jul 22, 2019

Conversation

jacksontj
Copy link
Contributor

Potential fix for #7172

@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 24, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @jacksontj. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 24, 2019
@jacksontj jacksontj mentioned this pull request Jun 24, 2019
Closed
@mikesplain
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 27, 2019
@jacksontj jacksontj force-pushed the issue_7172_replace branch from eb66d02 to d223c63 Compare July 1, 2019 22:09
@jacksontj
Copy link
Contributor Author

The failures now seem to be related to bazel; but I don't see docs anywhere on what I should be updating to make bazel happy with the new imports :/

@jacksontj jacksontj force-pushed the issue_7172_replace branch 2 times, most recently from b66b834 to 356e858 Compare July 9, 2019 16:50
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 9, 2019
@jacksontj jacksontj force-pushed the issue_7172_replace branch from 356e858 to a0f93f8 Compare July 9, 2019 16:51
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 9, 2019
@jacksontj jacksontj force-pushed the issue_7172_replace branch from a0f93f8 to 7780430 Compare July 9, 2019 16:53
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Jul 9, 2019
@jacksontj
Copy link
Contributor Author

@mikesplain tests are passing now :)

@jacksontj
Copy link
Contributor Author

cc @KashifSaadat and @rdrgmnzs (since they are marked as reviewers)

This unblocks usage of NodeAuthorizer in AWS VPCs with DHCP options set.

@jacksontj
Copy link
Contributor Author

cc @gambol99 (since it seems that you own the NodeAuthorizer stuff) :)

@jacksontj
Replace behavior for aws hostnameOverride
ea61fb8 
If the cluster's VPC includes DHCP options the local-hostname includes
the DHCP zone instead of the private DNS name from AWS (which is what
k8s uses regardless of flags). This patch simply makes the
hostnameOverride implementation match by using the AWS api to get the
private DNS name

Related to kubernetes#7172
@jacksontj jacksontj force-pushed the issue_7172_replace branch from 7780430 to ea61fb8 Compare July 17, 2019 17:30
@jacksontj
Copy link
Contributor Author

Interesting, I just squashed the commits and now the tests are failing.. have to look into this but I expect some issue with the testing harness

@jacksontj
Copy link
Contributor Author

/test pull-kops-e2e-kubernetes-aws

@justinsb
Copy link
Member

Thanks for tracking down the project @jacksontj ... I'm inclined to go with this fix as it matches the aws cloudprovider code. It's a new EC2 call, but it's only one, and we should have the IAM role anyway because kubelet needs it.

It should be no-change in the case of users not using a custom DHCP domain.

(We probably should also clean up the code duplication here!)

/lgtm
/retest

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 19, 2019
@justinsb justinsb mentioned this pull request Jul 19, 2019
Closed
@jacksontj
Copy link
Contributor Author

(We probably should also clean up the code duplication here!)

I agree, I just figured we should get the fix in sooner rather than later (especially since the duplication was already there ;) )

Also seems that tests are passing now, so ready to merge :) Once this is merged I'll open backports for this like my other patches.

@justinsb
Copy link
Member

We talked about this in office-hours ...

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jacksontj, justinsb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 22, 2019
@k8s-ci-robot k8s-ci-robot merged commit 5e53a44 into kubernetes:master Jul 22, 2019
This was referenced Jul 22, 2019
Merged
Merged
k8s-ci-robot added a commit that referenced this pull request Jul 22, 2019
@k8s-ci-robot
Merge pull request #7296 from justinsb/cherrypick_7185_release-1.13
00b37a9 
Cherry pick of #7185 onto release-1.13
k8s-ci-robot added a commit that referenced this pull request Jul 22, 2019
@k8s-ci-robot
Merge pull request #7297 from justinsb/cherrypick_7185_release-1.14
67168be 
Cherry pick of #7185 onto release-1.14
@jacksontj jacksontj mentioned this pull request Jul 22, 2019
Merged
@jacksontj jacksontj deleted the issue_7172_replace branch July 22, 2019 22:44
k8s-ci-robot added a commit that referenced this pull request Jul 23, 2019
@k8s-ci-robot
Merge pull request #7308 from jacksontj/automated-cherry-pick-of-#718…
3600367 
…5-upstream-release-1.12

Automated cherry pick of #7185: Replace behavior for aws hostnameOverride
@k8s-ci-robot k8s-ci-robot mentioned this pull request Jul 30, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KashifSaadat KashifSaadat Awaiting requested review from KashifSaadat

@rdrgmnzs rdrgmnzs Awaiting requested review from rdrgmnzs

Assignees

@justinsb justinsb

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jacksontj @k8s-ci-robot @mikesplain @justinsb