From 8249985651627277cc124cca1d784b6a135ef497 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 11 Jun 2025 04:25:59 +0000 Subject: [PATCH 01/11] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 958f983aa1..c059cbd958 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2025-06-02-175911" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-06-03-221556" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2025-06-09-022311" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-06-10-104243" From 605dc791e1e74c14e93ac64d8877cf1eb4289150 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 11 Jun 2025 04:25:59 +0000 Subject: [PATCH 02/11] update changelog --- scripts/auto-rebase/changelog.txt | 54 +++++++++++++++++++++++++++++++ scripts/auto-rebase/commits.txt | 26 +++++++-------- 2 files changed, 67 insertions(+), 13 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..15ac01a9ff 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,54 @@ +- api embedded-component 91245a26b8a831607d981b2a478644d08da6fa1c to 017e9dd0276e4ed0242a759dffd419d728337876 + - 5a9ea321 2025-06-04T09:57:40-04:00 add fg for azure boot image updates & skew mgmt + - 4c65cf1e 2025-06-03T16:39:42-03:00 SPLAT-2137: FG for Service Type LB NLB with Security Group + - 6ff8c5bc 2025-05-30T14:25:25+00:00 Lift 4.19 feature gate for RouteAdvertisements + - 83157e5f 2025-05-29T17:53:26+02:00 Add max length validation for apiserver namedCertificates + +- cluster-ingress-operator embedded-component 21ac32d9862437b5c563540edd721c9cae5f1e8c to be41be00b822b820b03a7190732e3fc983efddf3 + - 0a96be6 2025-05-22T11:50:08+01:00 Remove PrivateHostedZoneAWS feature gate check + +- cluster-network-operator embedded-component fca1273844fb1b968d109f7ca7c3d5e96f234179 to 2bbe72cb352eb55bdaa4da0d75c0d82f6e363ebc + - ea2c966 2025-06-03T11:17:01+02:00 Issue shorter certificates when ShortRotation featuregate is enabled + - 0cf7aec 2025-05-13T09:16:11-04:00 whereabouts-config is a reserved name for user interaction. + +- kubernetes embedded-component 886f7c90e4bd137f91ebfb7d0cb55d476e719643 to e541011ee9752101e2e11bf455ade08da6d1e6fd + - 63c212134 2025-06-03T14:50:41-04:00 UPSTREAM: 132035: e2e: fix userns test + - aab1bb062 2025-05-29T14:09:03-04:00 UPSTREAM: : openshift-hack: enable userns e2e tests + +- kubernetes-kube-storage-version-migrator embedded-component 4c521b09f4dc55ac69234419e083f3815646f4a9 to 2b36e46ab36a5a7581c9ed763e0a7646f90b94e7 + - be69609 2025-06-05T12:59:09-04:00 Fix verify job failure with build-machinery bump + - 88c7c82 2025-06-04T15:54:40-04:00 append .0 to go.mod version + +- machine-config-operator embedded-component af994c8fc8299d78780e90eaba09b20a2ce08983 to c3a875dc58764b6dc05e89c9ab9bc53e2b64b44f + - d1488e02 2025-04-10T12:23:48+02:00 Remove trailing dot from hostname + +- operator-framework-olm embedded-component ebcdb8fb1eb274adbd248fc1f47d56b859c9fe8d to 917ba603b67fa9d2f348f57e25e035ed7b31913f + - 852c85fa 2025-06-03T00:03:46+00:00 only create cachedir if requested, since otherwise opm will error out serving it (#3589) + +- oc image-amd64 49459b55564a51d3edf64da16d836bd25e0f9917 to 5583faabda15e48cacb2bd1a3ddc6418fd6db675 + - 59f624ee 2025-06-04T13:06:36-07:00 pkg/cli/admin/upgrade/recommend: Add a --quiet option + - 2d7e0042 2025-06-03T10:48:29-07:00 pkg/cli/admin/upgrade/recommend: New, feature-gated --accept [1] is suggesting ClusterVersion API changes to make it easier for cluster administrators to manage many clusters and updates vs. a more limited set of update issues. One example scenario: + +- coredns image-amd64 7a1451db77a68161d58af9b6ca2c9388d578310a to a69279e3393b269099dcaae967570741d4c5e469 + - b184ecd 2025-06-04T15:55:42-04:00 append .0 to go.mod version + +- kubernetes image-amd64 886f7c90e4bd137f91ebfb7d0cb55d476e719643 to e541011ee9752101e2e11bf455ade08da6d1e6fd + - 63c212134 2025-06-03T14:50:41-04:00 UPSTREAM: 132035: e2e: fix userns test + - aab1bb062 2025-05-29T14:09:03-04:00 UPSTREAM: : openshift-hack: enable userns e2e tests + +- oc image-arm64 49459b55564a51d3edf64da16d836bd25e0f9917 to 303f33ba3dae6f17572b572fa7ac67dd5d7d4bce + - 59f624ee 2025-06-04T13:06:36-07:00 pkg/cli/admin/upgrade/recommend: Add a --quiet option + - d3fe7890 2025-06-04T13:36:45+02:00 oc image serve: Remove as deprecated + - 2d7e0042 2025-06-03T10:48:29-07:00 pkg/cli/admin/upgrade/recommend: New, feature-gated --accept [1] is suggesting ClusterVersion API changes to make it easier for cluster administrators to manage many clusters and updates vs. a more limited set of update issues. One example scenario: + +- coredns image-arm64 7a1451db77a68161d58af9b6ca2c9388d578310a to a69279e3393b269099dcaae967570741d4c5e469 + - b184ecd 2025-06-04T15:55:42-04:00 append .0 to go.mod version + +- kubernetes image-arm64 886f7c90e4bd137f91ebfb7d0cb55d476e719643 to 73b1f33974c180779728c0c7b0af875cb269cfba + - 123a75071 2025-06-09T19:10:20-04:00 UPSTREAM: : Revert "TRT-2068: Reintroduce removal of non-suite annotation rules, and fix topology selector" + - 9e85f53ce 2025-06-09T19:10:05-04:00 UPSTREAM: : Revert "UPSTREAM: : Revert "Revert "remove annotation rules that don't relate to suites""" + - 63c212134 2025-06-03T14:50:41-04:00 UPSTREAM: 132035: e2e: fix userns test + - e47629fc3 2025-06-02T10:54:32-04:00 UPSTREAM: : align Single Replica environment selector topology name with the value origin will pass + - 0e92aa414 2025-06-02T10:53:22-04:00 UPSTREAM: : Revert "Revert "remove annotation rules that don't relate to suites"" + - aab1bb062 2025-05-29T14:09:03-04:00 UPSTREAM: : openshift-hack: enable userns e2e tests + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index eb86df7a2b..22dc8ff4ac 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,35 +1,35 @@ -https://github.com/openshift/api embedded-component 91245a26b8a831607d981b2a478644d08da6fa1c +https://github.com/openshift/api embedded-component 017e9dd0276e4ed0242a759dffd419d728337876 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component cf99de974354133f853928cff9e19ad19c5347d9 https://github.com/openshift/cluster-dns-operator embedded-component 659813065170f4e52f80b7a29bbab64bfa9aa172 -https://github.com/openshift/cluster-ingress-operator embedded-component 21ac32d9862437b5c563540edd721c9cae5f1e8c +https://github.com/openshift/cluster-ingress-operator embedded-component be41be00b822b820b03a7190732e3fc983efddf3 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 2b7b1f2d934441c88ee96e7ecb7595ce567e297b https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 07401428d6188f3e2209f61dc84602c035721c08 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 0d060e4b9cfbe1bdbc5991dde5424161ff44c932 -https://github.com/openshift/cluster-network-operator embedded-component fca1273844fb1b968d109f7ca7c3d5e96f234179 +https://github.com/openshift/cluster-network-operator embedded-component 2bbe72cb352eb55bdaa4da0d75c0d82f6e363ebc https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 0a0b2ce5b7217083ecbe09d53bba86cd03d48c3e https://github.com/openshift/cluster-policy-controller embedded-component 748524784686a5f397490563882cbfb88f9acd01 https://github.com/openshift/csi-external-snapshotter embedded-component ac82cafc95b301f67f46ee0db93720d55177a19b https://github.com/openshift/etcd embedded-component a5421dfe551a2e9c911a75062a4cdeb7473f5c26 -https://github.com/openshift/kubernetes embedded-component 886f7c90e4bd137f91ebfb7d0cb55d476e719643 -https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 4c521b09f4dc55ac69234419e083f3815646f4a9 -https://github.com/openshift/machine-config-operator embedded-component af994c8fc8299d78780e90eaba09b20a2ce08983 +https://github.com/openshift/kubernetes embedded-component e541011ee9752101e2e11bf455ade08da6d1e6fd +https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 2b36e46ab36a5a7581c9ed763e0a7646f90b94e7 +https://github.com/openshift/machine-config-operator embedded-component c3a875dc58764b6dc05e89c9ab9bc53e2b64b44f https://github.com/openshift/openshift-controller-manager embedded-component 597799c02ce53c7294f557d21fc1a1e6407f9e62 -https://github.com/openshift/operator-framework-olm embedded-component ebcdb8fb1eb274adbd248fc1f47d56b859c9fe8d +https://github.com/openshift/operator-framework-olm embedded-component 917ba603b67fa9d2f348f57e25e035ed7b31913f https://github.com/openshift/route-controller-manager embedded-component bc97534a12a7a6bac096e4ed488b29535c8d4f33 https://github.com/openshift/service-ca-operator embedded-component 4dfa6916f984d0fd7188380edc88b250738f07f7 -https://github.com/openshift/oc image-amd64 49459b55564a51d3edf64da16d836bd25e0f9917 -https://github.com/openshift/coredns image-amd64 7a1451db77a68161d58af9b6ca2c9388d578310a +https://github.com/openshift/oc image-amd64 5583faabda15e48cacb2bd1a3ddc6418fd6db675 +https://github.com/openshift/coredns image-amd64 a69279e3393b269099dcaae967570741d4c5e469 https://github.com/openshift/csi-external-snapshotter image-amd64 ac82cafc95b301f67f46ee0db93720d55177a19b https://github.com/openshift/router image-amd64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-amd64 bc1ca29e2b6b50f15ece8db3990277276cacff0c https://github.com/openshift/ovn-kubernetes image-amd64 80ebd7a2be100ceaec14eb3375efb0eb0083b318 -https://github.com/openshift/kubernetes image-amd64 886f7c90e4bd137f91ebfb7d0cb55d476e719643 +https://github.com/openshift/kubernetes image-amd64 e541011ee9752101e2e11bf455ade08da6d1e6fd https://github.com/openshift/service-ca-operator image-amd64 4dfa6916f984d0fd7188380edc88b250738f07f7 -https://github.com/openshift/oc image-arm64 49459b55564a51d3edf64da16d836bd25e0f9917 -https://github.com/openshift/coredns image-arm64 7a1451db77a68161d58af9b6ca2c9388d578310a +https://github.com/openshift/oc image-arm64 303f33ba3dae6f17572b572fa7ac67dd5d7d4bce +https://github.com/openshift/coredns image-arm64 a69279e3393b269099dcaae967570741d4c5e469 https://github.com/openshift/csi-external-snapshotter image-arm64 ac82cafc95b301f67f46ee0db93720d55177a19b https://github.com/openshift/router image-arm64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-arm64 bc1ca29e2b6b50f15ece8db3990277276cacff0c https://github.com/openshift/ovn-kubernetes image-arm64 80ebd7a2be100ceaec14eb3375efb0eb0083b318 -https://github.com/openshift/kubernetes image-arm64 886f7c90e4bd137f91ebfb7d0cb55d476e719643 +https://github.com/openshift/kubernetes image-arm64 73b1f33974c180779728c0c7b0af875cb269cfba https://github.com/openshift/service-ca-operator image-arm64 4dfa6916f984d0fd7188380edc88b250738f07f7 From 8b7e681fecfea0d281d6e472e444becc392018c4 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 11 Jun 2025 04:27:14 +0000 Subject: [PATCH 03/11] update microshift/go.mod --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 46db9de8dc..e940807f2c 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/google/go-cmp v0.6.0 github.com/miekg/dns v1.1.63 // microshift github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f - github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2 + github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a github.com/openshift/cluster-policy-controller v0.0.0-20250310152427-748524784686 github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 @@ -219,7 +219,7 @@ replace ( github.com/openshift/route-controller-manager => ./deps/github.com/openshift/route-controller-manager // deps copy k8s.io/klog/v2 => ./deps/k8s.io/klog // deps clone github.com/kubernetes/klog from kubernetes k8s.io/kubernetes => ./deps/github.com/openshift/kubernetes // deps copy - sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator + sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250606130742-2b36e46ab36a // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator ) replace ( diff --git a/go.sum b/go.sum index f3cbe4950e..9be0cf4d0c 100644 --- a/go.sum +++ b/go.sum @@ -249,8 +249,8 @@ github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f h1:HH+BqfxONWB2kknhC github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw= github.com/openshift/apiserver-library-go v0.0.0-20250127121756-dc9a973f14ce h1:w0Up6YV1APcn20v/1h5IfuToz96o2pVqZyjzbw0yotU= github.com/openshift/apiserver-library-go v0.0.0-20250127121756-dc9a973f14ce/go.mod h1:kkSwH4osgejnRIyHfsfkv0V0xfmgH4Yk/VDObaJukHU= -github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2 h1:Pw/OKhN0r8HZcR4No8qh0QygTvuYsDeZhHsK6T9LC+I= -github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= +github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c h1:gJvhduWIrpzoUTwrJjjeul+hGETKkhRhEZosBg/X3Hg= +github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a h1:duO3JMrUOqVx50QhzxvDeOYIwTNOB8/EEuRLPyvAMBg= github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a/go.mod h1:Qw3ThpzVZ0bfTILpBNYg4LGyjtNxfyCiGh/uDLOOTP8= github.com/openshift/cluster-policy-controller v0.0.0-20250310152427-748524784686 h1:nGyo9X9HcK6qs6jmFKFZgzkTl0b1adD0VumMCjDXzBA= @@ -261,8 +261,8 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a h1: github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a/go.mod h1:BgqT/IXPjK9NkeSDjbzwsHySX3yIle2+ndz28nVsjUs= github.com/openshift/etcd/client/v3 v3.5.1-0.20250411172207-a5421dfe551a h1:4u4yoryqRDNV+oAR5F+MABA3QWmHNo0WB5JmzQn/Uik= github.com/openshift/etcd/client/v3 v3.5.1-0.20250411172207-a5421dfe551a/go.mod h1:mFYy67IOqmbRf/kRUvsHixzo3iG+1OF2W2+jVIQRAnU= -github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc h1:CWT77Ik9sZKya4ZMBtRLB3b/05Yq5M5BI2RqddZD02c= -github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc/go.mod h1:mVJrzaBTOQrLN5fh90Lr9bxlnln151d6lk4G+DEmLeI= +github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250606130742-2b36e46ab36a h1:LVCFj5PNAhIjKZuevpzFxdoT53AumHYDo+xhjGhOcMo= +github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250606130742-2b36e46ab36a/go.mod h1:X3tzGhATM+qhiiIRdoBW/rDhXylEM0IltBRRDUG8AWk= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI= From ddec8fbe718708f2a739b2fd50af93658e65abe2 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 11 Jun 2025 04:27:15 +0000 Subject: [PATCH 04/11] update microshift/deps --- .../openshift-hack/cmd/k8s-tests-ext/disabled_tests.go | 2 -- .../kubernetes/test/e2e/common/node/security_context.go | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go b/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go index 32f2de55ed..1da018aff3 100644 --- a/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go +++ b/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go @@ -15,8 +15,6 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs { "[Feature:ClusterTrustBundle]", "[Feature:SELinuxMount]", "[FeatureGate:SELinuxMount]", - "[Feature:UserNamespacesPodSecurityStandards]", - "[Feature:UserNamespacesSupport]", // disabled Beta "[Feature:DynamicResourceAllocation]", "[Feature:VolumeAttributesClass]", // disabled Beta "[sig-cli] Kubectl client Kubectl prune with applyset should apply and prune objects", // Alpha feature since k8s 1.27 diff --git a/deps/github.com/openshift/kubernetes/test/e2e/common/node/security_context.go b/deps/github.com/openshift/kubernetes/test/e2e/common/node/security_context.go index 20663fc7cc..762b144b5a 100644 --- a/deps/github.com/openshift/kubernetes/test/e2e/common/node/security_context.go +++ b/deps/github.com/openshift/kubernetes/test/e2e/common/node/security_context.go @@ -87,7 +87,7 @@ var _ = SIGDescribe("Security Context", func() { podClient.DeleteSync(ctx, createdPod2.Name, metav1.DeleteOptions{}, e2epod.DefaultPodDeletionTimeout) }) getLogs := func(pod *v1.Pod) (string, error) { - err := e2epod.WaitForPodSuccessInNamespaceTimeout(ctx, f.ClientSet, createdPod1.Name, f.Namespace.Name, f.Timeouts.PodStart) + err := e2epod.WaitForPodSuccessInNamespaceTimeout(ctx, f.ClientSet, pod.Name, f.Namespace.Name, f.Timeouts.PodStart) if err != nil { return "", err } From d8b9c33ddf7bb09011d1dd384b04f50615933ff9 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 11 Jun 2025 04:27:35 +0000 Subject: [PATCH 05/11] update microshift/vendor --- .../openshift/build-machinery-go/.ci-operator.yaml | 2 +- .../openshift/build-machinery-go/Dockerfile.commitchecker | 4 ++-- .../make/targets/golang/verify-update.mk | 5 +++-- .../build-machinery-go/make/targets/openshift/yq.mk | 3 +-- vendor/modules.txt | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vendor/github.com/openshift/build-machinery-go/.ci-operator.yaml b/vendor/github.com/openshift/build-machinery-go/.ci-operator.yaml index 1e59c02c25..7c15f83e3e 100644 --- a/vendor/github.com/openshift/build-machinery-go/.ci-operator.yaml +++ b/vendor/github.com/openshift/build-machinery-go/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.22-openshift-4.17 + tag: rhel-9-release-golang-1.23-openshift-4.19 diff --git a/vendor/github.com/openshift/build-machinery-go/Dockerfile.commitchecker b/vendor/github.com/openshift/build-machinery-go/Dockerfile.commitchecker index 8d7058a155..0651b7e247 100644 --- a/vendor/github.com/openshift/build-machinery-go/Dockerfile.commitchecker +++ b/vendor/github.com/openshift/build-machinery-go/Dockerfile.commitchecker @@ -1,12 +1,12 @@ # This Dockerfile must be on the top-level of this repo, because it needs to copy # both commitchecker/ and make/ into the build container. -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder WORKDIR /go/src/github.com/openshift/build-machinery-go COPY . . RUN make -C commitchecker -FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.19:base-rhel9 COPY --from=builder /go/src/github.com/openshift/build-machinery-go/commitchecker/commitchecker /usr/bin/ RUN dnf install --setopt=tsflags=nodocs -y git && \ dnf clean all && rm -rf /var/cache/yum/* diff --git a/vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk b/vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk index 3b71e29ddb..0c72a276c8 100644 --- a/vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk +++ b/vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk @@ -3,11 +3,12 @@ include $(addprefix $(dir $(lastword $(MAKEFILE_LIST))), \ ) go_files_count :=$(words $(GO_FILES)) +chunk_size :=1000 verify-gofmt: $(info Running `$(GOFMT) $(GOFMT_FLAGS)` on $(go_files_count) file(s).) @TMP=$$( mktemp ); \ - $(GOFMT) $(GOFMT_FLAGS) $(GO_FILES) | tee $${TMP}; \ + find . -name '*.go' -not -path '*/vendor/*' -not -path '*/_output/*' -print | xargs -n $(chunk_size) $(GOFMT) $(GOFMT_FLAGS) | tee $${TMP}; \ if [ -s $${TMP} ]; then \ echo "$@ failed - please run \`make update-gofmt\`"; \ exit 1; \ @@ -16,7 +17,7 @@ verify-gofmt: update-gofmt: $(info Running `$(GOFMT) $(GOFMT_FLAGS) -w` on $(go_files_count) file(s).) - @$(GOFMT) $(GOFMT_FLAGS) -w $(GO_FILES) + @find . -name '*.go' -not -path '*/vendor/*' -not -path '*/_output/*' -print | xargs -n $(chunk_size) $(GOFMT) $(GOFMT_FLAGS) -w .PHONY: update-gofmt diff --git a/vendor/github.com/openshift/build-machinery-go/make/targets/openshift/yq.mk b/vendor/github.com/openshift/build-machinery-go/make/targets/openshift/yq.mk index 07726d87cd..0854374fe5 100644 --- a/vendor/github.com/openshift/build-machinery-go/make/targets/openshift/yq.mk +++ b/vendor/github.com/openshift/build-machinery-go/make/targets/openshift/yq.mk @@ -8,8 +8,7 @@ include $(addprefix $(dir $(lastword $(MAKEFILE_LIST))), \ YQ_VERSION ?=2.4.0 YQ ?=$(PERMANENT_TMP_GOPATH)/bin/yq-$(YQ_VERSION) -yq_dir :=$(dir $(YQ)) - +yq_dir =$(dir $(YQ)) ensure-yq: ifeq "" "$(wildcard $(YQ))" diff --git a/vendor/modules.txt b/vendor/modules.txt index e8dbed0f0e..3c27eb4c58 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -496,7 +496,7 @@ github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sysctl github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/user github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/util github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/util/sort -# github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2 +# github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c ## explicit; go 1.22.0 github.com/openshift/build-machinery-go github.com/openshift/build-machinery-go/make @@ -3052,8 +3052,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client ## explicit; go 1.23 sigs.k8s.io/json sigs.k8s.io/json/internal/golang/encoding/json -# sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc -## explicit; go 1.23 +# sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250606130742-2b36e46ab36a +## explicit; go 1.23.0 sigs.k8s.io/kube-storage-version-migrator/pkg/apis/migration/v1alpha1 sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset/scheme @@ -3158,7 +3158,7 @@ sigs.k8s.io/yaml/goyaml.v3 # github.com/openshift/route-controller-manager => ./deps/github.com/openshift/route-controller-manager # k8s.io/klog/v2 => ./deps/k8s.io/klog # k8s.io/kubernetes => ./deps/github.com/openshift/kubernetes -# sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc +# sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250606130742-2b36e46ab36a # k8s.io/api => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/api # k8s.io/apiextensions-apiserver => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver # k8s.io/apimachinery => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery From 1084292f35cf53c5800ffddffba7bdd39063c1e8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 11 Jun 2025 04:27:35 +0000 Subject: [PATCH 06/11] update etcd/go.mod --- etcd/go.mod | 2 +- etcd/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index d56eab494e..243859324a 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -12,7 +12,7 @@ replace ( require ( github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f - github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2 + github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c github.com/spf13/cobra v1.8.1 go.etcd.io/etcd/server/v3 v3.5.16 k8s.io/apimachinery v1.32.5 diff --git a/etcd/go.sum b/etcd/go.sum index ceb2da8d21..71f616489e 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -160,8 +160,8 @@ github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f h1:HH+BqfxONWB2kknhCLAjiAievsyb56WvLGXdNOseI8g= github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw= -github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2 h1:Pw/OKhN0r8HZcR4No8qh0QygTvuYsDeZhHsK6T9LC+I= -github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= +github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c h1:gJvhduWIrpzoUTwrJjjeul+hGETKkhRhEZosBg/X3Hg= +github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= github.com/openshift/etcd/api/v3 v3.5.1-0.20250411172207-a5421dfe551a h1:xPuKS5jHdAvz/ZnVk1Zib4BFQfQvWGE81l9naQ8+3ok= github.com/openshift/etcd/api/v3 v3.5.1-0.20250411172207-a5421dfe551a/go.mod h1:c3aH5wcvXv/9dqIw2Y810LDXJfhSYdHQ0vxmP3CCHVY= github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a h1:S+zAlmcKTX+oFurjzztf0+89ySajZpWq9KbjN4VtEB0= From b0a06f6857f61c9584f7511f6c7b601553f43c4c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 11 Jun 2025 04:27:41 +0000 Subject: [PATCH 07/11] update etcd/vendor --- .../openshift/build-machinery-go/.ci-operator.yaml | 2 +- .../openshift/build-machinery-go/Dockerfile.commitchecker | 4 ++-- .../build-machinery-go/make/targets/golang/verify-update.mk | 5 +++-- .../build-machinery-go/make/targets/openshift/yq.mk | 3 +-- etcd/vendor/modules.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/etcd/vendor/github.com/openshift/build-machinery-go/.ci-operator.yaml b/etcd/vendor/github.com/openshift/build-machinery-go/.ci-operator.yaml index 1e59c02c25..7c15f83e3e 100644 --- a/etcd/vendor/github.com/openshift/build-machinery-go/.ci-operator.yaml +++ b/etcd/vendor/github.com/openshift/build-machinery-go/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.22-openshift-4.17 + tag: rhel-9-release-golang-1.23-openshift-4.19 diff --git a/etcd/vendor/github.com/openshift/build-machinery-go/Dockerfile.commitchecker b/etcd/vendor/github.com/openshift/build-machinery-go/Dockerfile.commitchecker index 8d7058a155..0651b7e247 100644 --- a/etcd/vendor/github.com/openshift/build-machinery-go/Dockerfile.commitchecker +++ b/etcd/vendor/github.com/openshift/build-machinery-go/Dockerfile.commitchecker @@ -1,12 +1,12 @@ # This Dockerfile must be on the top-level of this repo, because it needs to copy # both commitchecker/ and make/ into the build container. -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder WORKDIR /go/src/github.com/openshift/build-machinery-go COPY . . RUN make -C commitchecker -FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.19:base-rhel9 COPY --from=builder /go/src/github.com/openshift/build-machinery-go/commitchecker/commitchecker /usr/bin/ RUN dnf install --setopt=tsflags=nodocs -y git && \ dnf clean all && rm -rf /var/cache/yum/* diff --git a/etcd/vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk b/etcd/vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk index 3b71e29ddb..0c72a276c8 100644 --- a/etcd/vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk +++ b/etcd/vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk @@ -3,11 +3,12 @@ include $(addprefix $(dir $(lastword $(MAKEFILE_LIST))), \ ) go_files_count :=$(words $(GO_FILES)) +chunk_size :=1000 verify-gofmt: $(info Running `$(GOFMT) $(GOFMT_FLAGS)` on $(go_files_count) file(s).) @TMP=$$( mktemp ); \ - $(GOFMT) $(GOFMT_FLAGS) $(GO_FILES) | tee $${TMP}; \ + find . -name '*.go' -not -path '*/vendor/*' -not -path '*/_output/*' -print | xargs -n $(chunk_size) $(GOFMT) $(GOFMT_FLAGS) | tee $${TMP}; \ if [ -s $${TMP} ]; then \ echo "$@ failed - please run \`make update-gofmt\`"; \ exit 1; \ @@ -16,7 +17,7 @@ verify-gofmt: update-gofmt: $(info Running `$(GOFMT) $(GOFMT_FLAGS) -w` on $(go_files_count) file(s).) - @$(GOFMT) $(GOFMT_FLAGS) -w $(GO_FILES) + @find . -name '*.go' -not -path '*/vendor/*' -not -path '*/_output/*' -print | xargs -n $(chunk_size) $(GOFMT) $(GOFMT_FLAGS) -w .PHONY: update-gofmt diff --git a/etcd/vendor/github.com/openshift/build-machinery-go/make/targets/openshift/yq.mk b/etcd/vendor/github.com/openshift/build-machinery-go/make/targets/openshift/yq.mk index 07726d87cd..0854374fe5 100644 --- a/etcd/vendor/github.com/openshift/build-machinery-go/make/targets/openshift/yq.mk +++ b/etcd/vendor/github.com/openshift/build-machinery-go/make/targets/openshift/yq.mk @@ -8,8 +8,7 @@ include $(addprefix $(dir $(lastword $(MAKEFILE_LIST))), \ YQ_VERSION ?=2.4.0 YQ ?=$(PERMANENT_TMP_GOPATH)/bin/yq-$(YQ_VERSION) -yq_dir :=$(dir $(YQ)) - +yq_dir =$(dir $(YQ)) ensure-yq: ifeq "" "$(wildcard $(YQ))" diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 60a7eb1776..9e8d61fd6a 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -199,7 +199,7 @@ github.com/mxk/go-flowrate/flowrate ## explicit; go 1.23.0 github.com/openshift/api/config/v1 github.com/openshift/api/operator/v1 -# github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2 +# github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c ## explicit; go 1.22.0 github.com/openshift/build-machinery-go github.com/openshift/build-machinery-go/make From 0cb8a140b35b512590bcdab0a7508cf172ed67d7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 11 Jun 2025 04:27:41 +0000 Subject: [PATCH 08/11] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index be64016cb1..64dc6eda2f 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -24,6 +24,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8f0a096829cfd7de6731e8f4bd0b7cf4f2f29fc4d0ff281091ea6f2187adad7" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5e0e424f81e1c4ce91b8411d84b82143ee346d5d245f0c862ae4d22f7a1a95c" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index ffc112b352..9b3d671fd6 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -24,6 +24,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99b77b160a54c8b8b57bf8c1e2a7e8d33968a4fe9e2e322ae8ff0df924fdf0ba" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a79e416d1d5e27e28e4721ace6eac7395ec64576eccd32f087248406bc2168b" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 4219402c6025b2a50da9a86871de2359bcf476b7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 11 Jun 2025 04:27:43 +0000 Subject: [PATCH 09/11] update manifests --- .../multus/kustomization.aarch64.yaml | 4 ++-- .../multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 +++--- .../multus/release-multus-x86_64.json | 6 +++--- .../kube-proxy/kustomization.aarch64.yaml | 2 +- .../kube-proxy/kustomization.x86_64.yaml | 2 +- .../kube-proxy/release-kube-proxy-aarch64.json | 4 ++-- .../kube-proxy/release-kube-proxy-x86_64.json | 4 ++-- .../kustomization.aarch64.yaml | 10 +++++----- .../kustomization.x86_64.yaml | 10 +++++----- .../release-olm-aarch64.json | 8 ++++---- .../release-olm-x86_64.json | 8 ++++---- assets/release/release-aarch64.json | 18 +++++++++--------- assets/release/release-x86_64.json | 18 +++++++++--------- 14 files changed, 52 insertions(+), 52 deletions(-) diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index d6749d9ab7..21ed4885a3 100644 --- a/assets/components/multus/kustomization.aarch64.yaml +++ b/assets/components/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7aaebaefc11480b236dd0a7f497e52da3c1370ee6f540c679153e1c6a1ae7d4c + digest: sha256:6f03e38771da37a950ee2ad4ed21d6f1401b792666c11ea12ab6c57ecac18689 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:844c2c27fea94063bbd30bf41bd5751c270160834ac16ca645c30a96e8f968b0 + digest: sha256:974b29320b123da14da9cfc6d34b82555b356e1ebaacbf4e0d75275a251abf9e diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 0dfa3f4d31..bfcf3112f7 100644 --- a/assets/components/multus/kustomization.x86_64.yaml +++ b/assets/components/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f61844aee9697131664b5099ffa43e7726cdc4bf82f0e7859b340d744c83a819 + digest: sha256:0c29485d61a615c12d233ae04d3da7beb090d8f00921a02ac75cafa5d344e77b - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:5ffc236accd1d6054bb53a794dfc7eee8b7f703d44a01c38b33c699cbde657a1 + digest: sha256:6fc699747acbc064380536614d62b3e42bfc2ac3193e745eea5dbe2f70e9f7d8 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index baeda08c07..4a9c2dcff1 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-06-03-221556" + "base": "4.20.0-0.nightly-arm64-2025-06-10-104243" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7aaebaefc11480b236dd0a7f497e52da3c1370ee6f540c679153e1c6a1ae7d4c", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:844c2c27fea94063bbd30bf41bd5751c270160834ac16ca645c30a96e8f968b0" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f03e38771da37a950ee2ad4ed21d6f1401b792666c11ea12ab6c57ecac18689", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:974b29320b123da14da9cfc6d34b82555b356e1ebaacbf4e0d75275a251abf9e" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 9cfb7abf58..6c3e7054bf 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.20.0-0.nightly-2025-06-02-175911" + "base": "4.20.0-0.nightly-2025-06-09-022311" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f61844aee9697131664b5099ffa43e7726cdc4bf82f0e7859b340d744c83a819", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ffc236accd1d6054bb53a794dfc7eee8b7f703d44a01c38b33c699cbde657a1" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c29485d61a615c12d233ae04d3da7beb090d8f00921a02ac75cafa5d344e77b", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fc699747acbc064380536614d62b3e42bfc2ac3193e745eea5dbe2f70e9f7d8" } } diff --git a/assets/optional/kube-proxy/kustomization.aarch64.yaml b/assets/optional/kube-proxy/kustomization.aarch64.yaml index 4667300bf8..96a19f92e4 100644 --- a/assets/optional/kube-proxy/kustomization.aarch64.yaml +++ b/assets/optional/kube-proxy/kustomization.aarch64.yaml @@ -2,4 +2,4 @@ images: - name: kube-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:9e926daf273610546a48a70ef1a13b947cb7fae882701a06f54c90ed476315d2 + digest: sha256:dd63c583d4ea81c1107bec33b976dd09ac14c2f7b3d2dd15705560144715b75c diff --git a/assets/optional/kube-proxy/kustomization.x86_64.yaml b/assets/optional/kube-proxy/kustomization.x86_64.yaml index caa1b3ff92..394cb135f2 100644 --- a/assets/optional/kube-proxy/kustomization.x86_64.yaml +++ b/assets/optional/kube-proxy/kustomization.x86_64.yaml @@ -2,4 +2,4 @@ images: - name: kube-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7e7cbbd272f3726ae258d68f0dcb253821fd99261e5d203c054ecb4e420991a2 + digest: sha256:a3d8cbbcd7c046c9b704ebb406b862927161782c98b84f387b35485d3cce5c15 diff --git a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json b/assets/optional/kube-proxy/release-kube-proxy-aarch64.json index d40cddbf21..53fbdd6c78 100644 --- a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json +++ b/assets/optional/kube-proxy/release-kube-proxy-aarch64.json @@ -1,8 +1,8 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-06-03-221556" + "base": "4.20.0-0.nightly-arm64-2025-06-10-104243" }, "images": { - "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e926daf273610546a48a70ef1a13b947cb7fae882701a06f54c90ed476315d2" + "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd63c583d4ea81c1107bec33b976dd09ac14c2f7b3d2dd15705560144715b75c" } } diff --git a/assets/optional/kube-proxy/release-kube-proxy-x86_64.json b/assets/optional/kube-proxy/release-kube-proxy-x86_64.json index 084be36e27..f3a8da2754 100644 --- a/assets/optional/kube-proxy/release-kube-proxy-x86_64.json +++ b/assets/optional/kube-proxy/release-kube-proxy-x86_64.json @@ -1,8 +1,8 @@ { "release": { - "base": "4.20.0-0.nightly-2025-06-02-175911" + "base": "4.20.0-0.nightly-2025-06-09-022311" }, "images": { - "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e7cbbd272f3726ae258d68f0dcb253821fd99261e5d203c054ecb4e420991a2" + "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3d8cbbcd7c046c9b704ebb406b862927161782c98b84f387b35485d3cce5c15" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 31dbc48af1..888c5fc198 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:094d52fee038ff8f4961434613150a0be7541d9de11a758208781004820bca25 + digest: sha256:117a1bea1bfc44ec5fe833a2c20c25c1def7bcad5bc5bc5bd5f877d313e1ccf6 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d4d208179c4266e6ed1f6d5454de98ddd22cc5c3bd8ac71d37d74fe836fb416b + digest: sha256:5be65eb73a404bf1ac8a861d84c3c3628ac4847338bd54ec83dbcc74c3401f8c - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:268ef89dd78b673cf808e13f4f266423ba6e06c6cba8184a7be7f526b009f5f2 + digest: sha256:52a3ce5ce4d6795776bb620869c17ccee1c8e99250df12c95f6c92cef5a2558f patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4d208179c4266e6ed1f6d5454de98ddd22cc5c3bd8ac71d37d74fe836fb416b + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5be65eb73a404bf1ac8a861d84c3c3628ac4847338bd54ec83dbcc74c3401f8c - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:094d52fee038ff8f4961434613150a0be7541d9de11a758208781004820bca25 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:117a1bea1bfc44ec5fe833a2c20c25c1def7bcad5bc5bc5bd5f877d313e1ccf6 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index b2674b7fe0..f6bf610c1e 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:81a3dd0a164921a49d1256c2a0288027b95776b497cb28485a2c9fa8b6437233 + digest: sha256:8632421fd3c8f0436b72e1513838d51a052fae3fc00e71e38dbe5aa32ac724e8 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:cb2dbffe55b7e4a7abb2cad5e3ee3bdfc70b50f7791d6eba5869deacb65469ee + digest: sha256:aa95ec952df438087b265ed667d4d9f29ecfdfa089de6dbfb21420a581dbc07e - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a6966ecebd2bceadcb15a49867289ee899325db83f052ef817f7a8a68d0ae12f + digest: sha256:8dd51f479223c70466cb72570f309bccf56a64d3bd9d637c90466d4b417ab745 patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb2dbffe55b7e4a7abb2cad5e3ee3bdfc70b50f7791d6eba5869deacb65469ee + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa95ec952df438087b265ed667d4d9f29ecfdfa089de6dbfb21420a581dbc07e - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81a3dd0a164921a49d1256c2a0288027b95776b497cb28485a2c9fa8b6437233 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8632421fd3c8f0436b72e1513838d51a052fae3fc00e71e38dbe5aa32ac724e8 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 1aa8a5786e..119042245d 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-06-03-221556" + "base": "4.20.0-0.nightly-arm64-2025-06-10-104243" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:094d52fee038ff8f4961434613150a0be7541d9de11a758208781004820bca25", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4d208179c4266e6ed1f6d5454de98ddd22cc5c3bd8ac71d37d74fe836fb416b", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:268ef89dd78b673cf808e13f4f266423ba6e06c6cba8184a7be7f526b009f5f2" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:117a1bea1bfc44ec5fe833a2c20c25c1def7bcad5bc5bc5bd5f877d313e1ccf6", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5be65eb73a404bf1ac8a861d84c3c3628ac4847338bd54ec83dbcc74c3401f8c", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52a3ce5ce4d6795776bb620869c17ccee1c8e99250df12c95f6c92cef5a2558f" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index d82bd94e33..c1781ce36e 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.20.0-0.nightly-2025-06-02-175911" + "base": "4.20.0-0.nightly-2025-06-09-022311" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81a3dd0a164921a49d1256c2a0288027b95776b497cb28485a2c9fa8b6437233", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb2dbffe55b7e4a7abb2cad5e3ee3bdfc70b50f7791d6eba5869deacb65469ee", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6966ecebd2bceadcb15a49867289ee899325db83f052ef817f7a8a68d0ae12f" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8632421fd3c8f0436b72e1513838d51a052fae3fc00e71e38dbe5aa32ac724e8", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa95ec952df438087b265ed667d4d9f29ecfdfa089de6dbfb21420a581dbc07e", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dd51f479223c70466cb72570f309bccf56a64d3bd9d637c90466d4b417ab745" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index a1884727a3..7831a1f3ce 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-06-03-221556" + "base": "4.20.0-0.nightly-arm64-2025-06-10-104243" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ad39ac965500d3bc19d61e883abbecdf0ea1a5c0e3aac093597de848ef05319", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f448878d7e606d48948d04025b586dcbe60d9db40e21448f4399368beae02d75", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f69b20b5666a2dc8fa9c551d3a5e8af410b79fbeac36ec8091e3f65d0721947", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:268ef89dd78b673cf808e13f4f266423ba6e06c6cba8184a7be7f526b009f5f2", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10e226538b18adf26a662ec0604d3359077e114bdac609195a89d49730e358b5", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99b77b160a54c8b8b57bf8c1e2a7e8d33968a4fe9e2e322ae8ff0df924fdf0ba", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:837f35648549165bbd82a9bb3ca06e874b33da04229c8249a626503273c5d9be", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a37601da3b60b328906b2a0315a496ebd30e2eefdd658880012f4832f60b276", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e37e5214eaae1a24cfdd0bc0a13f65e33d387bf63c1a0bf713846d70a579f575", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67b3b7530ab198bf69ca948774c74d8038238bed15564be2e1c8869b0bfadcac", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52a3ce5ce4d6795776bb620869c17ccee1c8e99250df12c95f6c92cef5a2558f", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f824ce9c21a6317e9ec985b000a01b076f4b55d8a2716eec339d7ae260f91f4", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a79e416d1d5e27e28e4721ace6eac7395ec64576eccd32f087248406bc2168b", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f71369afacdc54e6558630432f0e3bc1e76dd7314e001a52c2f1e9b16419b20", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:0689e27defe411a07da33e339ec65df67e09a3a7080b8e5494fae5cb1a35db36", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60d2d6c80029456376b49ae2144a8a02fc87ffe12736172945c9246cf904bed2" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7aed4d69044060d5e024ff2c3976ff3f85d08f3b744ed4e0f39612f0d520960e" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 9028a4c173..94a97b9af7 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.20.0-0.nightly-2025-06-02-175911" + "base": "4.20.0-0.nightly-2025-06-09-022311" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f54512d947414b124dfa622fc36ac1c058983564d965b0e1cd4eecfe300bafec", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4165cc25cb8f9d7f02f3c93ce3fc8d4c3e629a9153b31adad52052a66fab72b", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8ceaace40aeda99a6ef6c0ff788b8ae36dcfae302177f55335447d2a67e98c3", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6966ecebd2bceadcb15a49867289ee899325db83f052ef817f7a8a68d0ae12f", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9627409fb87a4aa9e6fe185f8ce063967663a168c5357ecdba22ef709e63faa", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8f0a096829cfd7de6731e8f4bd0b7cf4f2f29fc4d0ff281091ea6f2187adad7", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0313311054eeb5e01aed4e36262e4ef77ae8b8c775d61979b73328754870e1c8", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97a3a5c2f413120117385f4623179cd473fda1abd85940f2441a93105567a568", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8672c2261502668773a59c7239662b5f4799c14c9fe15508e73d467c4947700f", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d57d6798bcbea0c2fd3e4067d107506170c62b3c79654b46d51d16636e2d3cf", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dd51f479223c70466cb72570f309bccf56a64d3bd9d637c90466d4b417ab745", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a95fe7d5cd9e074c4d41a54cf9896017e986f9ff59556d40ce4c11410da0b08", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5e0e424f81e1c4ce91b8411d84b82143ee346d5d245f0c862ae4d22f7a1a95c", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c8f0d7b39287215c6f98962d54fae0961b1a0f3e282d8a63792aa9a823441ab", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:b372811ed8263f80c0903a63e9fd9d05d4dbf2b4d7adcb32304108124841e5bc", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dcea554b4e1baebda4d82e9779b7bdbc6c3c5df53f6e1b9949cd560c1d3d824" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b64e7bc4ab4ea4f6f0affa4b78f214c8cbde9bf398728e8565724475f349b9f" } } From de04614e5fd482f5c8bffdfcdef5ac9b8512cfca Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 11 Jun 2025 04:27:49 +0000 Subject: [PATCH 10/11] update buildfiles --- Makefile.kube_git.var | 2 +- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 69e2d33d65..7b85d1f60b 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=32 KUBE_GIT_VERSION=v1.32.5 -KUBE_GIT_COMMIT=886f7c90e4bd137f91ebfb7d0cb55d476e719643 +KUBE_GIT_COMMIT=e541011ee9752101e2e11bf455ade08da6d1e6fd KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 4f218a6229..95a5ea7052 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-arm64-2025-06-03-221556 +OCP_VERSION := 4.20.0-0.nightly-arm64-2025-06-10-104243 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index ee112148a5..9d4c6cd50c 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-2025-06-02-175911 +OCP_VERSION := 4.20.0-0.nightly-2025-06-09-022311 From 52bea4d6daf44c0d5b3e2c4a26a6902a65252976 Mon Sep 17 00:00:00 2001 From: Jon Cope Date: Wed, 11 Jun 2025 13:55:14 -0500 Subject: [PATCH 11/11] manual update-gofmt --- .../apimachinery/third_party/forked/golang/json/fields.go | 5 +++-- .../client-go/third_party/forked/golang/template/exec.go | 6 +++--- .../client-go/third_party/forked/golang/template/funcs.go | 6 +++--- .../third_party/forked/golang/reflect/type.go | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/fields.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/fields.go index 5b8514b3fa..e38605df92 100644 --- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/fields.go +++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/fields.go @@ -359,8 +359,9 @@ const ( // 4) simpleLetterEqualFold, no specials, no non-letters. // // The letters S and K are special because they map to 3 runes, not just 2: -// * S maps to s and to U+017F 'ſ' Latin small letter long s -// * k maps to K and to U+212A 'K' Kelvin sign +// - S maps to s and to U+017F 'ſ' Latin small letter long s +// - k maps to K and to U+212A 'K' Kelvin sign +// // See http://play.golang.org/p/tTxjOc0OGo // // The returned function is specialized for matching against s and diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/exec.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/exec.go index 7cf29524ce..ed66f84010 100644 --- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/exec.go +++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/exec.go @@ -1,6 +1,6 @@ -//This package is copied from Go library text/template. -//The original private functions indirect and printableValue -//are exported as public functions. +// This package is copied from Go library text/template. +// The original private functions indirect and printableValue +// are exported as public functions. package template import ( diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/funcs.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/funcs.go index f0c8e712ca..94c396c657 100644 --- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/funcs.go +++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/funcs.go @@ -1,6 +1,6 @@ -//This package is copied from Go library text/template. -//The original private functions eq, ge, gt, le, lt, and ne -//are exported as public functions. +// This package is copied from Go library text/template. +// The original private functions eq, ge, gt, le, lt, and ne +// are exported as public functions. package template import ( diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/third_party/forked/golang/reflect/type.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/third_party/forked/golang/reflect/type.go index 67957ee33e..8c05c8efca 100644 --- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/third_party/forked/golang/reflect/type.go +++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/third_party/forked/golang/reflect/type.go @@ -1,6 +1,6 @@ -//This package is copied from Go library reflect/type.go. -//The struct tag library provides no way to extract the list of struct tags, only -//a specific tag +// This package is copied from Go library reflect/type.go. +// The struct tag library provides no way to extract the list of struct tags, only +// a specific tag package reflect import (