Skip to content

USHIFT-552: Rebase with K8s 1.26#1319

Merged
openshift-merge-robot merged 17 commits intoopenshift:mainfrom
pmtk:rebase/k8s-1.26
Feb 8, 2023
Merged

USHIFT-552: Rebase with K8s 1.26#1319
openshift-merge-robot merged 17 commits intoopenshift:mainfrom
pmtk:rebase/k8s-1.26

Conversation

@pmtk
Copy link
Member

@pmtk pmtk commented Feb 3, 2023

No description provided.

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

openshift-ci-robot commented Feb 3, 2023 •
edited by openshift-ci bot
Loading

@pmtk: This pull request references USHIFT-552 which is a valid jira issue.

Details

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.

@pmtk
Copy link
Member Author

pmtk commented Feb 3, 2023

Does not compile yet:

# github.com/openshift/route-controller-manager/pkg/route/ingress
vendor/github.com/openshift/route-controller-manager/pkg/route/ingress/ingress.go:545:48: cannot use ingressIngresses (variable of type []"k8s.io/api/core/v1".LoadBalancerIngress) as type []"k8s.io/api/networking/v1".IngressLoadBalancerIngress in assignment

I believe we need openshift/route-controller-manager#15 (specifically)

@openshift-ci openshift-ci bot requested review from benluddy and fzdarsky February 3, 2023 15:40
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 3, 2023
@pmtk pmtk mentioned this pull request Feb 6, 2023
Closed
@pmtk
Copy link
Member Author

pmtk commented Feb 7, 2023

/hold
TODO: s/golang_version 1.18/golang_version 1.19/ in packaging/rpm/microshift.spec

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 7, 2023
@pmtk pmtk mentioned this pull request Feb 8, 2023
Closed
@pmtk
Copy link
Member Author

pmtk commented Feb 8, 2023

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 8, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 8, 2023 •
edited
Loading

@pmtk: 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
ci/prow/periodic-ocp-4.12-images 9aac1ee link true /test periodic-ocp-4.12-images

Full PR test history. Your PR dashboard.

Details

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.

@pmtk
Copy link
Member Author

pmtk commented Feb 8, 2023

/retest

@dhellmann
Copy link
Contributor

dhellmann commented Feb 8, 2023

/lgtm

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

openshift-ci bot commented Feb 8, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhellmann, pmtk

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

The pull request process is described here

Details 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-merge-robot openshift-merge-robot merged commit 9664401 into openshift:main Feb 8, 2023
@pmtk pmtk deleted the rebase/k8s-1.26 branch February 9, 2023 07:51
@dhellmann
Copy link
Contributor

dhellmann commented Feb 10, 2023

Also related to OCPBUGS-3534

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@benluddy benluddy Awaiting requested review from benluddy

@fzdarsky fzdarsky Awaiting requested review from fzdarsky

Assignees

@dhellmann dhellmann

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@pmtk @openshift-ci-robot @dhellmann @openshift-merge-robot