Skip to content

🐛 fix: Fix instance PrivateDNSName when domain-name is set in dhcpOpts #4841

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

Merged
merged 1 commit into from
Mar 27, 2024

Conversation

jparrill
Copy link
Contributor

@jparrill jparrill commented Mar 1, 2024

What this PR does / why we need it:

When a VPC sets a DHCPOption's domain-name with a custom DNS name, it's being ignored. Now, with this PR, ensure that during instance creation, the controller checks the DHCPOptions and sets the proper PrivateDNSName.

Signed-off-by: Juan Manuel Parrilla Madrid [email protected]

What type of PR is this?

/kind bug

Which issue(s) this PR fixes :

Checklist:

  • squashed commits
  • includes documentation
  • includes emojis
  • adds unit tests
  • adds or updates e2e tests

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 1, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @jparrill!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 1, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @jparrill. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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.

@jparrill jparrill changed the title OCPBUGS-29391: Fix instance PrivateDNSName when domain-name is set in dhcpOpts 🐛 OCPBUGS-29391: Fix instance PrivateDNSName when domain-name is set in dhcpOpts Mar 1, 2024
@jparrill jparrill changed the title 🐛 OCPBUGS-29391: Fix instance PrivateDNSName when domain-name is set in dhcpOpts 🐛 fix: Fix instance PrivateDNSName when domain-name is set in dhcpOpts Mar 1, 2024
@richardcase
Copy link
Member

/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. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 5, 2024
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 5, 2024
@jparrill
Copy link
Contributor Author

jparrill commented Mar 5, 2024

I need to change the approach, modifying the status.addresses to change the PrivateDnsName reported instead of change that value directly.

@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 11, 2024
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 11, 2024
@jparrill jparrill force-pushed the OCPBUGS-29391 branch 4 times, most recently from dc76900 to 3c249c9 Compare March 14, 2024 17:11
… dhcpOpts

When a VPC sets a DHCPOption's domain-name with a custom DNS name, it's being ignored. Now, with this PR, ensure that during instance creation, the controller checks the DHCPOptions and sets the proper PrivateDNSName.

Signed-off-by: Juan Manuel Parrilla Madrid <[email protected]>
Copy link
Contributor

@mjlshen mjlshen left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 20, 2024
@Ankitasw
Copy link
Member

/test pull-cluster-api-provider-aws-e2e

2 similar comments
@jparrill
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-e2e

@jparrill
Copy link
Contributor Author

/test pull-cluster-api-provider-aws-e2e

@k8s-ci-robot
Copy link
Contributor

@jparrill: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-aws-e2e 82556f8 link false /test pull-cluster-api-provider-aws-e2e

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@Ankitasw Ankitasw added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Mar 27, 2024
@Ankitasw
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Ankitasw

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 Mar 27, 2024
@k8s-ci-robot k8s-ci-robot merged commit dd2d76b into kubernetes-sigs:main Mar 27, 2024
19 of 21 checks passed
@jparrill
Copy link
Contributor Author

@Ankitasw it was a good merge? I mean it was failing the cluster creation in E2E isn't it?

jparrill added a commit to jparrill/hypershift that referenced this pull request Apr 1, 2024
A new permission required by CAPA is needed, DescribeDhcpOptions. This new permission was included in this PR kubernetes-sigs/cluster-api-provider-aws#4841 which is already merged and is required to make sure the node domain name is well set when a DHCPOption Set contains a custom domain name.

Signed-off-by: Juan Manuel Parrilla Madrid <[email protected]>
jparrill added a commit to jparrill/hypershift that referenced this pull request Apr 1, 2024
To ensure the proper functioning, it is imperative to include the new permission ec2:DescribeDhcpOptions following the submission of the fix to CAPA: kubernetes-sigs/cluster-api-provider-aws#4841

Signed-off-by: Juan Manuel Parrilla Madrid <[email protected]>
@damdo
Copy link
Member

damdo commented Apr 11, 2024

/cherry-pick release-2.4

@k8s-infra-cherrypick-robot

@damdo: new pull request created: #4920

In response to this:

/cherry-pick release-2.4

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.

openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/hypershift that referenced this pull request Apr 11, 2024
To ensure the proper functioning, it is imperative to include the new permission ec2:DescribeDhcpOptions following the submission of the fix to CAPA: kubernetes-sigs/cluster-api-provider-aws#4841

Signed-off-by: Juan Manuel Parrilla Madrid <[email protected]>
@openshift-merge-robot
Copy link

Fix included in accepted release 4.16.0-0.nightly-2024-04-13-070448

Tal-or pushed a commit to Tal-or/hypershift that referenced this pull request May 16, 2024
To ensure the proper functioning, it is imperative to include the new permission ec2:DescribeDhcpOptions following the submission of the fix to CAPA: kubernetes-sigs/cluster-api-provider-aws#4841

Signed-off-by: Juan Manuel Parrilla Madrid <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/hypershift that referenced this pull request Jun 4, 2024
To ensure the proper functioning, it is imperative to include the new permission ec2:DescribeDhcpOptions following the submission of the fix to CAPA: kubernetes-sigs/cluster-api-provider-aws#4841

Signed-off-by: Juan Manuel Parrilla Madrid <[email protected]>
pamelachristie pushed a commit to pamelachristie/hypershift that referenced this pull request Mar 31, 2025
To ensure the proper functioning, it is imperative to include the new permission ec2:DescribeDhcpOptions following the submission of the fix to CAPA: kubernetes-sigs/cluster-api-provider-aws#4841

Signed-off-by: Juan Manuel Parrilla Madrid <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants