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

OCPBUGS-23350: Added IPFamilyPolicy to services exposed at the HCP in DualStack mode #3210

Merged
merged 1 commit into from Nov 22, 2023

Conversation

jparrill
Copy link
Contributor

@jparrill jparrill commented Nov 21, 2023

Added IPFamilyPolicy to HostedCluster exposed services with the default setting of PreferDualStack. This means that services exposed in the HCP namespace will use dual-stack if the MGMT Cluster is configured as such. If the MGMT cluster is set to Single Stack, HCP will expose the services accordingly.

Which issue(s) this PR fixes :
Fixes #OCPBUGS-23350

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 21, 2023
@openshift-ci-robot
Copy link

@jparrill: This pull request references Jira Issue OCPBUGS-23350, which is invalid:

  • expected the bug to target the "4.15.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Added IPFamily and IPFamily to KAS Service when the HC/HCP works in Dual Stack mode.

Another approach could be to let the Service to infer if the KAS Service should work in Dual Stack mode using corev1.IPFamilyPolicyPreferDualStack, but I think we should have this under control requiring it when makes sense.

Which issue(s) this PR fixes :
Fixes #OCPBUGS-23350

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-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 21, 2023
@openshift-ci openshift-ci bot added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release and removed do-not-merge/needs-area labels Nov 21, 2023
@jparrill
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Nov 21, 2023
@openshift-ci-robot
Copy link

@jparrill: This pull request references Jira Issue OCPBUGS-23350, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

In response to this:

/jira refresh

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
Copy link
Contributor Author

/test e2e-aws

@openshift-ci-robot
Copy link

@jparrill: This pull request references Jira Issue OCPBUGS-23350, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

In response to this:

Added IPFamily and IPFamily to KAS Service when the HC/HCP works in Dual Stack mode.

Another approach could be to let the Service to infer if the KAS Service should work in Dual Stack mode using corev1.IPFamilyPolicyPreferDualStack, but I think we should have this under control requiring it when makes sense.

Following this approach, we are not limiting the user to create in a Dual Stack management cluster, a dual stack HostedCluster. In the case we choose to use IPFamilyPolicyPreferDualStack as a IPFamilyPolicy, all the HostedClusters deployed in a Dual Stack environment will be forced to be Dual Stack.

Which issue(s) this PR fixes :
Fixes #OCPBUGS-23350

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.

@kyrtapz
Copy link
Contributor

kyrtapz commented Nov 21, 2023

Looks good to me.
More general question is do you want to do it only for KAS? AFAIK there are other exposed services.

Copy link

netlify bot commented Nov 21, 2023

Deploy Preview for hypershift-docs ready!

Name Link
🔨 Latest commit 2d48c1d
🔍 Latest deploy log https://app.netlify.com/sites/hypershift-docs/deploys/655cc279d0ec720008236c03
😎 Deploy Preview https://deploy-preview-3210--hypershift-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@jparrill jparrill force-pushed the bug/OCPBUGS-23350 branch 2 times, most recently from 7a410ef to 3fd7917 Compare November 21, 2023 16:10
@jparrill
Copy link
Contributor Author

Looks good to me. More general question is do you want to do it only for KAS? AFAIK there are other exposed services.

Yep, you were right. I've modified the PR in order to always use PreferDualStack and also covering all the services exposed.

Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
@jparrill jparrill changed the title OCPBUGS-23350: Added IPFamilyPolicy to KAS in DualStack mode OCPBUGS-23350: Added IPFamilyPolicy to services exposed at the HCP in DualStack mode Nov 22, 2023
Copy link
Member

@bryan-cox bryan-cox left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 22, 2023
Copy link
Contributor

openshift-ci bot commented Nov 22, 2023

@jparrill: all tests passed!

Full PR test history. Your PR dashboard.

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.

@csrwng
Copy link
Contributor

csrwng commented Nov 22, 2023

/approve

Copy link
Contributor

openshift-ci bot commented Nov 22, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox, csrwng, jparrill

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 22, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit f3390db into openshift:main Nov 22, 2023
12 checks passed
@openshift-ci-robot
Copy link

@jparrill: Jira Issue OCPBUGS-23350: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-23350 has been moved to the MODIFIED state.

In response to this:

Added IPFamilyPolicy to HostedCluster exposed services with the default setting of PreferDualStack. This means that services exposed in the HCP namespace will use dual-stack if the MGMT Cluster is configured as such. If the MGMT cluster is set to Single Stack, HCP will expose the services accordingly.

Which issue(s) this PR fixes :
Fixes #OCPBUGS-23350

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
Copy link
Contributor Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@jparrill: #3210 failed to apply on top of branch "release-4.14":

Applying: OCPBUGS-23350: Added IPFamilyPolicy to HC exposed services
Using index info to reconstruct a base tree...
M	control-plane-operator/controllers/hostedcontrolplane/cvo/reconcile.go
M	control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go
M	control-plane-operator/controllers/hostedcontrolplane/kas/service.go
M	control-plane-operator/controllers/hostedcontrolplane/oauth/service.go
M	control-plane-operator/controllers/hostedcontrolplane/registryoperator/reconcile.go
Falling back to patching base and 3-way merge...
Auto-merging control-plane-operator/controllers/hostedcontrolplane/registryoperator/reconcile.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/oauth/service.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/kas/service.go
CONFLICT (content): Merge conflict in control-plane-operator/controllers/hostedcontrolplane/kas/service.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/cvo/reconcile.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-23350: Added IPFamilyPolicy to HC exposed services
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.14

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-merge-robot
Copy link
Contributor

Fix included in accepted release 4.15.0-0.nightly-2023-11-23-205638

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. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants