Skip to content

NO-JIRA: bump client-go #30659

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

Open
sanchezl wants to merge 4 commits into
base: main
Choose a base branch
from
Open

NO-JIRA: bump client-go #30659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
505d8c9
bump(api,client-go)
sanchezl Jan 19, 2026
e5976d0
fix: update to ImageSigstoreVerificationPolicy and adjust related types
sanchezl Jan 7, 2026
6b73429
fix: correct InsightsDataGather check in ConfigV1ClientShim
sanchezl Jan 7, 2026
a9b70a0
fix: configv1.Update no longer directly (e.g.: ==) comparable
sanchezl Jan 19, 2026
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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ require (
github.com/opencontainers/go-digest v1.0.0
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251218142942-7ecc8801b9df
github.com/openshift-kni/commatrix v0.0.5-0.20251111204857-e5a931eff73f
github.com/openshift/api v0.0.0-20251015095338-264e80a2b6e7
github.com/openshift/api v0.0.0-20260116192047-6fb7fdae95fd
github.com/openshift/apiserver-library-go v0.0.0-20251015164739-79d04067059d
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13
github.com/openshift/library-go v0.0.0-20251015151611-6fc7a74b67c5
github.com/operator-framework/api v0.36.0
github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20250118001652-a8b9c3c31417
Expand Down
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 @@ -828,14 +828,14 @@ github.com/openshift-eng/openshift-tests-extension v0.0.0-20251218142942-7ecc880
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251218142942-7ecc8801b9df/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-20251015095338-264e80a2b6e7 h1:Ot2fbEEPmF3WlPQkyEW/bUCV38GMugH/UmZvxpWceNc=
github.com/openshift/api v0.0.0-20251015095338-264e80a2b6e7/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
github.com/openshift/api v0.0.0-20260116192047-6fb7fdae95fd h1:Hpjq/55Qb0Gy65RewTSWWlyxpSovaRF86EPjYQkdlRU=
github.com/openshift/api v0.0.0-20260116192047-6fb7fdae95fd/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
github.com/openshift/apiserver-library-go v0.0.0-20251015164739-79d04067059d h1:Mfya3RxHWvidOrKyHj3bmFn5x2B89DLZIvDAhwm+C2s=
github.com/openshift/apiserver-library-go v0.0.0-20251015164739-79d04067059d/go.mod h1:zm2/rIUp0p83pz0/1kkSoKTqhTr3uUKSKQ9fP7Z3g7Y=
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-20251015124057-db0dee36e235 h1:9JBeIXmnHlpXTQPi7LPmu1jdxznBhAE7bb1K+3D8gxY=
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235/go.mod h1:L49W6pfrZkfOE5iC1PqEkuLkXG4W0BX4w8b+L2Bv7fM=
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13 h1:6rd4zSo2UaWQcAPZfHK9yzKVqH0BnMv1hqMzqXZyTds=
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13/go.mod h1:YvOmPmV7wcJxpfhTDuFqqs2Xpb3M3ovsM6Qs/i2ptq4=
github.com/openshift/kubernetes v1.30.1-0.20251017123720-96593f323733 h1:Mpab1CmJPLVWGB0CNGoWnup/NScvv55MVPe94c8JgUk=
github.com/openshift/kubernetes v1.30.1-0.20251017123720-96593f323733/go.mod h1:w3+IfrXNp5RosdDXg3LB55yijJqR/FwouvVntYHQf0o=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20251017123720-96593f323733 h1:42lm41QwjG8JoSicx4FHcuIG2kxHxlUnz6c+ftg2e0E=
Expand Down
5 changes: 4 additions & 1 deletion test/e2e/upgrade/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ func (m *versionMonitor) Check(initialGeneration int64, desired configv1.Update)
m.lastCV = cv

if cv.Status.ObservedGeneration > initialGeneration {
if cv.Spec.DesiredUpdate == nil || desired != *cv.Spec.DesiredUpdate {
if cv.Spec.DesiredUpdate == nil ||
desired.Architecture != cv.Spec.DesiredUpdate.Architecture ||
desired.Version != cv.Spec.DesiredUpdate.Version ||
desired.Image != cv.Spec.DesiredUpdate.Image {
return nil, "", fmt.Errorf("desired cluster version was changed by someone else: %v", cv.Spec.DesiredUpdate)
}
}
Expand Down
36 changes: 18 additions & 18 deletions test/extended/imagepolicy/imagepolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,10 @@ func generateClusterImagePolicies() map[string]configv1.ClusterImagePolicy {
ObjectMeta: metav1.ObjectMeta{Name: invalidPublicKeyClusterImagePolicyName},
Spec: configv1.ClusterImagePolicySpec{
Scopes: []configv1.ImageScope{testSignedPolicyScope},
Policy: configv1.Policy{
Policy: configv1.ImageSigstoreVerificationPolicy{
RootOfTrust: configv1.PolicyRootOfTrust{
PolicyType: configv1.PublicKeyRootOfTrust,
PublicKey: &configv1.PublicKey{
PublicKey: &configv1.ImagePolicyPublicKeyRootOfTrust{
KeyData: []byte(`-----BEGIN PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEUoFUoYAReKXGy59xe5SQOk2aJ8o+
2/Yz5Y8GcN3zFE6ViIvkGnHhMlAhXaX/bo0M9R62s0/6q++T7uwNFuOg8A==
Expand All @@ -361,10 +361,10 @@ MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEUoFUoYAReKXGy59xe5SQOk2aJ8o+
ObjectMeta: metav1.ObjectMeta{Name: publiKeyRekorClusterImagePolicyName},
Spec: configv1.ClusterImagePolicySpec{
Scopes: []configv1.ImageScope{testSignedPolicyScope},
Policy: configv1.Policy{
Policy: configv1.ImageSigstoreVerificationPolicy{
RootOfTrust: configv1.PolicyRootOfTrust{
PolicyType: configv1.PublicKeyRootOfTrust,
PublicKey: &configv1.PublicKey{
PublicKey: &configv1.ImagePolicyPublicKeyRootOfTrust{
KeyData: []byte(`-----BEGIN PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEKvZH0CXTk8XQkETuxkzkl3Bi4ms5
60l1/qUU0fRATNSCVORCog5PDFo5z0ZLeblWgwbn4c8xpvuo9jQFwpeOsg==
Expand All @@ -385,10 +385,10 @@ MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEKvZH0CXTk8XQkETuxkzkl3Bi4ms5
ObjectMeta: metav1.ObjectMeta{Name: invalidPKIClusterImagePolicyName},
Spec: configv1.ClusterImagePolicySpec{
Scopes: []configv1.ImageScope{testPKISignedPolicyScope},
Policy: configv1.Policy{
Policy: configv1.ImageSigstoreVerificationPolicy{
RootOfTrust: configv1.PolicyRootOfTrust{
PolicyType: configv1.PKIRootOfTrust,
PKI: &configv1.PKI{
PKI: &configv1.ImagePolicyPKIRootOfTrust{
CertificateAuthorityRootsData: []byte(`-----BEGIN CERTIFICATE-----
MIICYDCCAgagAwIBAgIUTq5IQKTGqI9XDqGzdGzm8mI43qkwCgYIKoZIzj0EAwIw
fDELMAkGA1UEBhMCLS0xDjAMBgNVBAgTBVNUQVRFMREwDwYDVQQHEwhMT0NBTElU
Expand Down Expand Up @@ -423,10 +423,10 @@ TAIhALlR4yZRRYv2iaVPdgaptAI0LoDAtEUiO8Rb9FWJzpAN
ObjectMeta: metav1.ObjectMeta{Name: pkiClusterImagePolicyName},
Spec: configv1.ClusterImagePolicySpec{
Scopes: []configv1.ImageScope{testPKISignedPolicyScope},
Policy: configv1.Policy{
Policy: configv1.ImageSigstoreVerificationPolicy{
RootOfTrust: configv1.PolicyRootOfTrust{
PolicyType: configv1.PKIRootOfTrust,
PKI: &configv1.PKI{
PKI: &configv1.ImagePolicyPKIRootOfTrust{
CertificateAuthorityRootsData: []byte(`-----BEGIN CERTIFICATE-----
MIIFvzCCA6egAwIBAgIUZnH3ITyYQMAp6lvNYc0fjRzzuBcwDQYJKoZIhvcNAQEL
BQAwbjELMAkGA1UEBhMCRVMxETAPBgNVBAcMCFZhbGVuY2lhMQswCQYDVQQKDAJJ
Expand Down Expand Up @@ -479,10 +479,10 @@ L8ITFP+Nw9Meiw4etw59CTAPCc7l4Zvwr1K2ZTBmVGxrqdasiqpI0utG69aItsPi
ObjectMeta: metav1.ObjectMeta{Name: invalidEmailPKIClusterImagePolicyName},
Spec: configv1.ClusterImagePolicySpec{
Scopes: []configv1.ImageScope{testPKISignedPolicyScope},
Policy: configv1.Policy{
Policy: configv1.ImageSigstoreVerificationPolicy{
RootOfTrust: configv1.PolicyRootOfTrust{
PolicyType: configv1.PKIRootOfTrust,
PKI: &configv1.PKI{
PKI: &configv1.ImagePolicyPKIRootOfTrust{
CertificateAuthorityRootsData: []byte(`-----BEGIN CERTIFICATE-----
MIIFvzCCA6egAwIBAgIUZnH3ITyYQMAp6lvNYc0fjRzzuBcwDQYJKoZIhvcNAQEL
BQAwbjELMAkGA1UEBhMCRVMxETAPBgNVBAcMCFZhbGVuY2lhMQswCQYDVQQKDAJJ
Expand Down Expand Up @@ -541,10 +541,10 @@ func generateImagePolicies() map[string]configv1.ImagePolicy {
ObjectMeta: metav1.ObjectMeta{Name: invalidPublicKeyImagePolicyName},
Spec: configv1.ImagePolicySpec{
Scopes: []configv1.ImageScope{testSignedPolicyScope},
Policy: configv1.Policy{
Policy: configv1.ImageSigstoreVerificationPolicy{
RootOfTrust: configv1.PolicyRootOfTrust{
PolicyType: configv1.PublicKeyRootOfTrust,
PublicKey: &configv1.PublicKey{
PublicKey: &configv1.ImagePolicyPublicKeyRootOfTrust{
KeyData: []byte(`-----BEGIN PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEUoFUoYAReKXGy59xe5SQOk2aJ8o+
2/Yz5Y8GcN3zFE6ViIvkGnHhMlAhXaX/bo0M9R62s0/6q++T7uwNFuOg8A==
Expand All @@ -565,10 +565,10 @@ MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEUoFUoYAReKXGy59xe5SQOk2aJ8o+
ObjectMeta: metav1.ObjectMeta{Name: publiKeyRekorImagePolicyName},
Spec: configv1.ImagePolicySpec{
Scopes: []configv1.ImageScope{testSignedPolicyScope},
Policy: configv1.Policy{
Policy: configv1.ImageSigstoreVerificationPolicy{
RootOfTrust: configv1.PolicyRootOfTrust{
PolicyType: configv1.PublicKeyRootOfTrust,
PublicKey: &configv1.PublicKey{
PublicKey: &configv1.ImagePolicyPublicKeyRootOfTrust{
KeyData: []byte(`-----BEGIN PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEKvZH0CXTk8XQkETuxkzkl3Bi4ms5
60l1/qUU0fRATNSCVORCog5PDFo5z0ZLeblWgwbn4c8xpvuo9jQFwpeOsg==
Expand All @@ -589,10 +589,10 @@ MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEKvZH0CXTk8XQkETuxkzkl3Bi4ms5
ObjectMeta: metav1.ObjectMeta{Name: invalidPKIImagePolicyName},
Spec: configv1.ImagePolicySpec{
Scopes: []configv1.ImageScope{testPKISignedPolicyScope},
Policy: configv1.Policy{
Policy: configv1.ImageSigstoreVerificationPolicy{
RootOfTrust: configv1.PolicyRootOfTrust{
PolicyType: configv1.PKIRootOfTrust,
PKI: &configv1.PKI{
PKI: &configv1.ImagePolicyPKIRootOfTrust{
CertificateAuthorityRootsData: []byte(`-----BEGIN CERTIFICATE-----
MIICYDCCAgagAwIBAgIUTq5IQKTGqI9XDqGzdGzm8mI43qkwCgYIKoZIzj0EAwIw
fDELMAkGA1UEBhMCLS0xDjAMBgNVBAgTBVNUQVRFMREwDwYDVQQHEwhMT0NBTElU
Expand Down Expand Up @@ -627,10 +627,10 @@ TAIhALlR4yZRRYv2iaVPdgaptAI0LoDAtEUiO8Rb9FWJzpAN
ObjectMeta: metav1.ObjectMeta{Name: pkiImagePolicyName},
Spec: configv1.ImagePolicySpec{
Scopes: []configv1.ImageScope{testPKISignedPolicyScope},
Policy: configv1.Policy{
Policy: configv1.ImageSigstoreVerificationPolicy{
RootOfTrust: configv1.PolicyRootOfTrust{
PolicyType: configv1.PKIRootOfTrust,
PKI: &configv1.PKI{
PKI: &configv1.ImagePolicyPKIRootOfTrust{
CertificateAuthorityRootsData: []byte(`-----BEGIN CERTIFICATE-----
MIIFvzCCA6egAwIBAgIUZnH3ITyYQMAp6lvNYc0fjRzzuBcwDQYJKoZIhvcNAQEL
BQAwbjELMAkGA1UEBhMCRVMxETAPBgNVBAcMCFZhbGVuY2lhMQswCQYDVQQKDAJJ
Expand Down
4 changes: 2 additions & 2 deletions test/extended/util/configv1shim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ type ConfigV1ClientShim struct {
}

func (c *ConfigV1ClientShim) InsightsDataGathers() configv1.InsightsDataGatherInterface {
if c.v1Kinds["APIServer"] {
panic(fmt.Errorf("APIServer not implemented"))
if c.v1Kinds["InsightsDataGather"] {
panic(fmt.Errorf("InsightsDataGather not implemented"))
}
return c.configv1.InsightsDataGathers()
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/openshift/api/.ci-operator.yaml
View file
Open in desktop

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

28 changes: 28 additions & 0 deletions vendor/github.com/openshift/api/.coderabbit.yaml
View file
Open in desktop

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

26 changes: 24 additions & 2 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.

23 changes: 23 additions & 0 deletions vendor/github.com/openshift/api/AGENTS.md
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions vendor/github.com/openshift/api/Dockerfile.ocp
View file
Open in desktop

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

44 changes: 30 additions & 14 deletions vendor/github.com/openshift/api/Makefile
View file
Open in desktop

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

Loading