Skip to content

OSASINFRA-3707: ⚠️ Manual sync from release-0.12 on main ⚠️ #352

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-merge-bot merged 205 commits into from
Feb 13, 2025
Merged

OSASINFRA-3707: ⚠️ Manual sync from release-0.12 on main ⚠️ #352

openshift-merge-bot merged 205 commits into from
Feb 13, 2025

Conversation

@EmilienM
Copy link
Member

@EmilienM EmilienM commented Jan 23, 2025

/hold

pierreprinetti and others added 30 commits October 17, 2024 17:24
@pierreprinetti
refactoring: Untangle four image-fetching strategies
ea670c3
@k8s-ci-robot
Merge pull request kubernetes-sigs#2195 from shiftstack/image-switch
e31a757 
🌱 refactoring: Untangle four image-fetching strategies
@mdbooth
Remove pkg/utils/hash
0f945e1 
This package was hosting 2 exported functions that weren't sharing any
code and each had only a single consumer. We instead move the methods to
their respective points of use.

Also entirely removes the exported function HashInstanceSpec, which had
no consumers.
@mdbooth
Fix verification of generated files
40bd993 
Firstly, we weren't checking the go workspace in hack/codegen.

Secondly, we weren't verifying generated files in the orc directory at
all.
@mdbooth
make generate
9910c00
@k8s-ci-robot
Merge pull request kubernetes-sigs#2199 from shiftstack/utils-hash
035f6ac 
🌱 Remove pkg/utils/hash
@k8s-ci-robot
Merge pull request kubernetes-sigs#2200 from shiftstack/fix-verify
c9fe757 
🌱 Fix verification of generated files
@mdbooth
ORC: Move image controller into ORC
07f889c 
This requires copying some framework code currently shared with CAPO,
specifically clients and scope. These are expected to diverge over time
as their needs differ.
@k8s-ci-robot
Merge pull request kubernetes-sigs#2194 from shiftstack/free-willy
a54f55a 
🌱 ORC: Move image controller into ORC
@mdbooth
Bump k8s deps to v1.31.1
bf3208b 
This also required bumping controller-runtime to v0.19.1.

Incidentally removes the prometheus/common pin as it's no longer
required.
@mdbooth
Update groupversion_info with recent k8s pattern
ec609e0 
Specifically adds the Resource() method which is used by code generated
by newer codegen.
@k8s-ci-robot
Merge pull request kubernetes-sigs#2205 from shiftstack/k8s
8fc78f1 
🌱 Bump k8s deps to v1.31.1
@mdbooth
ORC: Move main.go under cmd/manager
58dafa4
@mdbooth
ORC: Fix bootstrapping of applyconfigurations
2bdac32 
codegen depends on interfaces generated by controller-gen.
However, controller-gen will fail during code inspection if the
applyconfiguration package does not already exist because it is imported
by the code being inspected. This is a bootstrapping problem.

We ensure the applyconfiguration package exists by adding a doc.go.
@mdbooth
ORC: Generate common parts of resource API
e4e85c3
@mdbooth
Fix conversion of v1alpha6 PortOpts
f8b3307 
v1alpha6 PortOpts conversion was missing many fields, but this was
hidden in the unit tests because the v1alpha6 restore function for the
machine spec unconditionally restored all Ports.

This change turns the unconditional restore of all ports in the machine
spec into individual conversion of each port, then fixes all the
resulting test failures by adding individual conversions and restores as
required.
@k8s-ci-robot
Merge pull request kubernetes-sigs#2203 from shiftstack/resource-gene…
663ba86 
…rator

🌱 ORC: Generate common parts of resource API
@mdbooth
codegen: Remove pre-v1.31 hacks
04223b6 
We no longer need a temporary 'core' symlink for generating clients for
a single group.

We no longer need to delete the generated clientsets, as we're now using
the same k8s version in the package as the generator, which is the
intended usage.
@mdbooth
Remove the codegen module
d5d98d6 
This module was a workaround because it required newer k8s deps than the
main module. This is no longer the case, so it's no longer required.
@k8s-ci-robot
Merge pull request kubernetes-sigs#2207 from shiftstack/issue2204
1a38f1b 
🐛 Fix conversion of v1alpha6 PortOpts
@k8s-ci-robot
Merge pull request kubernetes-sigs#2206 from shiftstack/codegen
5b66f35 
🌱 Simplify codegen usage and stop deleting generated clientsets
@EmilienM
Bump CAPI to v1.8.4
7d5b707 
The latest stable version on October 31th 2024.
@EmilienM
Use Dependabot for updading go.mod and GH workflows
867ebd6 
Maintaining our go.mod (we have 3 of them) up to date is a bit of work
and other cluster-api providers use dependabot to take care of it.

I took a look at the vsphere and azure providers and pretty much copy
pasted (with adjustments).
@k8s-ci-robot
Merge pull request kubernetes-sigs#2215 from shiftstack/capi-184
026c4e2 
✨ Bump CAPI to v1.8.4
@k8s-ci-robot
Merge pull request kubernetes-sigs#2217 from shiftstack/dependabot
2c514fb 
🌱 Use Dependabot for go.mod & GH workflows
@dependabot
🌱 chore(deps): bump(deps): Bump the all-go-mod-patch-and-minor group …
0838fd3 
…across 3 directories with 17 updates

Bumps the all-go-mod-patch-and-minor group with 7 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [github.com/gophercloud/gophercloud/v2](https://github.com/gophercloud/gophercloud) | `2.1.1` | `2.2.0` |
| [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) | `2.20.0` | `2.21.0` |
| [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) | `1.20.0` | `1.20.5` |
| [go.uber.org/mock](https://github.com/uber/mock) | `0.4.0` | `0.5.0` |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.31.1` | `0.31.2` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.31.1` | `0.31.2` |
| [sigs.k8s.io/structured-merge-diff/v4](https://github.com/kubernetes-sigs/structured-merge-diff) | `4.4.1` | `4.4.2` |

Bumps the all-go-mod-patch-and-minor group with 12 updates in the /hack/tools directory:

| Package | From | To |
| --- | --- | --- |
| [github.com/gophercloud/gophercloud/v2](https://github.com/gophercloud/gophercloud) | `2.1.1` | `2.2.0` |
| [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) | `2.20.1` | `2.21.0` |
| [github.com/onsi/gomega](https://github.com/onsi/gomega) | `1.34.2` | `1.35.1` |
| [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) | `1.20.0` | `1.20.5` |
| [go.uber.org/mock](https://github.com/uber/mock) | `0.4.0` | `0.5.0` |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.31.1` | `0.31.2` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.31.1` | `0.31.2` |
| [sigs.k8s.io/structured-merge-diff/v4](https://github.com/kubernetes-sigs/structured-merge-diff) | `4.4.1` | `4.4.2` |
| [github.com/a8m/envsubst](https://github.com/a8m/envsubst) | `1.2.0` | `1.4.2` |
| [github.com/itchyny/gojq](https://github.com/itchyny/gojq) | `0.12.2` | `0.12.16` |
| [sigs.k8s.io/controller-tools](https://github.com/kubernetes-sigs/controller-tools) | `0.16.4` | `0.16.5` |
| [sigs.k8s.io/kustomize/kustomize/v5](https://github.com/kubernetes-sigs/kustomize) | `5.2.1` | `5.5.0` |

Bumps the all-go-mod-patch-and-minor group with 6 updates in the /orc directory:

| Package | From | To |
| --- | --- | --- |
| [github.com/gophercloud/gophercloud/v2](https://github.com/gophercloud/gophercloud) | `2.1.1` | `2.2.0` |
| [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) | `2.20.0` | `2.21.0` |
| [go.uber.org/mock](https://github.com/uber/mock) | `0.4.0` | `0.5.0` |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.31.1` | `0.31.2` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.31.0` | `0.31.2` |
| [sigs.k8s.io/structured-merge-diff/v4](https://github.com/kubernetes-sigs/structured-merge-diff) | `4.4.1` | `4.4.2` |



Updates `github.com/gophercloud/gophercloud/v2` from 2.1.1 to 2.2.0
- [Release notes](https://github.com/gophercloud/gophercloud/releases)
- [Changelog](https://github.com/gophercloud/gophercloud/blob/v2.2.0/CHANGELOG.md)
- [Commits](gophercloud/gophercloud@v2.1.1...v2.2.0)

Updates `github.com/onsi/ginkgo/v2` from 2.20.0 to 2.21.0
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.20.0...v2.21.0)

Updates `github.com/onsi/gomega` from 1.34.1 to 1.34.2
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.34.2...v1.35.1)

Updates `github.com/prometheus/client_golang` from 1.20.0 to 1.20.5
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.20.0...v1.20.5)

Updates `go.uber.org/mock` from 0.4.0 to 0.5.0
- [Release notes](https://github.com/uber/mock/releases)
- [Changelog](https://github.com/uber-go/mock/blob/main/CHANGELOG.md)
- [Commits](uber-go/mock@v0.4.0...v0.5.0)

Updates `golang.org/x/crypto` from 0.26.0 to 0.28.0
- [Commits](golang/crypto@v0.26.0...v0.28.0)

Updates `k8s.io/api` from 0.31.1 to 0.31.2
- [Commits](kubernetes/api@v0.31.1...v0.31.2)

Updates `k8s.io/apiextensions-apiserver` from 0.31.1 to 0.31.2
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.31.1...v0.31.2)

Updates `k8s.io/apimachinery` from 0.31.1 to 0.31.2
- [Commits](kubernetes/apimachinery@v0.31.1...v0.31.2)

Updates `k8s.io/client-go` from 0.31.1 to 0.31.2
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.31.1...v0.31.2)

Updates `k8s.io/code-generator` from 0.31.1 to 0.31.2
- [Commits](kubernetes/code-generator@v0.31.1...v0.31.2)

Updates `k8s.io/component-base` from 0.31.1 to 0.31.2
- [Commits](kubernetes/component-base@v0.31.1...v0.31.2)

Updates `sigs.k8s.io/structured-merge-diff/v4` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/kubernetes-sigs/structured-merge-diff/releases)
- [Changelog](https://github.com/kubernetes-sigs/structured-merge-diff/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/structured-merge-diff@v4.4.1...v4.4.2)

Updates `github.com/gophercloud/gophercloud/v2` from 2.1.1 to 2.2.0
- [Release notes](https://github.com/gophercloud/gophercloud/releases)
- [Changelog](https://github.com/gophercloud/gophercloud/blob/v2.2.0/CHANGELOG.md)
- [Commits](gophercloud/gophercloud@v2.1.1...v2.2.0)

Updates `github.com/onsi/ginkgo/v2` from 2.20.1 to 2.21.0
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.20.0...v2.21.0)

Updates `github.com/onsi/gomega` from 1.34.2 to 1.35.1
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.34.2...v1.35.1)

Updates `github.com/prometheus/client_golang` from 1.20.0 to 1.20.5
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.20.0...v1.20.5)

Updates `go.uber.org/mock` from 0.4.0 to 0.5.0
- [Release notes](https://github.com/uber/mock/releases)
- [Changelog](https://github.com/uber-go/mock/blob/main/CHANGELOG.md)
- [Commits](uber-go/mock@v0.4.0...v0.5.0)

Updates `k8s.io/api` from 0.31.1 to 0.31.2
- [Commits](kubernetes/api@v0.31.1...v0.31.2)

Updates `k8s.io/apiextensions-apiserver` from 0.31.1 to 0.31.2
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.31.1...v0.31.2)

Updates `k8s.io/apimachinery` from 0.31.1 to 0.31.2
- [Commits](kubernetes/apimachinery@v0.31.1...v0.31.2)

Updates `k8s.io/client-go` from 0.31.1 to 0.31.2
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.31.1...v0.31.2)

Updates `k8s.io/code-generator` from 0.31.1 to 0.31.2
- [Commits](kubernetes/code-generator@v0.31.1...v0.31.2)

Updates `k8s.io/component-base` from 0.31.1 to 0.31.2
- [Commits](kubernetes/component-base@v0.31.1...v0.31.2)

Updates `sigs.k8s.io/structured-merge-diff/v4` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/kubernetes-sigs/structured-merge-diff/releases)
- [Changelog](https://github.com/kubernetes-sigs/structured-merge-diff/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/structured-merge-diff@v4.4.1...v4.4.2)

Updates `github.com/a8m/envsubst` from 1.2.0 to 1.4.2
- [Release notes](https://github.com/a8m/envsubst/releases)
- [Commits](a8m/envsubst@v1.2.0...v1.4.2)

Updates `github.com/itchyny/gojq` from 0.12.2 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.2...v0.12.16)

Updates `sigs.k8s.io/controller-tools` from 0.16.4 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.4...v0.16.5)

Updates `sigs.k8s.io/kustomize/kustomize/v5` from 5.2.1 to 5.5.0
- [Release notes](https://github.com/kubernetes-sigs/kustomize/releases)
- [Commits](kubernetes-sigs/kustomize@kustomize/v5.2.1...kustomize/v5.5.0)

Updates `github.com/gophercloud/gophercloud/v2` from 2.1.1 to 2.2.0
- [Release notes](https://github.com/gophercloud/gophercloud/releases)
- [Changelog](https://github.com/gophercloud/gophercloud/blob/v2.2.0/CHANGELOG.md)
- [Commits](gophercloud/gophercloud@v2.1.1...v2.2.0)

Updates `github.com/onsi/ginkgo/v2` from 2.20.0 to 2.21.0
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.20.0...v2.21.0)

Updates `github.com/onsi/gomega` from 1.34.1 to 1.34.2
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.34.2...v1.35.1)

Updates `go.uber.org/mock` from 0.4.0 to 0.5.0
- [Release notes](https://github.com/uber/mock/releases)
- [Changelog](https://github.com/uber-go/mock/blob/main/CHANGELOG.md)
- [Commits](uber-go/mock@v0.4.0...v0.5.0)

Updates `k8s.io/api` from 0.31.1 to 0.31.2
- [Commits](kubernetes/api@v0.31.1...v0.31.2)

Updates `k8s.io/apiextensions-apiserver` from 0.31.0 to 0.31.2
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.31.1...v0.31.2)

Updates `k8s.io/apimachinery` from 0.31.1 to 0.31.2
- [Commits](kubernetes/apimachinery@v0.31.1...v0.31.2)

Updates `k8s.io/client-go` from 0.31.1 to 0.31.2
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.31.1...v0.31.2)

Updates `k8s.io/code-generator` from 0.31.1 to 0.31.2
- [Commits](kubernetes/code-generator@v0.31.1...v0.31.2)

Updates `k8s.io/component-base` from 0.31.0 to 0.31.2
- [Commits](kubernetes/component-base@v0.31.1...v0.31.2)

Updates `sigs.k8s.io/structured-merge-diff/v4` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/kubernetes-sigs/structured-merge-diff/releases)
- [Changelog](https://github.com/kubernetes-sigs/structured-merge-diff/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/structured-merge-diff@v4.4.1...v4.4.2)

---
updated-dependencies:
- dependency-name: github.com/gophercloud/gophercloud/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: go.uber.org/mock
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/code-generator
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/component-base
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/structured-merge-diff/v4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/gophercloud/gophercloud/v2
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/gomega
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/prometheus/client_golang
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: go.uber.org/mock
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/api
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apimachinery
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/client-go
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/code-generator
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/component-base
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/structured-merge-diff/v4
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/a8m/envsubst
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/itchyny/gojq
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/controller-tools
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/kustomize/kustomize/v5
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/gophercloud/gophercloud/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: go.uber.org/mock
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/code-generator
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/component-base
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/structured-merge-diff/v4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
Update generated code
6cd2b92
@EmilienM
vendoring: pin structured-merge-diff to v4.4.1
1a8d3b3 
A backward incompatible change was made:
kubernetes-sigs/structured-merge-diff@c68c9ee

Which is not compatible with k8s v0.31.2.
An update was done very recently but not released yet:
kubernetes/kubernetes@2bc17d1#diff-1966d58e97bf87f3cd69e4957a2c948a72ca97c36df3ea099ac0ea6592e42dbfL56

So in the meantime we need to pin structured-merge-diff to v4.4.1 to not
have this compilation error:

```
/root/go/pkg/mod/k8s.io/[email protected]/pkg/util/managedfields/internal/structuredmerge.go:56:4: unknown field IgnoredFields in struct literal of type merge.Updater
/root/go/pkg/mod/k8s.io/[email protected]/pkg/util/managedfields/internal/structuredmerge.go:73:4: unknown field IgnoredFields in struct literal of type merge.Updater
```
@k8s-ci-robot
Merge pull request kubernetes-sigs#2218 from kubernetes-sigs/dependab…
84b81d5 
…ot/go_modules/all-go-mod-patch-and-minor-2c23c53572

🌱 bump(deps): Bump the all-go-mod-patch-and-minor group across 3 directories with 17 updates
@dependabot
🌱 chore(deps): bump(deps): Bump the all-go-mod-patch-and-minor group …
5afdc24 
…across 2 directories with 1 update

Bumps the all-go-mod-patch-and-minor group with 1 update in the / directory: [github.com/onsi/gomega](https://github.com/onsi/gomega).
Bumps the all-go-mod-patch-and-minor group with 1 update in the /orc directory: [github.com/onsi/gomega](https://github.com/onsi/gomega).


Updates `github.com/onsi/gomega` from 1.34.2 to 1.35.1
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.34.2...v1.35.1)

Updates `github.com/onsi/gomega` from 1.34.2 to 1.35.1
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.34.2...v1.35.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@EmilienM
Copy link
Member Author

EmilienM commented Feb 7, 2025

We can retest once https://amd64.ocp.releases.ci.openshift.org/releasestream/4.19.0-0.ci/release/4.19.0-0.ci-2025-02-07-194913 was approved.

@EmilienM EmilienM marked this pull request as draft February 7, 2025 20:50
@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 Feb 7, 2025
@EmilienM EmilienM mentioned this pull request Feb 10, 2025
Merged
@EmilienM
Copy link
Member Author

EmilienM commented Feb 10, 2025

/testwith openshift/cluster-api-provider-openstack/main/e2e-techpreview openshift/openstack-resource-controller#9

@EmilienM EmilienM marked this pull request as ready for review February 10, 2025 01:05
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 10, 2025
@openshift-ci openshift-ci bot requested a review from gryf February 10, 2025 01:07
@EmilienM
Copy link
Member Author

EmilienM commented Feb 10, 2025

/testwith openshift/cluster-api-provider-openstack/main/e2e-techpreview openshift/openstack-resource-controller#9

@EmilienM
Copy link
Member Author

EmilienM commented Feb 12, 2025

/testwith openshift/cluster-api-provider-openstack/main/e2e-techpreview openshift/openstack-resource-controller#9

@openshift-ci
Copy link

openshift-ci bot commented Feb 12, 2025

@EmilienM: all tests passed!

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.

@EmilienM
Copy link
Member Author

EmilienM commented Feb 13, 2025

I'll re-run the jobs once we have a promotion in 4.19 CI images. Should happen in the next hours.

@EmilienM
Copy link
Member Author

EmilienM commented Feb 13, 2025

/hold cancel

@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 13, 2025
@mdbooth
Copy link

mdbooth commented Feb 13, 2025

/approve
/lgtm

Because ORC has landed in the payload, the inclusion of ORC CRDs in CAPO is now breaking other tests, e.g. openshift/cluster-api#230. Lets merge this asap because it's definitely already broken, and add some additional tests here to try to detect anything else broken and/or prevent it from happening again.

@EmilienM
Copy link
Member Author

EmilienM commented Feb 13, 2025

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. lgtm Indicates that a PR is ready to be merged. labels Feb 13, 2025
@EmilienM
Copy link
Member Author

EmilienM commented Feb 13, 2025

/approve

@openshift-ci
Copy link

openshift-ci bot commented Feb 13, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM, mdbooth

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 Feb 13, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 62c73e7 into openshift:main Feb 13, 2025
9 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the sync-main branch February 13, 2025 15:42
@openshift-bot
Copy link

openshift-bot commented Feb 13, 2025

[ART PR BUILD NOTIFIER]

Distgit: openstack-cluster-api-controllers
This PR has been included in build openstack-cluster-api-controllers-container-v4.19.0-202502132109.p0.g62c73e7.assembly.stream.el9.
All builds following this will include this PR.

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

Reviewers

@mandre mandre Awaiting requested review from mandre

@pierreprinetti pierreprinetti Awaiting requested review from pierreprinetti

@gryf gryf Awaiting requested review from gryf

Assignees

@mdbooth mdbooth

Labels

acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. 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.