Skip to content

MCO-2296: OSImageStreams v1 promotion #31211

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
JoelSpeed merged 1 commit into from
Jun 3, 2026
Merged

MCO-2296: OSImageStreams v1 promotion #31211

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
7 changes: 6 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ require (
github.com/opencontainers/go-digest v1.0.0
github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b824818
github.com/openshift-kni/commatrix v0.0.5-0.20251111204857-e5a931eff73f
github.com/openshift/api v0.0.0-20260327065519-582dc3d316b7
github.com/openshift/api v0.0.0-20260511191110-9b69e5fa27e9
github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
github.com/openshift/client-go v0.0.0-20260330134249-7e1499aaacd7
Expand Down Expand Up @@ -465,3 +465,8 @@ replace (
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20260305123649-d18f3f005eaa
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20260305123649-d18f3f005eaa
)

replace (
github.com/openshift/api => github.com/pablintino/api v0.0.0-20260528074109-71b14e62c33b
github.com/openshift/client-go => github.com/pablintino/client-go v0.0.0-20260602163508-784018048305
)
Comment on lines +469 to +472

@coderabbitai coderabbitai Bot May 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major | 🏗️ Heavy lift

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

# Verify whether core OpenShift modules are still redirected to personal forks.
rg -n 'github.com/openshift/(api|client-go)\s*=>\s*github.com/pablintino/' go.mod

Repository: openshift/origin

Length of output: 260

Avoid merging personal-fork replace directives for core OpenShift modules.

go.mod still redirects core deps to github.com/pablintino/*:

  • github.com/openshift/api → github.com/pablintino/api
  • github.com/openshift/client-go → github.com/pablintino/client-go

Before merge, switch these replace entries back to the corresponding official github.com/openshift/* revisions.

Current `replace` block (go.mod lines 469-472) 
replace (
	github.com/openshift/api => github.com/pablintino/api v0.0.0-20260521171850-d966b3dbc2ea
	github.com/openshift/client-go => github.com/pablintino/client-go v0.0.0-20260525080936-979136ea86e0
)
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@go.mod` around lines 469 - 472, The go.mod currently contains local-fork
replace directives redirecting github.com/openshift/api and
github.com/openshift/client-go to your pablintino forks; revert these replace
entries so the modules point back to the official github.com/openshift/api and
github.com/openshift/client-go versions (replace or remove the lines referencing
github.com/pablintino/api and github.com/pablintino/client-go), and run `go
get`/`go mod tidy` to pick the correct upstream revisions; ensure the replace
block no longer maps github.com/openshift/api or github.com/openshift/client-go
to pablintino forks.

8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,14 +878,10 @@ github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b8
github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b824818/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
github.com/openshift-kni/commatrix v0.0.5-0.20251111204857-e5a931eff73f h1:E72Zoc+JImPehBrXkgaCbIDbSFuItvyX6RCaZ0FQE5k=
github.com/openshift-kni/commatrix v0.0.5-0.20251111204857-e5a931eff73f/go.mod h1:cDVdp0eda7EHE6tLuSeo4IqPWdAX/KJK+ogBirIGtsI=
github.com/openshift/api v0.0.0-20260327065519-582dc3d316b7 h1:7AmoMSqTryaZu65nij6EACe8+DmlMlmR1giaUx5S5sQ=
github.com/openshift/api v0.0.0-20260327065519-582dc3d316b7/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31 h1:oYPQMrkzyk002L5aN8I2tkUHTEu9lsVrc1qiJmHJdXU=
github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31/go.mod h1:mnTsMMTtXSPBQzqBp5HXBjLvliveKenRADFQy9m5jc0=
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee h1:+Sp5GGnjHDhT/a/nQ1xdp43UscBMr7G5wxsYotyhzJ4=
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/client-go v0.0.0-20260330134249-7e1499aaacd7 h1:5GSoQlywIwYsRCw3qN+ZDmN6HrXTMZfI33bdRNm2jRQ=
github.com/openshift/client-go v0.0.0-20260330134249-7e1499aaacd7/go.mod h1:HhXTUIMhgzxR3Ln/zEkr4QjTL0NN7A+t9Py/we9j2ug=
github.com/openshift/kubernetes v0.0.0-20260305123649-d18f3f005eaa h1:4TK07egSJrny442x0Kl0HgzXgt2lnCKTKHF3sbL2U3E=
github.com/openshift/kubernetes v0.0.0-20260305123649-d18f3f005eaa/go.mod h1:1r2FIoYrPU0110cjYlWAwNcbiqRPLWAgmZK4d0YeEZw=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20260305123649-d18f3f005eaa h1:ifOqAFthJWnT1HS6Sq2AcLQWNSJ1+XEiyA9eo+PIcR0=
Expand Down Expand Up @@ -951,6 +947,10 @@ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYr
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20250118001652-a8b9c3c31417 h1:7k+dokKFfpICbkpX5TvvpFbKTFsl/6YQd46EpY2JNhc=
github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20250118001652-a8b9c3c31417/go.mod h1:9LxDV3rAHlGHAYtVrT62y/fqfIxc5RrDiYi9RVeD0gg=
github.com/pablintino/api v0.0.0-20260528074109-71b14e62c33b h1:VNoqZTWcS74TUI4TeUIdbevP+1ZhvHNk9E/3N79wxzg=
github.com/pablintino/api v0.0.0-20260528074109-71b14e62c33b/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
github.com/pablintino/client-go v0.0.0-20260602163508-784018048305 h1:Y/KH/7YB3XGNakXjSD6exhu4ehDlmo8T6tTFPDv2B9s=
github.com/pablintino/client-go v0.0.0-20260602163508-784018048305/go.mod h1:B30HmrKXy/2nTJ3GS5QJMPxpOyhvH68T1Lm03cXswXs=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
Expand Down
2 changes: 1 addition & 1 deletion pkg/monitortestlibrary/platformidentification/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func getOSImageStreams(mc machineconfigclient.Interface) (OSImageStreams, error)
var osImageStreams OSImageStreams
var errs []error

osImageStream, err := mc.MachineconfigurationV1alpha1().OSImageStreams().Get(context.TODO(), "cluster", metav1.GetOptions{})
osImageStream, err := mc.MachineconfigurationV1().OSImageStreams().Get(context.TODO(), "cluster", metav1.GetOptions{})
if err != nil {
if !kapierrs.IsNotFound(err) {
errs = append(errs, fmt.Errorf("error getting OSImageStream singleton: %v", err))
Expand Down
36 changes: 12 additions & 24 deletions pkg/monitortestlibrary/platformidentification/types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import (
"testing"

mcapiv1 "github.com/openshift/api/machineconfiguration/v1"
mcapiv1alpha1 "github.com/openshift/api/machineconfiguration/v1alpha1"
machineconfigclient "github.com/openshift/client-go/machineconfiguration/clientset/versioned"
mcv1 "github.com/openshift/client-go/machineconfiguration/clientset/versioned/typed/machineconfiguration/v1"
mcv1alpha1 "github.com/openshift/client-go/machineconfiguration/clientset/versioned/typed/machineconfiguration/v1alpha1"
kapierrs "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand All @@ -22,32 +20,24 @@ import (

type fakeMCClient struct {
machineconfigclient.Interface
v1 *fakeMCv1
v1alpha1 *fakeMCv1alpha1
v1 *fakeMCv1
}

func (f *fakeMCClient) MachineconfigurationV1() mcv1.MachineconfigurationV1Interface {
return f.v1
}
func (f *fakeMCClient) MachineconfigurationV1alpha1() mcv1alpha1.MachineconfigurationV1alpha1Interface {
return f.v1alpha1
}

type fakeMCv1 struct {
mcv1.MachineconfigurationV1Interface
pools *fakeMCPools
pools *fakeMCPools
streams *fakeOSImageStreams
}

func (f *fakeMCv1) MachineConfigPools() mcv1.MachineConfigPoolInterface {
return f.pools
}

type fakeMCv1alpha1 struct {
mcv1alpha1.MachineconfigurationV1alpha1Interface
streams *fakeOSImageStreams
}

func (f *fakeMCv1alpha1) OSImageStreams() mcv1alpha1.OSImageStreamInterface {
func (f *fakeMCv1) OSImageStreams() mcv1.OSImageStreamInterface {
return f.streams
}

Expand All @@ -62,21 +52,19 @@ func (f *fakeMCPools) List(_ context.Context, _ metav1.ListOptions) (*mcapiv1.Ma
}

type fakeOSImageStreams struct {
mcv1alpha1.OSImageStreamInterface
obj *mcapiv1alpha1.OSImageStream
mcv1.OSImageStreamInterface
obj *mcapiv1.OSImageStream
err error
}

func (f *fakeOSImageStreams) Get(_ context.Context, _ string, _ metav1.GetOptions) (*mcapiv1alpha1.OSImageStream, error) {
func (f *fakeOSImageStreams) Get(_ context.Context, _ string, _ metav1.GetOptions) (*mcapiv1.OSImageStream, error) {
return f.obj, f.err
}

func newFakeMCClient(osImageStream *mcapiv1alpha1.OSImageStream, osImageStreamErr error, mcpList *mcapiv1.MachineConfigPoolList, mcpErr error) *fakeMCClient {
func newFakeMCClient(osImageStream *mcapiv1.OSImageStream, osImageStreamErr error, mcpList *mcapiv1.MachineConfigPoolList, mcpErr error) *fakeMCClient {
return &fakeMCClient{
v1: &fakeMCv1{
pools: &fakeMCPools{list: mcpList, err: mcpErr},
},
v1alpha1: &fakeMCv1alpha1{
pools: &fakeMCPools{list: mcpList, err: mcpErr},
streams: &fakeOSImageStreams{obj: osImageStream, err: osImageStreamErr},
},
}
Expand All @@ -95,10 +83,10 @@ func mcpList(pools ...mcapiv1.MachineConfigPool) *mcapiv1.MachineConfigPoolList
return &mcapiv1.MachineConfigPoolList{Items: pools}
}

func osImageStreamSingleton(defaultStream string) *mcapiv1alpha1.OSImageStream {
return &mcapiv1alpha1.OSImageStream{
func osImageStreamSingleton(defaultStream string) *mcapiv1.OSImageStream {
return &mcapiv1.OSImageStream{
ObjectMeta: metav1.ObjectMeta{Name: "cluster"},
Status: mcapiv1alpha1.OSImageStreamStatus{
Status: mcapiv1.OSImageStreamStatus{
DefaultStream: defaultStream,
},
}
Expand Down
2 changes: 1 addition & 1 deletion test/extended/ci/job_names.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func isRHCOS10(machineConfigClient mcv1client.Interface) bool {
return mcp.Spec.OSImageStream.Name == "rhel-10"
}

osImageStream, err := machineConfigClient.MachineconfigurationV1alpha1().OSImageStreams().Get(context.TODO(), "cluster", metav1.GetOptions{})
osImageStream, err := machineConfigClient.MachineconfigurationV1().OSImageStreams().Get(context.TODO(), "cluster", metav1.GetOptions{})
if kapierrs.IsNotFound(err) {
return false
}
Expand Down
6 changes: 6 additions & 0 deletions vendor/github.com/openshift/api/.golangci.yaml
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions vendor/github.com/openshift/api/config/v1/types.go
View file
Open in desktop

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

7 changes: 3 additions & 4 deletions vendor/github.com/openshift/api/config/v1/types_apiserver.go
View file
Open in desktop

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

Loading