Skip to content

Commit 9e40c44

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #5500 from sanchezl/cluster-image-policy-rename
NO-JIRA: bump openshift/client-go
2 parents 21298dd + df949af commit 9e40c44

115 files changed

Lines changed: 12510 additions & 7372 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/ClusterImagePolicyAndImagePolicyDesign.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ ClusterImagePolicy and ImagePolicy CRD are managed by ContainerRuntimeConfig con
55
Generating corresponding CRI-O configuration files for image signature verification. Rollout ClusterImagePolicy to `/etc/containers/policy.json` for cluster wide configuration. Rollout ImagePolicy to `/etc/crio/policies/<NAMESPACE>.json`. Roll out the registries configuration to `/etc/containers/registries.d/sigstore-registries.yaml`.
66

77
## CRD
8-
[ClusterImagePolicy CRD](https://github.com/openshift/api/blob/master/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clusterimagepolicies-TechPreviewNoUpgrade.crd.yaml)
8+
[ClusterImagePolicy CRD](https://github.com/openshift/api/blob/master/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clusterimagepolicies.crd.yaml)
99

10-
[ImagePolicy CRD](https://github.com/openshift/api/blob/master/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_imagepolicies-TechPreviewNoUpgrade.crd.yaml)
10+
[ImagePolicy CRD](https://github.com/openshift/api/blob/master/config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_imagepolicies.crd.yaml)
1111

1212
## Example
1313

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ require (
3737
github.com/onsi/gomega v1.36.2
3838
github.com/opencontainers/go-digest v1.0.0
3939
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250916161632-d81c09058835
40-
github.com/openshift/api v0.0.0-20251124235416-c11dd82e305c
41-
github.com/openshift/client-go v0.0.0-20251125141819-b6281947c285
40+
github.com/openshift/api v0.0.0-20260107103503-6d35063ca179
41+
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13
4242
github.com/openshift/library-go v0.0.0-20251015151611-6fc7a74b67c5
4343
github.com/openshift/runtime-utils v0.0.0-20230921210328-7bdb5b9c177b
4444
github.com/prometheus/client_golang v1.22.0

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -609,10 +609,10 @@ github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplU
609609
github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U=
610610
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250916161632-d81c09058835 h1:rkqIIfdYYkasXbF2XKVgh/3f1mhjSQK9By8WtVMgYo8=
611611
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250916161632-d81c09058835/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
612-
github.com/openshift/api v0.0.0-20251124235416-c11dd82e305c h1:O72YjES6M2/H052TIZnrJVUNySjfOZy1t8w5hRcj6MM=
613-
github.com/openshift/api v0.0.0-20251124235416-c11dd82e305c/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
614-
github.com/openshift/client-go v0.0.0-20251125141819-b6281947c285 h1:D3IKKxAR4Fvzi+kpw7Ji8bOfUlhSYjVqMi1efkBrwUU=
615-
github.com/openshift/client-go v0.0.0-20251125141819-b6281947c285/go.mod h1:58e6xmnj6BK9memKOhU1LVG5b6i88bn3hkYLdqKCPK0=
612+
github.com/openshift/api v0.0.0-20260107103503-6d35063ca179 h1:5gMFMmuVLAcEnBAjNFql/8L2ZRPBDOxl7nmbjO5klvk=
613+
github.com/openshift/api v0.0.0-20260107103503-6d35063ca179/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
614+
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13 h1:6rd4zSo2UaWQcAPZfHK9yzKVqH0BnMv1hqMzqXZyTds=
615+
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13/go.mod h1:YvOmPmV7wcJxpfhTDuFqqs2Xpb3M3ovsM6Qs/i2ptq4=
616616
github.com/openshift/kubernetes v1.30.1-0.20251028145634-9e794b89909a h1:uaeiYAYOVlXChnGxvsziVTkzaSlBV7h8Y2U2Bc81UKM=
617617
github.com/openshift/kubernetes v1.30.1-0.20251028145634-9e794b89909a/go.mod h1:w3+IfrXNp5RosdDXg3LB55yijJqR/FwouvVntYHQf0o=
618618
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20251028145634-9e794b89909a h1:hZUZg/qpvT23oUoCkFWe/Q4VNu5zOeqmDOl3f/F6uRk=

‎pkg/controller/container-runtime-config/container_runtime_config_controller_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,10 @@ func newClusterImagePolicyWithPublicKey(name string, scopes []string, keyData []
220220
ObjectMeta: metav1.ObjectMeta{Name: name, UID: types.UID(utilrand.String(5)), Generation: 1},
221221
Spec: apicfgv1.ClusterImagePolicySpec{
222222
Scopes: imgScopes,
223-
Policy: apicfgv1.Policy{
223+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
224224
RootOfTrust: apicfgv1.PolicyRootOfTrust{
225225
PolicyType: apicfgv1.PublicKeyRootOfTrust,
226-
PublicKey: &apicfgv1.PublicKey{
226+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
227227
KeyData: keyData,
228228
},
229229
},
@@ -242,10 +242,10 @@ func newImagePolicyWithPublicKey(name, namespace string, scopes []string, keyDat
242242
ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace, UID: types.UID(utilrand.String(5)), Generation: 1},
243243
Spec: apicfgv1.ImagePolicySpec{
244244
Scopes: imgScopes,
245-
Policy: apicfgv1.Policy{
245+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
246246
RootOfTrust: apicfgv1.PolicyRootOfTrust{
247247
PolicyType: apicfgv1.PublicKeyRootOfTrust,
248-
PublicKey: &apicfgv1.PublicKey{
248+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
249249
KeyData: keyData,
250250
},
251251
},

‎pkg/controller/container-runtime-config/helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ func ownerReferenceImageConfig(imageConfig *apicfgv1.Image) metav1.OwnerReferenc
852852
}
853853
}
854854

855-
func policyItemFromSpec(policy apicfgv1.Policy) (signature.PolicyRequirement, error) {
855+
func policyItemFromSpec(policy apicfgv1.ImageSigstoreVerificationPolicy) (signature.PolicyRequirement, error) {
856856
var (
857857
sigstorePolicyRequirement signature.PolicyRequirement
858858
signedIdentity signature.PolicyReferenceMatch

‎pkg/controller/container-runtime-config/helpers_test.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -479,10 +479,10 @@ func clusterImagePolicyTestCRs() map[string]apicfgv1.ClusterImagePolicy {
479479
},
480480
Spec: apicfgv1.ClusterImagePolicySpec{
481481
Scopes: []apicfgv1.ImageScope{"test0.com"},
482-
Policy: apicfgv1.Policy{
482+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
483483
RootOfTrust: apicfgv1.PolicyRootOfTrust{
484484
PolicyType: apicfgv1.FulcioCAWithRekorRootOfTrust,
485-
FulcioCAWithRekor: &apicfgv1.FulcioCAWithRekor{
485+
FulcioCAWithRekor: &apicfgv1.ImagePolicyFulcioCAWithRekorRootOfTrust{
486486
FulcioCAData: testFulcioData,
487487
RekorKeyData: testRekorKeyData,
488488
FulcioSubject: apicfgv1.PolicyFulcioSubject{
@@ -507,10 +507,10 @@ func clusterImagePolicyTestCRs() map[string]apicfgv1.ClusterImagePolicy {
507507
},
508508
Spec: apicfgv1.ClusterImagePolicySpec{
509509
Scopes: []apicfgv1.ImageScope{"test0.com", "test1.com"},
510-
Policy: apicfgv1.Policy{
510+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
511511
RootOfTrust: apicfgv1.PolicyRootOfTrust{
512512
PolicyType: apicfgv1.PublicKeyRootOfTrust,
513-
PublicKey: &apicfgv1.PublicKey{
513+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
514514
KeyData: testKeyData,
515515
RekorKeyData: testRekorKeyData,
516516
},
@@ -531,10 +531,10 @@ func clusterImagePolicyTestCRs() map[string]apicfgv1.ClusterImagePolicy {
531531
},
532532
Spec: apicfgv1.ClusterImagePolicySpec{
533533
Scopes: []apicfgv1.ImageScope{"a.com/a1/a2", "a.com/a1/a2@sha256:0000000000000000000000000000000000000000000000000000000000000000", "*.example.com", "policy.scope", "foo.example.com/ns/repo"},
534-
Policy: apicfgv1.Policy{
534+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
535535
RootOfTrust: apicfgv1.PolicyRootOfTrust{
536536
PolicyType: apicfgv1.PublicKeyRootOfTrust,
537-
PublicKey: &apicfgv1.PublicKey{
537+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
538538
KeyData: testKeyData,
539539
RekorKeyData: testRekorKeyData,
540540
},
@@ -548,10 +548,10 @@ func clusterImagePolicyTestCRs() map[string]apicfgv1.ClusterImagePolicy {
548548
},
549549
Spec: apicfgv1.ClusterImagePolicySpec{
550550
Scopes: []apicfgv1.ImageScope{"test3.com/ns/repo"},
551-
Policy: apicfgv1.Policy{
551+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
552552
RootOfTrust: apicfgv1.PolicyRootOfTrust{
553553
PolicyType: apicfgv1.PKIRootOfTrust,
554-
PKI: &apicfgv1.PKI{
554+
PKI: &apicfgv1.ImagePolicyPKIRootOfTrust{
555555
CertificateAuthorityRootsData: testCertsData,
556556
CertificateAuthorityIntermediatesData: testCertsData,
557557
PKICertificateSubject: apicfgv1.PKICertificateSubject{
@@ -579,10 +579,10 @@ func imagePolicyTestCRs() map[string]apicfgv1.ImagePolicy {
579579
},
580580
Spec: apicfgv1.ImagePolicySpec{
581581
Scopes: []apicfgv1.ImageScope{"test0.com", "test2.com"},
582-
Policy: apicfgv1.Policy{
582+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
583583
RootOfTrust: apicfgv1.PolicyRootOfTrust{
584584
PolicyType: apicfgv1.PublicKeyRootOfTrust,
585-
PublicKey: &apicfgv1.PublicKey{
585+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
586586
KeyData: testKeyData,
587587
},
588588
},
@@ -596,10 +596,10 @@ func imagePolicyTestCRs() map[string]apicfgv1.ImagePolicy {
596596
},
597597
Spec: apicfgv1.ImagePolicySpec{
598598
Scopes: []apicfgv1.ImageScope{"a.com/a1/a2", "a.com/a1/a2@sha256:0000000000000000000000000000000000000000000000000000000000000000", "*.example.com", "policy.scope", "foo.example.com/ns/repo"},
599-
Policy: apicfgv1.Policy{
599+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
600600
RootOfTrust: apicfgv1.PolicyRootOfTrust{
601601
PolicyType: apicfgv1.PublicKeyRootOfTrust,
602-
PublicKey: &apicfgv1.PublicKey{
602+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
603603
KeyData: testKeyData,
604604
},
605605
},
@@ -613,10 +613,10 @@ func imagePolicyTestCRs() map[string]apicfgv1.ImagePolicy {
613613
},
614614
Spec: apicfgv1.ImagePolicySpec{
615615
Scopes: []apicfgv1.ImageScope{"test2.com"},
616-
Policy: apicfgv1.Policy{
616+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
617617
RootOfTrust: apicfgv1.PolicyRootOfTrust{
618618
PolicyType: apicfgv1.PublicKeyRootOfTrust,
619-
PublicKey: &apicfgv1.PublicKey{
619+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
620620
KeyData: testKeyData,
621621
},
622622
},
@@ -630,10 +630,10 @@ func imagePolicyTestCRs() map[string]apicfgv1.ImagePolicy {
630630
},
631631
Spec: apicfgv1.ImagePolicySpec{
632632
Scopes: []apicfgv1.ImageScope{"test3.com"},
633-
Policy: apicfgv1.Policy{
633+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
634634
RootOfTrust: apicfgv1.PolicyRootOfTrust{
635635
PolicyType: apicfgv1.PublicKeyRootOfTrust,
636-
PublicKey: &apicfgv1.PublicKey{
636+
PublicKey: &apicfgv1.ImagePolicyPublicKeyRootOfTrust{
637637
KeyData: testKeyData,
638638
},
639639
},
@@ -647,10 +647,10 @@ func imagePolicyTestCRs() map[string]apicfgv1.ImagePolicy {
647647
},
648648
Spec: apicfgv1.ImagePolicySpec{
649649
Scopes: []apicfgv1.ImageScope{"test4.com/ns-policy/repo"},
650-
Policy: apicfgv1.Policy{
650+
Policy: apicfgv1.ImageSigstoreVerificationPolicy{
651651
RootOfTrust: apicfgv1.PolicyRootOfTrust{
652652
PolicyType: apicfgv1.PKIRootOfTrust,
653-
PKI: &apicfgv1.PKI{
653+
PKI: &apicfgv1.ImagePolicyPKIRootOfTrust{
654654
CertificateAuthorityRootsData: testCertsData,
655655
CertificateAuthorityIntermediatesData: testCertsData,
656656
PKICertificateSubject: apicfgv1.PKICertificateSubject{

‎vendor/github.com/openshift/api/.ci-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/.coderabbit.yaml‎

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/.golangci.yaml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/AGENTS.md‎

Lines changed: 13 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)