HOSTEDCP-1519: feat(api): Add ingress-controller-load-balancer-scope annotation #3848

hasueki · 2024-04-06T01:46:21Z

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

Checklist

Subject and description added to both, commit and PR.
Relevant issues have been referenced.
This change includes docs.
This change includes unit tests.

rtheis

Changes look reasonable to me. Please fix unit test failures.

rtheis · 2024-04-09T11:04:59Z

/retest-required

rtheis

/lgtm

openshift-ci-robot · 2024-04-11T17:00:51Z

@hasueki: This pull request references HOSTEDCP-1519 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

Checklist

Subject and description added to both, commit and PR.

Relevant issues have been referenced.

This change includes docs.

This change includes unit tests.

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 openshift-eng/jira-lifecycle-plugin repository.

api/hypershift/v1beta1/hostedcluster_types.go

openshift-ci · 2024-04-15T10:48:58Z

@attiss: changing LGTM is restricted to collaborators

In response to this:

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.

netlify · 2024-04-15T12:45:14Z

✅ Deploy Preview for hypershift-docs ready!

Name	Link
🔨 Latest commit	`f27e74f`
🔍 Latest deploy log	https://app.netlify.com/sites/hypershift-docs/deploys/661f37db2509bd0008cf65e0
😎 Deploy Preview	https://deploy-preview-3848--hypershift-docs.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

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

rtheis

@hasueki verification test is failing. It appears that the vendored api/hypershift/v1beta1/hostedcluster_types.go file needs to be updated.

sjenning · 2024-04-17T01:57:21Z

/approve

Co-authored-by: Attila Fabian <fabian.attila1994@gmail.com>

rtheis · 2024-04-17T09:39:14Z

/retest-required

rtheis

/lgtm

openshift-ci · 2024-04-17T09:41:45Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: attiss, hasueki, rtheis, sjenning

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:

~~OWNERS~~ [sjenning]

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

rtheis · 2024-04-17T11:20:03Z

/retest-required

openshift-ci-robot · 2024-04-17T12:44:57Z

/retest-required

Remaining retests: 0 against base HEAD 09bcd7e and 2 for PR HEAD f27e74f in total

sjenning · 2024-04-17T14:58:52Z

/test e2e-aws

openshift-ci · 2024-04-17T19:57:00Z

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

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-ibmcloud-iks	`f27e74f`	link	false	`/test e2e-ibmcloud-iks`
ci/prow/e2e-ibmcloud-roks	`f27e74f`	link	false	`/test e2e-ibmcloud-roks`

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.

rtheis · 2024-04-17T20:04:49Z

/cherry-pick release-4.15

openshift-cherrypick-robot · 2024-04-17T20:05:33Z

@rtheis: #3848 failed to apply on top of branch "release-4.15":

Applying: feat(api): Add ingress-controller-load-balancer-scope annotation
Using index info to reconstruct a base tree...
M	api/hypershift/v1beta1/hostedcluster_types.go
M	control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/params.go
A	control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/params_test.go
M	control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/reconcile.go
M	control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/reconcile_test.go
M	control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
M	hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
A	vendor/github.com/openshift/hypershift/api/hypershift/v1beta1/hostedcluster_types.go
Falling back to patching base and 3-way merge...
Auto-merging hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
Auto-merging control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
CONFLICT (content): Merge conflict in control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
Auto-merging control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/reconcile_test.go
CONFLICT (content): Merge conflict in control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/reconcile_test.go
Auto-merging control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/reconcile.go
CONFLICT (content): Merge conflict in control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/reconcile.go
CONFLICT (modify/delete): control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/params_test.go deleted in HEAD and modified in feat(api): Add ingress-controller-load-balancer-scope annotation. Version feat(api): Add ingress-controller-load-balancer-scope annotation of control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/params_test.go left in tree.
Auto-merging control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/params.go
CONFLICT (content): Merge conflict in control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/params.go
Auto-merging api/hypershift/v1beta1/hostedcluster_types.go
Auto-merging api/hypershift/v1alpha1/hostedcluster_types.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 feat(api): Add ingress-controller-load-balancer-scope annotation
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.15

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 bot added the do-not-merge/needs-area label Apr 6, 2024

openshift-ci bot requested review from enxebre and isco-rodriguez April 6, 2024 01:46

rtheis reviewed Apr 8, 2024

View reviewed changes

hasueki force-pushed the ingress-controller-load-balancer-scope branch from d7cb4d4 to 59ee513 Compare April 8, 2024 14:43

rtheis approved these changes Apr 9, 2024

View reviewed changes

openshift-ci bot assigned rtheis Apr 9, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 9, 2024

hasueki changed the title ~~feat(api): Add ingress-controller-load-balancer-scope annotation~~ HOSTEDCP-1519: feat(api): Add ingress-controller-load-balancer-scope annotation Apr 11, 2024

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 11, 2024

attiss approved these changes Apr 15, 2024

View reviewed changes

api/hypershift/v1beta1/hostedcluster_types.go Outdated Show resolved Hide resolved

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 15, 2024

rtheis suggested changes Apr 15, 2024

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 17, 2024

hasueki and others added 3 commits April 16, 2024 22:43

feat(api): Add ingress-controller-load-balancer-scope annotation

c079118

Update api/hypershift/v1beta1/hostedcluster_types.go

4d8bd3e

Co-authored-by: Attila Fabian <fabian.attila1994@gmail.com>

chore(vendor): Run make update

f27e74f

hasueki force-pushed the ingress-controller-load-balancer-scope branch from 2b67124 to f27e74f Compare April 17, 2024 02:45

rtheis approved these changes Apr 17, 2024

View reviewed changes

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 17, 2024

openshift-merge-bot bot merged commit d7b5df5 into openshift:main Apr 17, 2024
11 of 14 checks passed

hasueki deleted the ingress-controller-load-balancer-scope branch April 17, 2024 20:16

hasueki mentioned this pull request Apr 18, 2024

HOSTEDCP-1519: [release-4.15] feat(api): Add ingress-controller-load-balancer-scope annotation #3908

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HOSTEDCP-1519: feat(api): Add ingress-controller-load-balancer-scope annotation #3848

HOSTEDCP-1519: feat(api): Add ingress-controller-load-balancer-scope annotation #3848

hasueki commented Apr 6, 2024

rtheis left a comment

rtheis commented Apr 9, 2024

rtheis left a comment

openshift-ci-robot commented Apr 11, 2024 •

edited by openshift-ci bot

openshift-ci bot commented Apr 15, 2024

netlify bot commented Apr 15, 2024 •

edited

rtheis left a comment

sjenning commented Apr 17, 2024

rtheis commented Apr 17, 2024

rtheis left a comment

openshift-ci bot commented Apr 17, 2024

rtheis commented Apr 17, 2024

openshift-ci-robot commented Apr 17, 2024

sjenning commented Apr 17, 2024

openshift-ci bot commented Apr 17, 2024

rtheis commented Apr 17, 2024

openshift-cherrypick-robot commented Apr 17, 2024

HOSTEDCP-1519: feat(api): Add ingress-controller-load-balancer-scope annotation #3848

HOSTEDCP-1519: feat(api): Add ingress-controller-load-balancer-scope annotation #3848

Conversation

hasueki commented Apr 6, 2024

rtheis left a comment

Choose a reason for hiding this comment

rtheis commented Apr 9, 2024

rtheis left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Apr 11, 2024 • edited by openshift-ci bot

openshift-ci bot commented Apr 15, 2024

netlify bot commented Apr 15, 2024 • edited

✅ Deploy Preview for hypershift-docs ready!

rtheis left a comment

Choose a reason for hiding this comment

sjenning commented Apr 17, 2024

rtheis commented Apr 17, 2024

rtheis left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Apr 17, 2024

rtheis commented Apr 17, 2024

openshift-ci-robot commented Apr 17, 2024

sjenning commented Apr 17, 2024

openshift-ci bot commented Apr 17, 2024

rtheis commented Apr 17, 2024

openshift-cherrypick-robot commented Apr 17, 2024

openshift-ci-robot commented Apr 11, 2024 •

edited by openshift-ci bot

netlify bot commented Apr 15, 2024 •

edited