Skip to content

Conversation

@patrickdillon
Copy link
Contributor

Pulls in most recent openshift/api and bumps v0.27.2 libraries.

For compatibility, update:

  • c2d81a6 updates openshift/baremetal-operator fork and points to the new hardware profile location
  • bb6600a updates PowerVS destroy code to use updated method signature for wait.ExponentialBackoffWithContext
  • 695425757554657f1e9dde3d29aaecb94bd01933 fixes deprecated use of wait.PollImmediateInfiniteWithContext in vSphere destroy
  • af865cfc0e59a80594fc2887b4f26b8cc7d75ec7 bumps core installer to Go v1.20

Terraform & providers can be updated to Go v1.20 separately.

The most recent k8s api bump requires a context is passed to
the wait.ExponentialBackoffWithContext function.
metal3-io/baremetal-operator@6c1abd0
moved the hardware profile package to the api. This commit points to
the new package locations.
$ go mod edit \
-replace=github.com/metal3-io/baremetal-operator=github.com/openshift/baremetal-operator@master \
-replace=github.com/metal3-io/baremetal-operator/apis=github.com/openshift/baremetal-operator/apis@master \
-replace=github.com/metal3-io/baremetal-operator/pkg/hardwareutils=github.com/openshift/baremetal-operator/pkg/hardwareutils@master

$ go mod edit -require=github.com/openshift/api@master

$ go mod edit -replace=github.com/openshift/api=github.com/openshift/api@master

$ go mod edit -replace k8s.io/client-go=k8s.io/[email protected]

(with $ go mod tidy run between each command)
Bumps core Installer to Go v1.20. Terraform and providers will be
updated separately.
Fixes deprecation issue:
pkg/destroy/vsphere/vsphere.go:243:9: SA1019: wait.PollImmediateInfiniteWithContext
is deprecated: This method does not return errors from context, use PollWithContextCancel.
Note that the new method will no longer return ErrWaitTimeout
and instead return errors defined by the context package.
Will be removed in a future release. (staticcheck)
Update generated CRD for explain after API vendoring.

$ go generate ./pkg/types/installconfig.go
@patrickdillon
Copy link
Contributor Author

/test ci/prow/openstack-manifests

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2023

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

  • /test agent-integration-tests
  • /test aro-unit
  • /test e2e-agent-compact-ipv4
  • /test e2e-aws-ovn
  • /test e2e-aws-ovn-upi
  • /test e2e-azure-ovn
  • /test e2e-azure-ovn-upi
  • /test e2e-gcp-ovn
  • /test e2e-gcp-ovn-upi
  • /test e2e-metal-ipi-ovn-ipv6
  • /test e2e-openstack-ovn
  • /test e2e-vsphere-ovn
  • /test e2e-vsphere-upi
  • /test gofmt
  • /test golint
  • /test govet
  • /test images
  • /test okd-images
  • /test okd-scos-images
  • /test okd-unit
  • /test okd-verify-codegen
  • /test openstack-manifests
  • /test shellcheck
  • /test tf-lint
  • /test unit
  • /test verify-codegen
  • /test verify-vendor
  • /test yaml-lint

The following commands are available to trigger optional jobs:

  • /test e2e-agent-ha-dualstack
  • /test e2e-agent-sno-ipv6
  • /test e2e-alibaba
  • /test e2e-aws-ovn-disruptive
  • /test e2e-aws-ovn-fips
  • /test e2e-aws-ovn-imdsv2
  • /test e2e-aws-ovn-proxy
  • /test e2e-aws-ovn-public-subnets
  • /test e2e-aws-ovn-shared-vpc
  • /test e2e-aws-ovn-single-node
  • /test e2e-aws-ovn-upgrade
  • /test e2e-aws-ovn-workers-rhel8
  • /test e2e-aws-upi-proxy
  • /test e2e-azure-ovn-resourcegroup
  • /test e2e-azure-ovn-shared-vpc
  • /test e2e-azurestack
  • /test e2e-azurestack-upi
  • /test e2e-crc
  • /test e2e-gcp-ovn-shared-vpc
  • /test e2e-gcp-ovn-xpn
  • /test e2e-gcp-secureboot
  • /test e2e-gcp-upgrade
  • /test e2e-gcp-upi-xpn
  • /test e2e-ibmcloud-ovn
  • /test e2e-libvirt
  • /test e2e-metal-assisted
  • /test e2e-metal-ipi-ovn-dualstack
  • /test e2e-metal-ipi-sdn
  • /test e2e-metal-ipi-sdn-swapped-hosts
  • /test e2e-metal-ipi-sdn-virtualmedia
  • /test e2e-metal-single-node-live-iso
  • /test e2e-nutanix-ovn
  • /test e2e-nutanix-sdn
  • /test e2e-openstack-externallb-techpreview
  • /test e2e-openstack-kuryr
  • /test e2e-openstack-proxy
  • /test e2e-openstack-sdn-parallel
  • /test e2e-openstack-upi
  • /test e2e-ovirt-sdn
  • /test e2e-vsphere-static-ovn
  • /test e2e-vsphere-upi-zones
  • /test e2e-vsphere-zones
  • /test okd-e2e-aws-ovn
  • /test okd-e2e-aws-ovn-upgrade
  • /test okd-e2e-gcp
  • /test okd-e2e-gcp-ovn-upgrade
  • /test okd-e2e-vsphere
  • /test okd-scos-e2e-aws-ovn
  • /test okd-scos-e2e-aws-upgrade
  • /test okd-scos-e2e-gcp
  • /test okd-scos-e2e-gcp-ovn-upgrade
  • /test okd-scos-e2e-vsphere
  • /test okd-scos-unit
  • /test okd-scos-verify-codegen
  • /test tf-fmt

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

  • pull-ci-openshift-installer-master-aro-unit
  • pull-ci-openshift-installer-master-e2e-agent-ha-dualstack
  • pull-ci-openshift-installer-master-e2e-aws-ovn
  • pull-ci-openshift-installer-master-e2e-aws-ovn-upi
  • pull-ci-openshift-installer-master-e2e-azure-ovn-upi
  • pull-ci-openshift-installer-master-e2e-gcp-ovn
  • pull-ci-openshift-installer-master-e2e-gcp-ovn-shared-vpc
  • pull-ci-openshift-installer-master-e2e-gcp-ovn-upi
  • pull-ci-openshift-installer-master-e2e-gcp-ovn-xpn
  • pull-ci-openshift-installer-master-e2e-gcp-secureboot
  • pull-ci-openshift-installer-master-e2e-libvirt
  • pull-ci-openshift-installer-master-e2e-metal-assisted
  • pull-ci-openshift-installer-master-e2e-metal-ipi-ovn-dualstack
  • pull-ci-openshift-installer-master-e2e-metal-ipi-ovn-ipv6
  • pull-ci-openshift-installer-master-e2e-metal-ipi-sdn
  • pull-ci-openshift-installer-master-e2e-metal-ipi-sdn-swapped-hosts
  • pull-ci-openshift-installer-master-e2e-metal-ipi-sdn-virtualmedia
  • pull-ci-openshift-installer-master-e2e-metal-single-node-live-iso
  • pull-ci-openshift-installer-master-e2e-openstack-kuryr
  • pull-ci-openshift-installer-master-e2e-openstack-ovn
  • pull-ci-openshift-installer-master-e2e-openstack-proxy
  • pull-ci-openshift-installer-master-e2e-openstack-sdn-parallel
  • pull-ci-openshift-installer-master-e2e-openstack-upi
  • pull-ci-openshift-installer-master-e2e-vsphere-ovn
  • pull-ci-openshift-installer-master-e2e-vsphere-upi
  • pull-ci-openshift-installer-master-e2e-vsphere-upi-zones
  • pull-ci-openshift-installer-master-e2e-vsphere-zones
  • pull-ci-openshift-installer-master-gofmt
  • pull-ci-openshift-installer-master-golint
  • pull-ci-openshift-installer-master-govet
  • pull-ci-openshift-installer-master-images
  • pull-ci-openshift-installer-master-okd-e2e-aws-ovn
  • pull-ci-openshift-installer-master-okd-e2e-aws-ovn-upgrade
  • pull-ci-openshift-installer-master-okd-images
  • pull-ci-openshift-installer-master-okd-scos-e2e-aws-ovn
  • pull-ci-openshift-installer-master-okd-scos-images
  • pull-ci-openshift-installer-master-okd-scos-unit
  • pull-ci-openshift-installer-master-okd-scos-verify-codegen
  • pull-ci-openshift-installer-master-okd-unit
  • pull-ci-openshift-installer-master-okd-verify-codegen
  • pull-ci-openshift-installer-master-openstack-manifests
  • pull-ci-openshift-installer-master-shellcheck
  • pull-ci-openshift-installer-master-tf-fmt
  • pull-ci-openshift-installer-master-tf-lint
  • pull-ci-openshift-installer-master-unit
  • pull-ci-openshift-installer-master-verify-codegen
  • pull-ci-openshift-installer-master-verify-vendor
  • pull-ci-openshift-installer-master-yaml-lint
Details

In response to this:

/test ci/prow/openstack-manifests

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.

@patrickdillon
Copy link
Contributor Author

/test openstack-manifests

@patrickdillon
Copy link
Contributor Author

The ci/prow/e2e-vsphere-upi-zones failure is a CI configuration error, and a known issue--unrelated to this PR. It can be skipped/ignored.

Copy link
Contributor

@r4f4 r4f4 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 Jun 1, 2023
@jcpowermac
Copy link
Contributor

The ci/prow/e2e-vsphere-upi-zones failure is a CI configuration error, and a known issue--unrelated to this PR. It can be skipped/ignored.

@WenXinWei please review the failure since this started after the merge of #6999

@patrickdillon
Copy link
Contributor Author

I have looked through all of the failures so far, and none of them look concerning or related to the changes at hand.
I will continue to look at the failures, but am feeling confident enough in these test results so far.

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 1, 2023
@mrunalp mrunalp added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jun 1, 2023
@patrickdillon
Copy link
Contributor Author

/override ci/prow/e2e-aws-ovn-upi ci/prow/e2e-vsphere-upi

@patrickdillon
Copy link
Contributor Author

/skip

@patrickdillon
Copy link
Contributor Author

/override ci/prow/e2e-aws-ovn-upi ci/prow/e2e-vsphere-upi

installs succeeded failures look like flakes and are unrelated to current changes

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2023

@patrickdillon: Overrode contexts on behalf of patrickdillon: ci/prow/e2e-aws-ovn-upi, ci/prow/e2e-vsphere-upi

Details

In response to this:

/override ci/prow/e2e-aws-ovn-upi ci/prow/e2e-vsphere-upi

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.

@patrickdillon
Copy link
Contributor Author

/override ci/prow/e2e-azure-ovn-upi

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2023

@patrickdillon: Overrode contexts on behalf of patrickdillon: ci/prow/e2e-azure-ovn-upi

Details

In response to this:

/override ci/prow/e2e-azure-ovn-upi

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

openshift-ci bot commented Jun 1, 2023

@patrickdillon: 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-vsphere-upi-zones 4dd6811 link false /test e2e-vsphere-upi-zones
ci/prow/e2e-metal-ipi-sdn-virtualmedia 4dd6811 link false /test e2e-metal-ipi-sdn-virtualmedia
ci/prow/okd-e2e-aws-ovn-upgrade 4dd6811 link false /test okd-e2e-aws-ovn-upgrade
ci/prow/okd-scos-e2e-aws-ovn 4dd6811 link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-libvirt 4dd6811 link false /test e2e-libvirt
ci/prow/e2e-vsphere-upi 4dd6811 link true /test e2e-vsphere-upi
ci/prow/e2e-agent-ha-dualstack 4dd6811 link false /test e2e-agent-ha-dualstack
ci/prow/e2e-metal-assisted 4dd6811 link false /test e2e-metal-assisted

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.

@patrickdillon patrickdillon merged commit 3dc691e into openshift:master Jun 1, 2023
@WenXinWei
Copy link
Contributor

hi @jcpowermac , please help review and merge pr 39916. then 6999 will not block upi zone installation.

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. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants