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

OCPCLOUD-2747: Merge https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud:v0.9.0-beta.1 (9b07704) into main #92

Merged

Conversation

cloud-team-rebase-bot[bot]
Copy link

No description provided.

damdo and others added 30 commits May 23, 2024 05:26
…#1789)

Bumps [github.com/IBM/platform-services-go-sdk](https://github.com/IBM/platform-services-go-sdk) from 0.62.11 to 0.63.0.
- [Release notes](https://github.com/IBM/platform-services-go-sdk/releases)
- [Changelog](https://github.com/IBM/platform-services-go-sdk/blob/main/CHANGELOG.md)
- [Commits](IBM/platform-services-go-sdk@v0.62.11...v0.63.0)

---
updated-dependencies:
- dependency-name: github.com/IBM/platform-services-go-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…1813)

Bumps [github.com/IBM/platform-services-go-sdk](https://github.com/IBM/platform-services-go-sdk) from 0.63.0 to 0.63.1.
- [Release notes](https://github.com/IBM/platform-services-go-sdk/releases)
- [Changelog](https://github.com/IBM/platform-services-go-sdk/blob/main/CHANGELOG.md)
- [Commits](IBM/platform-services-go-sdk@v0.63.0...v0.63.1)

---
updated-dependencies:
- dependency-name: github.com/IBM/platform-services-go-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [sigs.k8s.io/kustomize/kustomize/v5](https://github.com/kubernetes-sigs/kustomize) from 5.4.1 to 5.4.2.
- [Release notes](https://github.com/kubernetes-sigs/kustomize/releases)
- [Commits](kubernetes-sigs/kustomize@kustomize/v5.4.1...kustomize/v5.4.2)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/kustomize/kustomize/v5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.58.1 to 1.59.0.
- [Release notes](https://github.com/golangci/golangci-lint/releases)
- [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md)
- [Commits](golangci/golangci-lint@v1.58.1...v1.59.0)

---
updated-dependencies:
- dependency-name: github.com/golangci/golangci-lint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.org/x/vuln](https://github.com/golang/vuln) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/golang/vuln/releases)
- [Commits](golang/vuln@v1.1.0...v1.1.1)

---
updated-dependencies:
- dependency-name: golang.org/x/vuln
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [gotest.tools/gotestsum](https://github.com/gotestyourself/gotestsum) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/gotestyourself/gotestsum/releases)
- [Commits](gotestyourself/gotestsum@v1.11.0...v1.12.0)

---
updated-dependencies:
- dependency-name: gotest.tools/gotestsum
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.25.0 to 0.26.0.
- [Commits](golang/net@v0.25.0...v0.26.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#1821)

Bumps [github.com/itchyny/gojq](https://github.com/itchyny/gojq) from 0.12.15 to 0.12.16.
- [Release notes](https://github.com/itchyny/gojq/releases)
- [Changelog](https://github.com/itchyny/gojq/blob/main/CHANGELOG.md)
- [Commits](itchyny/gojq@v0.12.15...v0.12.16)

---
updated-dependencies:
- dependency-name: github.com/itchyny/gojq
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/coreos/ignition/v2](https://github.com/coreos/ignition) from 2.18.0 to 2.19.0.
- [Release notes](https://github.com/coreos/ignition/releases)
- [Changelog](https://github.com/coreos/ignition/blob/main/docs/release-notes.md)
- [Commits](coreos/ignition@v2.18.0...v2.19.0)

---
updated-dependencies:
- dependency-name: github.com/coreos/ignition/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/IBM/vpc-go-sdk](https://github.com/IBM/vpc-go-sdk) from 0.51.0 to 0.52.0.
- [Release notes](https://github.com/IBM/vpc-go-sdk/releases)
- [Changelog](https://github.com/IBM/vpc-go-sdk/blob/master/CHANGELOG.md)
- [Commits](IBM/vpc-go-sdk@v0.51.0...v0.52.0)

---
updated-dependencies:
- dependency-name: github.com/IBM/vpc-go-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.59.0 to 1.59.1.
- [Release notes](https://github.com/golangci/golangci-lint/releases)
- [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md)
- [Commits](golangci/golangci-lint@v1.59.0...v1.59.1)

---
updated-dependencies:
- dependency-name: github.com/golangci/golangci-lint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…834)

Extend existing conditions to check valid PowerVS zone and VPC region is used
Bumps [golang.org/x/vuln](https://github.com/golang/vuln) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/golang/vuln/releases)
- [Commits](golang/vuln@v1.1.1...v1.1.2)

---
updated-dependencies:
- dependency-name: golang.org/x/vuln
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](spf13/cobra@v1.8.0...v1.8.1)

---
updated-dependencies:
- dependency-name: github.com/spf13/cobra
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@damdo
Copy link
Member

damdo commented Nov 5, 2024

/hold

For manual e2e testing from @Karthik-K-N

@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 Nov 5, 2024
Copy link
Member

@damdo damdo 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 5, 2024
@Karthik-K-N
Copy link
Member

Karthik-K-N commented Nov 6, 2024

Testing updates

Uncovered couple of bugs during testing and submitted a fix upstream.
kubernetes-sigs/cluster-api-provider-ibmcloud#2037
kubernetes-sigs/cluster-api-provider-ibmcloud#2039

Also tested with the fix and e2e are passing as expected

  [SKIPPED] Skipping AWS E2E tests
  In [BeforeAll] at: /Users/karthikkn/openshift-workspace/cluster-capi-operator/e2e/aws_test.go:41 @ 11/06/24 11:00:24.285

  Full Stack Trace
    github.com/openshift/cluster-capi-operator/e2e.init.func1.1()
    	/Users/karthikkn/openshift-workspace/cluster-capi-operator/e2e/aws_test.go:41 +0x114
------------------------------

Ran 1 of 5 Specs in 1015.874 seconds
SUCCESS! -- 1 Passed | 0 Failed | 0 Pending | 4 Skipped
PASS

Ginkgo ran 1 suite in 17m3.001716667s
Test Suite Passed

@JoelSpeed
Copy link
Contributor

@Karthik-K-N Thanks for testing and getting those fixes up, looks like one has now merged, the other needs a rebase. Keen to get this in soon so, @damdo can you keep an eye on those two upstream PRs and make sure we get this updated as soon as the second is in?

@damdo
Copy link
Member

damdo commented Nov 6, 2024

@JoelSpeed we are in close contact, @Karthik-K-N an I, I'm already keeping an eye on them.

@Karthik-K-N
Copy link
Member

Karthik-K-N commented Nov 7, 2024

Both the Upstream PRs have been merged.

@damdo damdo force-pushed the rebase-bot-master branch from 6e48ebc to 1a4ae29 Compare November 7, 2024 08:53
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 7, 2024
@damdo
Copy link
Member

damdo commented Nov 7, 2024

Thanks @Karthik-K-N I've updated this rebase PR adding upstream PRs 2037 and 2039

@damdo damdo force-pushed the rebase-bot-master branch from 1a4ae29 to b4a0b31 Compare November 7, 2024 09:32
Copy link
Contributor

openshift-ci bot commented Nov 7, 2024

@cloud-team-rebase-bot[bot]: 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-sigs/prow repository. I understand the commands that are listed here.

Copy link
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

Based on CI results and manual e2e tests conducted by @Karthik-K-N
#92 (comment)

I'm happy to get this merged.

/approve
/lgtm
/unhold

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Nov 7, 2024
Copy link
Contributor

openshift-ci bot commented Nov 7, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo

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 7, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit da36260 into openshift:main Nov 7, 2024
5 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-ibmcloud-cluster-api-controllers
This PR has been included in build ose-ibmcloud-cluster-api-controllers-container-v4.18.0-202411071138.p0.gda36260.assembly.stream.el9.
All builds following this will include this PR.

@Karthik-K-N
Copy link
Member

@damdo We would like to cherry-pick only this commit to 4.17, as its needed for hypershift to work. Can we do it or should I submit a separate PR to 4.17.

@damdo
Copy link
Member

damdo commented Nov 19, 2024

@Karthik-K-N Let's have a separate PR for that commit, as 0.9.0-beta.1 won't be aligned in terms of capi/k8s deps with 4.17

@Karthik-K-N
Copy link
Member

@Karthik-K-N Let's have a separate PR for that commit, as 0.9.0-beta.1 won't be aligned in terms of capi/k8s deps with 4.17

Thank you will do.

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-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.