Merge upstream #36
Merged
Merge upstream #36
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [sigs.k8s.io/controller-tools](https://github.com/kubernetes-sigs/controller-tools) from 0.16.1 to 0.16.5. - [Release notes](https://github.com/kubernetes-sigs/controller-tools/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-tools/blob/main/envtest-releases.yaml) - [Commits](kubernetes-sigs/controller-tools@v0.16.1...v0.16.5) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-tools dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bump golang to 1.23.3 and golangci-lint to 1.60.3 which supports Go 1.23. Get rid of deprecated golangci-lint configs, and add timeout to the action, otherwise it'll be timed out in 1 minute. 15 minutes is consistent with "make lint" timeout. Linter fixes: - Fix new linter errors by removing the return value which is always nil (unparam linter), and thus meaningless. - "exportloopref" is not needed from Go 1.22 onwards, replaced by "copyloopvar" in golangci-lint 1.60.2. - Ambiguous string warnings in Wrapf fixed. Signed-off-by: Tuomo Tanskanen <[email protected]>
Add scheduled osv-scanner workflow. Signed-off-by: Tuomo Tanskanen <[email protected]>
Make use of 'make go-version' rather than parse it from Dockerfile. Cherry-picked from IPAM. Signed-off-by: Tuomo Tanskanen <[email protected]>
…mplification 🌱 simplify go version handling in verify-release.sh
🌱 bump golang to 1.23.3 and golangci-lint to 1.60.3
Signed-off-by: Peppi-Lotta <[email protected]>
🌱 add scheduled osv-scanner workflow
…s/hack/tools/main/sigs.k8s.io/controller-tools-0.16.5 🌱 Bump sigs.k8s.io/controller-tools from 0.16.1 to 0.16.5 in /hack/tools
…-to-1.22.9 🌱 Bump IPAM to 1.8.1
Signed-off-by: Sunnatillo <[email protected]>
….1/sunnat 🌱 Bump CAPI to v1.9.0-beta.1
Recently we have experienced net.OpError error or http2streamerror error while downloading image quite frequently. This PR uses wget instead which is more resilient to http/network issues. We should change it to httpGet when network improves again. Signed-off-by: Kashif Khan <[email protected]>
…e-withExponentialBackoff 🌱 Use wget while downloading image
Signed-off-by: Muhammad Adil Ghaffar <[email protected]>
🌱 Bump CAPI to v1.9.0-rc.0
Bumps the kubernetes group with 2 updates in the /hack/tools directory: [k8s.io/api](https://github.com/kubernetes/api) and [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver). Bumps the kubernetes group with 1 update in the /test directory: [k8s.io/kubectl](https://github.com/kubernetes/kubectl). Updates `k8s.io/api` from 0.31.2 to 0.31.3 - [Commits](kubernetes/api@v0.31.2...v0.31.3) Updates `k8s.io/apiextensions-apiserver` from 0.31.2 to 0.31.3 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.31.2...v0.31.3) Updates `k8s.io/apimachinery` from 0.31.2 to 0.31.3 - [Commits](kubernetes/apimachinery@v0.31.2...v0.31.3) Updates `k8s.io/code-generator` from 0.31.2 to 0.31.3 - [Commits](kubernetes/code-generator@v0.31.2...v0.31.3) Updates `k8s.io/kubectl` from 0.30.6 to 0.30.7 - [Commits](kubernetes/kubectl@v0.30.6...v0.30.7) --- updated-dependencies: - dependency-name: k8s.io/api dependency-type: indirect update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/apiextensions-apiserver dependency-type: indirect update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/apimachinery dependency-type: indirect update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/code-generator dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/kubectl dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kubernetes ... Signed-off-by: dependabot[bot] <[email protected]>
…s/hack/tools/main/kubernetes-47d7a75f8b 🌱 Bump the k8s.io/* deps to v0.31.3
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.3 to 3.27.5. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@396bb3e...f09c1c0) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 2.0.9 to 2.1.0. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](softprops/action-gh-release@e7a8f85...01570a1) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…tions/main/github/codeql-action-3.27.5 🌱 Bump github/codeql-action from 3.27.3 to 3.27.5
…tions/main/softprops/action-gh-release-2.1.0 🌱 Bump softprops/action-gh-release from 2.0.9 to 2.1.0
Signed-off-by: Peppi-Lotta <[email protected]>
…o-1.9.0-beta.0 🌱 Bump IPAM to v.1.9.0-beta.0
Signed-off-by: Peppi-Lotta <[email protected]>
…-to-v1.23.4 🌱 Bump Golang to v1.23.4
Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.19.2 to 0.19.3. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.19.2...v0.19.3) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…s/api/main/sigs.k8s.io/controller-runtime-0.19.3 🌱 Bump sigs.k8s.io/controller-runtime from 0.19.2 to 0.19.3
…1.9/adil 🌱 Update clusterctl tests for 1.9
…-install-ironic-bmo-pivot-test 🌱 Only use Kustomize to install Ironic and BMO in e2e tests
Signed-off-by: Muhammad Adil Ghaffar <[email protected]>
Bumps the capi group with 1 update in the / directory: [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api). Bumps the capi group with 1 update in the /api directory: [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api). Bumps the capi group with 2 updates in the /hack/fake-apiserver directory: [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api) and [sigs.k8s.io/cluster-api/test](https://github.com/kubernetes-sigs/cluster-api). Bumps the capi group with 2 updates in the /test directory: [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api) and [sigs.k8s.io/cluster-api/test](https://github.com/kubernetes-sigs/cluster-api). Updates `sigs.k8s.io/cluster-api` from 1.9.3 to 1.9.4 - [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases) - [Commits](kubernetes-sigs/cluster-api@v1.9.3...v1.9.4) Updates `sigs.k8s.io/cluster-api` from 1.9.3 to 1.9.4 - [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases) - [Commits](kubernetes-sigs/cluster-api@v1.9.3...v1.9.4) Updates `sigs.k8s.io/cluster-api` from 1.9.3 to 1.9.4 - [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases) - [Commits](kubernetes-sigs/cluster-api@v1.9.3...v1.9.4) Updates `sigs.k8s.io/cluster-api/test` from 1.9.3 to 1.9.4 - [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases) - [Commits](kubernetes-sigs/cluster-api@v1.9.3...v1.9.4) Updates `sigs.k8s.io/cluster-api` from 1.9.3 to 1.9.4 - [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases) - [Commits](kubernetes-sigs/cluster-api@v1.9.3...v1.9.4) Updates `sigs.k8s.io/cluster-api/test` from 1.9.3 to 1.9.4 - [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases) - [Commits](kubernetes-sigs/cluster-api@v1.9.3...v1.9.4) --- updated-dependencies: - dependency-name: sigs.k8s.io/cluster-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: capi - dependency-name: sigs.k8s.io/cluster-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: capi - dependency-name: sigs.k8s.io/cluster-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: capi - dependency-name: sigs.k8s.io/cluster-api/test dependency-type: direct:production update-type: version-update:semver-patch dependency-group: capi - dependency-name: sigs.k8s.io/cluster-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: capi - dependency-name: sigs.k8s.io/cluster-api/test dependency-type: direct:production update-type: version-update:semver-patch dependency-group: capi ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.5.0+incompatible to 27.5.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v27.5.0...v27.5.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [github.com/metal3-io/ironic-standalone-operator](https://github.com/metal3-io/ironic-standalone-operator) from 0.0.0-20241223110838-7a780c05847c to 0.1.0. - [Release notes](https://github.com/metal3-io/ironic-standalone-operator/releases) - [Commits](https://github.com/metal3-io/ironic-standalone-operator/commits/v0.1.0) --- updated-dependencies: - dependency-name: github.com/metal3-io/ironic-standalone-operator dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…s/main/capi-62a83770e2 🌱 Bump CAPI to v1.9.4
…s/test/main/github.com/metal3-io/ironic-standalone-operator-0.1.0 🌱 Bump github.com/metal3-io/ironic-standalone-operator from 0.0.0-20241223110838-7a780c05847c to 0.1.0 in /test
…er/adil ✨ Deprecate NoCloudProvider and add CloudProviderEnabled
Both Peppi-lotta and Huy has reached the required number of commits and also helped in the review process recently. Thanks a lot folks for your contributions. Signed-off-by: Kashif Khan <[email protected]>
…s/test/main/github.com/docker/docker-27.5.1incompatible 🌱 Bump github.com/docker/docker from 27.5.0+incompatible to 27.5.1+incompatible in /test
🌱 Add Peppi-lotta and Huy as reviewers
We have removed the IP address from the CA in the source manifests. This breaks the replacement because it was selecting ALL certificates. This commit changes it to only select the ironic-certificate. Signed-off-by: Lennart Jern <[email protected]>
…tomization 🌱 E2E: Fix Ironic kustomization
Signed-off-by: Muhammad Adil Ghaffar <[email protected]>
🌱 remove kubebuilder:default=true for CloudProviderEnabled and set defaults in defaulting webhook
This reverts commit 1257071.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: honza 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 |
openshift-ci
bot
added
the
approved
|
@honza: The following test failed, say
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. |
|
/lgtm |
|
This project isn't part of any openshift release yet. /label acknowledge-critical-fixes-only |
openshift-ci
bot
added
the
acknowledge-critical-fixes-only
|
[ART PR BUILD NOTIFIER] Distgit: ose-baremetal-cluster-api-controllers |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In this PR, we first re-apply (i.e. revert a revert) an upgrade to capi 1.9.0 and then we merge upstream as usual. Without the double revert, we run into all kinds of nasty merge conflicts.
We had to revert the capi 1.9 change because openshift didn't have golang 1.23 at the time. Now it does. This brings us more inline with upstream.