Skip to content

[WIP]CORENET-5958:Rebase k8s to 1.33#174

Closed
meinali566 wants to merge 1 commit intoopenshift:masterfrom
meinali566:CORENET-5958
Closed

[WIP]CORENET-5958:Rebase k8s to 1.33#174
meinali566 wants to merge 1 commit intoopenshift:masterfrom
meinali566:CORENET-5958

Conversation

@meinali566
Copy link
Copy Markdown
Contributor

@meinali566 meinali566 commented Jun 5, 2025

go get -u github.com/openshift/api
go get -u github.com/openshift/client-go
go get -u github.com/openshift/library-go
go get -u k8s.io/api
go get -u k8s.io/apimachinery
go get -u k8s.io/client-go
go get -u k8s.io/cloud-provider
go get -u k8s.io/klog/v2
go get -u k8s.io/utils
go get -u sigs.k8s.io/controller-runtime
go mod tidy; go mod vendor
make test

Except rebase automatically, there are some fixs:

  1. update .ci-operator.yaml and Dockerfile about golang version
  2. replace fmt.Fprintf() with fmt.Fprint() in pkg/cloudprovider/openstack_test.go
  3. block by issue kubernetes/apimachinery#190.
    workaround: pin the version of kube-openapi

kube-openapi recently upgraded their version of structured-merge-diff from v4 to v6. However, apimachinery , which imports both kube-openapi and structured-merge-diff is still using structured-merge-diff@v4. This was causing our CI to fail. To temporarily resolve this issue and unblock CI, I pin the version of kube-openapi.

/cc @jluhrsen
/cc @asood-rh

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jun 5, 2025

@Meina-rh: This pull request references CORENET-5958 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 story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

go get -u github.com/openshift/api
go get -u github.com/openshift/client-go
go get -u github.com/openshift/library-go
go get -u k8s.io/api
go get -u k8s.io/apimachinery
go get -u k8s.io/client-go
go get -u k8s.io/cloud-provider
go get -u k8s.io/klog/v2
go get -u k8s.io/utils
go get -u sigs.k8s.io/controller-runtime
go mod tidy; go mod vendor

/cc @jluhrsen
/cc @asood-rh

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.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 5, 2025
@openshift-ci openshift-ci Bot requested review from asood-rh and jluhrsen June 5, 2025 07:12
@meinali566
Copy link
Copy Markdown
Contributor Author

/retest

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 6, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Meina-rh
Once this PR has been reviewed and has the lgtm label, please assign knobunc for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@meinali566 meinali566 changed the title CORENET-5958:Rebase k8s to 1.33 [WIP]CORENET-5958:Rebase k8s to 1.33 Jun 6, 2025
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 6, 2025
@asood-rh
Copy link
Copy Markdown

asood-rh commented Jun 9, 2025

/retest

@meinali566 meinali566 force-pushed the CORENET-5958 branch 4 times, most recently from ace1a4c to d885251 Compare June 10, 2025 05:56
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jun 10, 2025

@Meina-rh: This pull request references CORENET-5958 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 story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

go get -u github.com/openshift/api
go get -u github.com/openshift/client-go
go get -u github.com/openshift/library-go
go get -u k8s.io/api
go get -u k8s.io/apimachinery
go get -u k8s.io/client-go
go get -u k8s.io/cloud-provider
go get -u k8s.io/klog/v2
go get -u k8s.io/utils
go get -u sigs.k8s.io/controller-runtime
go mod tidy; go mod vendor

Except rebase automatically, there are some fixs:

  1. update .ci-operator.yaml and Dockerfile about golang version
  2. replace fmt.Fprintf() with fmt.Fprint() in pkg/cloudprovider/openstack_test.go

/cc @jluhrsen
/cc @asood-rh

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.

@meinali566
Copy link
Copy Markdown
Contributor Author

/test e2e-aws-ovn

@meinali566
Copy link
Copy Markdown
Contributor Author

/test e2e-gcp-ovn

@asood-rh
Copy link
Copy Markdown

/retest-required

@meinali566
Copy link
Copy Markdown
Contributor Author

/test e2e-azure-serial

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 11, 2025

@Meina-rh: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test e2e-aws-ovn
/test e2e-azure-ovn
/test e2e-azure-serial-1of2
/test e2e-azure-serial-2of2
/test e2e-gcp-ovn
/test hypershift-e2e-aks
/test images
/test unit
/test verify-deps

The following commands are available to trigger optional jobs:

/test e2e-aws-ovn-serial
/test e2e-openstack-ovn-serial-e2e-only
/test okd-scos-e2e-aws-ovn
/test okd-scos-images
/test security

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-cloud-network-config-controller-master-e2e-aws-ovn
pull-ci-openshift-cloud-network-config-controller-master-e2e-aws-ovn-serial
pull-ci-openshift-cloud-network-config-controller-master-e2e-azure-ovn
pull-ci-openshift-cloud-network-config-controller-master-e2e-azure-serial-1of2
pull-ci-openshift-cloud-network-config-controller-master-e2e-azure-serial-2of2
pull-ci-openshift-cloud-network-config-controller-master-e2e-gcp-ovn
pull-ci-openshift-cloud-network-config-controller-master-e2e-openstack-ovn-serial-e2e-only
pull-ci-openshift-cloud-network-config-controller-master-hypershift-e2e-aks
pull-ci-openshift-cloud-network-config-controller-master-images
pull-ci-openshift-cloud-network-config-controller-master-okd-scos-e2e-aws-ovn
pull-ci-openshift-cloud-network-config-controller-master-security
pull-ci-openshift-cloud-network-config-controller-master-unit
pull-ci-openshift-cloud-network-config-controller-master-verify-deps
Details

In response to this:

/test e2e-azure-serial

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-sigs/prow repository.

@meinali566
Copy link
Copy Markdown
Contributor Author

/test e2e-azure-serial-1of2

@meinali566
Copy link
Copy Markdown
Contributor Author

/test e2e-azure-serial-2of2

@meinali566
Copy link
Copy Markdown
Contributor Author

/test e2e-azure-serial

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 11, 2025

@Meina-rh: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test e2e-aws-ovn
/test e2e-azure-ovn
/test e2e-azure-serial-1of2
/test e2e-azure-serial-2of2
/test e2e-gcp-ovn
/test hypershift-e2e-aks
/test images
/test unit
/test verify-deps

The following commands are available to trigger optional jobs:

/test e2e-aws-ovn-serial
/test e2e-openstack-ovn-serial-e2e-only
/test okd-scos-e2e-aws-ovn
/test okd-scos-images
/test security

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-cloud-network-config-controller-master-e2e-aws-ovn
pull-ci-openshift-cloud-network-config-controller-master-e2e-aws-ovn-serial
pull-ci-openshift-cloud-network-config-controller-master-e2e-azure-ovn
pull-ci-openshift-cloud-network-config-controller-master-e2e-azure-serial-1of2
pull-ci-openshift-cloud-network-config-controller-master-e2e-azure-serial-2of2
pull-ci-openshift-cloud-network-config-controller-master-e2e-gcp-ovn
pull-ci-openshift-cloud-network-config-controller-master-e2e-openstack-ovn-serial-e2e-only
pull-ci-openshift-cloud-network-config-controller-master-hypershift-e2e-aks
pull-ci-openshift-cloud-network-config-controller-master-images
pull-ci-openshift-cloud-network-config-controller-master-okd-scos-e2e-aws-ovn
pull-ci-openshift-cloud-network-config-controller-master-security
pull-ci-openshift-cloud-network-config-controller-master-unit
pull-ci-openshift-cloud-network-config-controller-master-verify-deps
Details

In response to this:

/test e2e-azure-serial

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-sigs/prow repository.

@meinali566
Copy link
Copy Markdown
Contributor Author

/retest-required

@asood-rh
Copy link
Copy Markdown

asood-rh commented Jul 10, 2025

FYI @Meina-rh our approver is @kyrtapz

Please copy him when openshift/library-go#1952 (merged) is incorporated in this PR.

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 11, 2025

@Meina-rh: This pull request references CORENET-5958 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 story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

go get -u github.com/openshift/api
go get -u github.com/openshift/client-go
go get -u github.com/openshift/library-go
go get -u k8s.io/api
go get -u k8s.io/apimachinery
go get -u k8s.io/client-go
go get -u k8s.io/cloud-provider
go get -u k8s.io/klog/v2
go get -u k8s.io/utils
go get -u sigs.k8s.io/controller-runtime
go mod tidy; go mod vendor

Except rebase automatically, there are some fixs:

  1. update .ci-operator.yaml and Dockerfile about golang version
  2. replace fmt.Fprintf() with fmt.Fprint() in pkg/cloudprovider/openstack_test.go
  3. replace "sigs.k8s.io/structured-merge-diff/v4/schema" with "sigs.k8s.io/structured-merge-diff/v6/schema" due to https://github.com/kubernetes/apimachinery/issues/190

/cc @jluhrsen
/cc @asood-rh

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.

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 11, 2025

@Meina-rh: This pull request references CORENET-5958 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 story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

go get -u github.com/openshift/api
go get -u github.com/openshift/client-go
go get -u github.com/openshift/library-go
go get -u k8s.io/api
go get -u k8s.io/apimachinery
go get -u k8s.io/client-go
go get -u k8s.io/cloud-provider
go get -u k8s.io/klog/v2
go get -u k8s.io/utils
go get -u sigs.k8s.io/controller-runtime
go mod tidy; go mod vendor
make test

Except rebase automatically, there are some fixs:

  1. update .ci-operator.yaml and Dockerfile about golang version
  2. replace fmt.Fprintf() with fmt.Fprint() in pkg/cloudprovider/openstack_test.go
  3. replace "sigs.k8s.io/structured-merge-diff/v4/schema" with "sigs.k8s.io/structured-merge-diff/v6/schema" due to https://github.com/kubernetes/apimachinery/issues/190

/cc @jluhrsen
/cc @asood-rh

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.

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 11, 2025

@Meina-rh: This pull request references CORENET-5958 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 story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

go get -u github.com/openshift/api
go get -u github.com/openshift/client-go
go get -u github.com/openshift/library-go
go get -u k8s.io/api
go get -u k8s.io/apimachinery
go get -u k8s.io/client-go
go get -u k8s.io/cloud-provider
go get -u k8s.io/klog/v2
go get -u k8s.io/utils
go get -u sigs.k8s.io/controller-runtime
go mod tidy; go mod vendor
make test

Except rebase automatically, there are some fixs:

  1. update .ci-operator.yaml and Dockerfile about golang version
  2. replace fmt.Fprintf() with fmt.Fprint() in pkg/cloudprovider/openstack_test.go
  3. replace "sigs.k8s.io/structured-merge-diff/v4/schema" with "sigs.k8s.io/structured-merge-diff/v6/schema" due to
# k8s.io/apimachinery/pkg/util/managedfields/internal
vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/typeconverter.go:51:61: cannot use typeSchema.Types (variable of type []"sigs.k8s.io/structured-merge-diff/v6/schema".TypeDef) as []"sigs.k8s.io/structured-merge-diff/v4/schema".TypeDef value in struct literal

/cc @jluhrsen
/cc @asood-rh

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.

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 14, 2025

@Meina-rh: This pull request references CORENET-5958 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 story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

go get -u github.com/openshift/api
go get -u github.com/openshift/client-go
go get -u github.com/openshift/library-go
go get -u k8s.io/api
go get -u k8s.io/apimachinery
go get -u k8s.io/client-go
go get -u k8s.io/cloud-provider
go get -u k8s.io/klog/v2
go get -u k8s.io/utils
go get -u sigs.k8s.io/controller-runtime
go mod tidy; go mod vendor
make test

Except rebase automatically, there are some fixs:

  1. update .ci-operator.yaml and Dockerfile about golang version
  2. replace fmt.Fprintf() with fmt.Fprint() in pkg/cloudprovider/openstack_test.go
  3. pin the version of kube-openapi

kube-openapi recently upgraded their version of structured-merge-diff from v4 to v6. However, apimachinery , which imports both kube-openapi and structured-merge-diff is still using structured-merge-diff@v4. This was causing our CI to fail. To temporarily resolve this issue and unblock CI, I pin the version of kube-openapi.

/cc @jluhrsen
/cc @asood-rh

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.

@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 14, 2025

@Meina-rh: This pull request references CORENET-5958 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 story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

go get -u github.com/openshift/api
go get -u github.com/openshift/client-go
go get -u github.com/openshift/library-go
go get -u k8s.io/api
go get -u k8s.io/apimachinery
go get -u k8s.io/client-go
go get -u k8s.io/cloud-provider
go get -u k8s.io/klog/v2
go get -u k8s.io/utils
go get -u sigs.k8s.io/controller-runtime
go mod tidy; go mod vendor
make test

Except rebase automatically, there are some fixs:

  1. update .ci-operator.yaml and Dockerfile about golang version
  2. replace fmt.Fprintf() with fmt.Fprint() in pkg/cloudprovider/openstack_test.go
  3. block by issue kubernetes/apimachinery#190.
    workaround: pin the version of kube-openapi

kube-openapi recently upgraded their version of structured-merge-diff from v4 to v6. However, apimachinery , which imports both kube-openapi and structured-merge-diff is still using structured-merge-diff@v4. This was causing our CI to fail. To temporarily resolve this issue and unblock CI, I pin the version of kube-openapi.

/cc @jluhrsen
/cc @asood-rh

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.

@meinali566
Copy link
Copy Markdown
Contributor Author

/close

@meinali566 meinali566 closed this Jul 14, 2025
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 14, 2025

@Meina-rh: Closed this PR.

Details

In response to this:

/close

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-sigs/prow repository.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 14, 2025

@Meina-rh: 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-azure-serial d885251 link true /test e2e-azure-serial
ci/prow/security 5686114 link false /test security

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

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

Labels

do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants