Skip to content

OCPCLOUD-2986,OCPCLOUD-2985,OCPBUGS-56849: Bump machine-api-operator to pull in authoritativeAPI fix #134

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

Merged
openshift-merge-bot merged 1 commit into from
Jul 7, 2025
Merged

OCPCLOUD-2986,OCPCLOUD-2985,OCPBUGS-56849: Bump machine-api-operator to pull in authoritativeAPI fix #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/onsi/gomega v1.36.2
github.com/openshift/api v0.0.0-20250528100135-a463917701ab
github.com/openshift/library-go v0.0.0-20250203131244-80620876b7c2
github.com/openshift/machine-api-operator v0.2.1-0.20250506123515-c34e59369dfb
github.com/openshift/machine-api-operator v0.2.1-0.20250704070513-81d86b5a1ef5
k8s.io/api v0.32.2
k8s.io/apimachinery v0.32.2
k8s.io/apiserver v0.32.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,8 @@ github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-202501281
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20250128131205-c7b3d7b57a8e/go.mod h1:ae3TvkWGFUuKQAnypbtiVMXxBlRfJGbf37z5zVh98uA=
github.com/openshift/library-go v0.0.0-20250203131244-80620876b7c2 h1:LaJmI+EeFnpbxs5H4Y6KOiNXhtPjldqvNzVfPpNM+dI=
github.com/openshift/library-go v0.0.0-20250203131244-80620876b7c2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8=
github.com/openshift/machine-api-operator v0.2.1-0.20250506123515-c34e59369dfb h1:VnMcFYS1Do23IoW1n7/tKs+CzK3BdYfxRSOflG9DyrU=
github.com/openshift/machine-api-operator v0.2.1-0.20250506123515-c34e59369dfb/go.mod h1:YHka8F8yTPUeDhgXtBW4KKw46uT7UwYj3LghJsVr7YQ=
github.com/openshift/machine-api-operator v0.2.1-0.20250704070513-81d86b5a1ef5 h1:qE46shcZY9nOnah14lQOPWduvWYrXIVpCnDoH4IMt0o=
github.com/openshift/machine-api-operator v0.2.1-0.20250704070513-81d86b5a1ef5/go.mod h1:1fnQ4CMfwvkLTRafNW3aSC/9w73vbYW6h4ogM0sALgw=
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
Expand Down
107 changes: 76 additions & 31 deletions vendor/github.com/openshift/machine-api-operator/pkg/controller/machine/controller.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions vendor/github.com/openshift/machine-api-operator/pkg/util/conditions/gettersetter.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ github.com/openshift/client-go/machine/listers/machine/v1beta1
github.com/openshift/library-go/pkg/config/clusterstatus
github.com/openshift/library-go/pkg/config/leaderelection
github.com/openshift/library-go/pkg/features
# github.com/openshift/machine-api-operator v0.2.1-0.20250506123515-c34e59369dfb
# github.com/openshift/machine-api-operator v0.2.1-0.20250704070513-81d86b5a1ef5
## explicit; go 1.23.0
github.com/openshift/machine-api-operator/pkg/controller/machine
github.com/openshift/machine-api-operator/pkg/metrics
Expand Down