diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index d090db6646..362f2a7a08 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=d92880b14300b76b867a83ec887e280a5b77b52e +KUBE_GIT_COMMIT=02b9b7e65987d5aa4559c318725354713838b5a2 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index b80c7af816..920bef6511 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-arm64-2025-06-26-231650 +OCP_VERSION := 4.20.0-0.nightly-arm64-2025-06-29-204627 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 371472d1ef..cfad12bad6 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-2025-06-20-214016 +OCP_VERSION := 4.20.0-0.nightly-2025-06-28-115226 diff --git a/assets/components/csi-snapshot-controller/csi_controller_deployment.yaml b/assets/components/csi-snapshot-controller/csi_controller_deployment.yaml index 6455c44360..5b48acfc99 100644 --- a/assets/components/csi-snapshot-controller/csi_controller_deployment.yaml +++ b/assets/components/csi-snapshot-controller/csi_controller_deployment.yaml @@ -23,6 +23,8 @@ spec: openshift.io/required-scc: restricted-v2 labels: app: csi-snapshot-controller + openshift.storage.network-policy.dns: allow + openshift.storage.network-policy.api-server: allow spec: securityContext: runAsNonRoot: true diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 0f8e00616c..3b4697729a 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:3d9f7262c02f2397a56b9f83de5565342563173aab799204c9d240c99ba851fa + digest: sha256:d4221a4a53fafbe04c7d46556f4f72c485407d814f18b5cf7b14410403c05761 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:32c69f5819b3ec0bdc9e6296aebb64c26d8845943857f1c44095379de92969c3 + digest: sha256:467ffccb5a3b4511b80f18f7097a5a9e9bb6362f97697be585a0211f191ef3e9 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index f53bfa2889..209baa70f1 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-06-26-231650" + "base": "4.20.0-0.nightly-arm64-2025-06-29-204627" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dff6b68a409a3e5cdd679d7a26420abd5ecd75027edd17bb2dbcbab489506530", diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index e376d1e81d..464d754f98 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-20-214016" + "base": "4.20.0-0.nightly-2025-06-28-115226" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d9f7262c02f2397a56b9f83de5565342563173aab799204c9d240c99ba851fa", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32c69f5819b3ec0bdc9e6296aebb64c26d8845943857f1c44095379de92969c3" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4221a4a53fafbe04c7d46556f4f72c485407d814f18b5cf7b14410403c05761", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:467ffccb5a3b4511b80f18f7097a5a9e9bb6362f97697be585a0211f191ef3e9" } } diff --git a/assets/optional/kube-proxy/kustomization.x86_64.yaml b/assets/optional/kube-proxy/kustomization.x86_64.yaml index 73ff17c5d5..4a0465eb10 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:e73c2485b0b50c8dccaedea2311aad6ee3036377d8ae8047a26bc2a2f4b6c549 + digest: sha256:3a6a8daae223fc315f73045d733fbc0f5c4f4a2cd5ec1cd87b5fada17fec89b3 diff --git a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json b/assets/optional/kube-proxy/release-kube-proxy-aarch64.json index 29efec991e..03796cd9fa 100644 --- a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json +++ b/assets/optional/kube-proxy/release-kube-proxy-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-06-26-231650" + "base": "4.20.0-0.nightly-arm64-2025-06-29-204627" }, "images": { "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb3a68321a7e1c65789da0b389a455dd3efd2eb5680953e4dc7bdc06d4b4446c" 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 9177d5e5c4..17e502fcab 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-20-214016" + "base": "4.20.0-0.nightly-2025-06-28-115226" }, "images": { - "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e73c2485b0b50c8dccaedea2311aad6ee3036377d8ae8047a26bc2a2f4b6c549" + "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a6a8daae223fc315f73045d733fbc0f5c4f4a2cd5ec1cd87b5fada17fec89b3" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index b4550c66d4..8b2525ebe3 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:9dc4358e925dc1dc81f9427514708943a2715eae86a8852ba2e92321ad8a0d86 + digest: sha256:81d3f05911fc7990851d300eadf647906572038320a08f45041d99f6a4298d4f - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:445d517dd9a06261876e48fe4770b3ed4205e9e2d56a9cf23977cffcbcedcea0 + digest: sha256:cc8a240588f4443132195d1e064e2579d24155334436a98f9381fb2b62d2d2a8 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:997327803da16f984825119d4e77f9bda5d4c702195463a984b0a7c67c41ab3f + digest: sha256:09d24c9a29e1502c869acded81d9fece81240d5ebf7a8a4af2ff34b9f42a873e 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:445d517dd9a06261876e48fe4770b3ed4205e9e2d56a9cf23977cffcbcedcea0 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc8a240588f4443132195d1e064e2579d24155334436a98f9381fb2b62d2d2a8 - 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:9dc4358e925dc1dc81f9427514708943a2715eae86a8852ba2e92321ad8a0d86 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81d3f05911fc7990851d300eadf647906572038320a08f45041d99f6a4298d4f 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 214c52e5d7..51c63d7d46 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-06-26-231650" + "base": "4.20.0-0.nightly-arm64-2025-06-29-204627" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fe3da3ac60585ec10b0b5b6fa2e43be4cb596c79c122cd337eca840d9a306d9", 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 b585fb3690..d059b19da2 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-20-214016" + "base": "4.20.0-0.nightly-2025-06-28-115226" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9dc4358e925dc1dc81f9427514708943a2715eae86a8852ba2e92321ad8a0d86", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:445d517dd9a06261876e48fe4770b3ed4205e9e2d56a9cf23977cffcbcedcea0", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:997327803da16f984825119d4e77f9bda5d4c702195463a984b0a7c67c41ab3f" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81d3f05911fc7990851d300eadf647906572038320a08f45041d99f6a4298d4f", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc8a240588f4443132195d1e064e2579d24155334436a98f9381fb2b62d2d2a8", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09d24c9a29e1502c869acded81d9fece81240d5ebf7a8a4af2ff34b9f42a873e" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index e5bca5b7c6..59f4565591 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-06-26-231650" + "base": "4.20.0-0.nightly-arm64-2025-06-29-204627" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c7be2010440b12c9b97acd8b61aad07ead88ce7db9dca85e58f3f8a74f11be1", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index d03ad986fa..45001b179e 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-20-214016" + "base": "4.20.0-0.nightly-2025-06-28-115226" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:64e75c90e9f9a6ab779a939dd4a9f702f5a89f8a7b527e1507a6be6716274e96", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ae5042b13d85dc3468f14cc4965ed41cf6e3079c9742911fb7107c4c9fb3215", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f7e1af518a8959e7dd7e86b6333cd11cdc859522a53145a8cc9fd66a97fe22f", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:997327803da16f984825119d4e77f9bda5d4c702195463a984b0a7c67c41ab3f", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a611e730a21f73af0b8640e144bd7504b8badde0e9ba4493778d77901e4f9ac", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efc88fe98bb6c628d08bac26a529e7e859309d58f9460b045f0584fd6d31e0f6", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5675cb173bcf6b221d214cc26c1f0619ab67129e8681a3af92c3d5596f23e11b", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d07348b8d200a8de1cdfe1bbba24c7b6b29924a821ec7eff7e2c41eb65d2dec1", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6373952c5874a7ce13d0d700787689b4b32b611ee593535015c3a34de9b39998", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:517e6ecc165325a5f772ff3df06471bb7763e097c6658f68ea04253262341e02", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09d24c9a29e1502c869acded81d9fece81240d5ebf7a8a4af2ff34b9f42a873e", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f2a4b7d4b1f55a7bba2fbcffa2f46b4ff7eb4700bda39f6c96bdf72b37e87608", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9266796a89c250c91f49e4bffcd724afbc8c0b9e836eccee3d39a3d2c495e9a", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d34f5fec40338f231e7936bada0e07fa6ac7df461c2445050fc502d83e8a3a6", "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:59f0d645823ec364d6f295d244cf21b0d51d85dc9566df4e3435ad0f6b1a6371" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b8c5cc3cc366b9c859ae62961ab59ee87b04ebf2bea68205ceb3bd6aa9794fbe" } } diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index fdea55efa6..d22c412e69 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:efc88fe98bb6c628d08bac26a529e7e859309d58f9460b045f0584fd6d31e0f6" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9266796a89c250c91f49e4bffcd724afbc8c0b9e836eccee3d39a3d2c495e9a" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index bf55e983d4..c464359a2d 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,67 @@ -- kubernetes image-arm64 62bb9f355bf8568bf1f70b33de574e27e6b446f2 to 02b9b7e65987d5aa4559c318725354713838b5a2 +- api embedded-component a8cbc218cd2ce740bad87e5e16d92ef598f19107 to 41708f6123394c18afbb4bef1bac526f46960769 + - ef76696b 2025-06-24T21:41:16+05:30 Modify api description for masquerade subnet + - ee7fb834 2025-06-24T21:21:44+05:30 Modify api description for join and transit subnets + - d681228a 2025-06-20T03:47:44+00:00 Updating ose-cluster-config-api-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/8f77fc475c95f9d98c348deb2feb88f5952d7357/images/ose-cluster-config-api.yml + - af4c63cf 2025-06-17T13:30:20-04:00 fixup! fix botched rebase + - eda0c6af 2025-06-17T09:23:36-04:00 remove rolebindingrestriction CRD from payload + +- cluster-csi-snapshot-controller-operator embedded-component 8a596ec94c65dbcf667447d6ce16c14416c8497d to ef2152f52b992addcbe24b402f1ddbf180049d85 + - ec4a366 2025-06-25T16:15:51-06:00 STOR-2340: Subscribe to Network Policies for csi-snapshot-controller + +- cluster-kube-apiserver-operator embedded-component 5cc2e26769521c6da40bc41f3838da1f38f063d4 to aab4c503b665c958a743517f7381692912c1915b + - 88aca46 2025-06-26T10:45:08-03:00 Revert "NO-JIRA: Enable watch termination grace period" + - c1a309a 2025-06-25T13:13:20+02:00 certregenerationcontroller: start configInformers again + - 81ecf24 2025-06-24T14:03:04-04:00 Enable watch termination grace period. + +- cluster-kube-controller-manager-operator embedded-component 07401428d6188f3e2209f61dc84602c035721c08 to e9a24940d18e4a1b0f2f8367a4e4a0909b819a2b + - 9b47ce4 2025-06-25T12:42:55+02:00 recoverycontroller: fix informers startup + - 53764bf 2025-06-21T16:45:42+02:00 Revert "Revert "CNTRLPLANE-343: certrotationcontroller: use minutes instead of days when FeatureShortCertRotation is enabled"" + - ae48293 2025-06-21T13:37:51+02:00 Revert "CNTRLPLANE-343: certrotationcontroller: use minutes instead of days when FeatureShortCertRotation is enabled" + - 50e9fe2 2025-06-20T06:54:01+02:00 certrotationcontroller: use minutes instead of days when FeatureShortCertRotation is enabled + - a259355 2025-06-18T09:26:46+02:00 Bump library-go + +- cluster-kube-scheduler-operator embedded-component 0d060e4b9cfbe1bdbc5991dde5424161ff44c932 to e68b158bb4c0bf56876b4d09d0344979592c7b3c + - fc94308 2025-06-24T17:46:36+02:00 bump(k8s): fitting + - d3bf78a 2025-06-24T16:56:47+02:00 bump(go)=1.24.0 + - 36c0f07 2025-06-20T08:47:54+00:00 Updating ose-cluster-kube-scheduler-operator-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/8f77fc475c95f9d98c348deb2feb88f5952d7357/images/ose-cluster-kube-scheduler-operator.yml + +- cluster-network-operator embedded-component 0a42f1a1e52724ecdd37755c9babed9eb5146deb to bd863a88a0b2fbd25c51fd967ba4fbe92bf911fd + - 5cc28c6 2025-06-26T08:54:12+02:00 FRR-K8s webhook: promote to priviledged + - 7056e67 2025-06-25T07:57:23+02:00 FRRK8s CRDs: align to upstream + - 0b29885 2025-06-25T07:51:39+02:00 FRRK8s webhook: align to upstream + +- kubernetes embedded-component d92880b14300b76b867a83ec887e280a5b77b52e to 02b9b7e65987d5aa4559c318725354713838b5a2 + - 9b547a64e 2025-06-26T09:35:55-03:00 UPSTREAM: 132502: Fix flake caused by invalid detection of active policies in VAP integration tests + - 25a5bda9d 2025-06-20T10:56:32-04:00 UPSTREAM: : Update rebase.sh to handle go versions major.minor.patch instead of just major.minor + +- machine-config-operator embedded-component a4ec776a829dbb473a2091180a0e9537a6721a9e to a08d5ec38c4f037766b4114dff5831b1c59a0772 + - db096c0b 2025-06-27T15:58:37-05:00 Add control-plane label for master nodes on legacy clusters + - 32f97677 2025-06-23T10:19:10-06:00 Remove all code related to the Image Registry workaround Config Map + - 57cf4385 2025-06-23T16:22:28+02:00 Fix dependencies + - a0d42d89 2025-06-23T16:22:28+02:00 Fill test provider with origin info + - 26679ccf 2025-06-23T16:22:27+02:00 Cleanup for MVP + - 63ba68f3 2025-06-18T13:17:29+02:00 PoC to port the internal MCO test suite + - 5e332d5b 2025-06-17T16:22:41-04:00 msbic: only update from a known boot image + - 3e5a13a1 2025-06-16T09:48:48-04:00 add MachineConfiguration to related objects + - 15e7e5e6 2025-06-04T10:59:35-04:00 OCPBUGS-57072: configure-ovs: don't escape `:` in nmcli output + - 84e407b7 2025-05-12T18:07:30+02:00 Improve Ignition conversions handling + +- openshift-controller-manager embedded-component 42665fbed9780635a01d0205bf6ab1892f2da96b to bef75e9ea2df7cf2d417299c353da4c360f22d02 + - eb82c8c 2025-06-20T15:24:06-04:00 OCPBUGS-57918: handle secret not found more gracefully + +- operator-framework-olm embedded-component d5a91adaeab7e45176928f057a9913830564c323 to 3b01b7b18a17f38952f7155d719bc7de23f6ff16 + - 25a49599 2025-06-25T00:04:05+00:00 Upgrade bingo deps (#3601) + - a6980f04 2025-06-25T00:03:22+00:00 :seedling: Bump github.com/prometheus/common from 0.64.0 to 0.65.0 (#3604) + - bc111a9c 2025-06-25T00:03:03+00:00 :bug: OCPBUGS-37982: Reduce Frequency of Update Requests for Copied CSVs (#3597) + - 7b6943d1 2025-06-18T08:12:23+00:00 Updating operator-registry-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/operator-registry.yml + - 1a281510 2025-06-18T03:08:39+00:00 Updating operator-lifecycle-manager-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/operator-lifecycle-manager.yml + - 5a207dee 2025-06-18T00:16:29+00:00 Updating ose-operator-framework-tools-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-operator-framework-tools.yml + +- oc image-amd64 3c2c13b30c04c481423b1798e113596bf3fec279 to ea5c72052233361761ba371b7c39518d443422be + - 09f1645b 2025-06-20T15:03:54-04:00 OCPBUGS-55048: Return error in case of error + - 305aa891 2025-06-20T01:16:15-04:00 Simplify TarEntryCallback + +- kubernetes image-amd64 d92880b14300b76b867a83ec887e280a5b77b52e to 02b9b7e65987d5aa4559c318725354713838b5a2 - 9b547a64e 2025-06-26T09:35:55-03:00 UPSTREAM: 132502: Fix flake caused by invalid detection of active policies in VAP integration tests + - 25a5bda9d 2025-06-20T10:56:32-04:00 UPSTREAM: : Update rebase.sh to handle go versions major.minor.patch instead of just major.minor diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index f06ebe6e9e..15d455a703 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,29 +1,29 @@ -https://github.com/openshift/api embedded-component a8cbc218cd2ce740bad87e5e16d92ef598f19107 -https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 8a596ec94c65dbcf667447d6ce16c14416c8497d +https://github.com/openshift/api embedded-component 41708f6123394c18afbb4bef1bac526f46960769 +https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component ef2152f52b992addcbe24b402f1ddbf180049d85 https://github.com/openshift/cluster-dns-operator embedded-component 659813065170f4e52f80b7a29bbab64bfa9aa172 https://github.com/openshift/cluster-ingress-operator embedded-component be41be00b822b820b03a7190732e3fc983efddf3 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 5cc2e26769521c6da40bc41f3838da1f38f063d4 -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 0a42f1a1e52724ecdd37755c9babed9eb5146deb +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component aab4c503b665c958a743517f7381692912c1915b +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component e9a24940d18e4a1b0f2f8367a4e4a0909b819a2b +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e68b158bb4c0bf56876b4d09d0344979592c7b3c +https://github.com/openshift/cluster-network-operator embedded-component bd863a88a0b2fbd25c51fd967ba4fbe92bf911fd https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 8781f7247e9442428a4b1971b90a9c31fcccdce9 https://github.com/openshift/cluster-policy-controller embedded-component 748524784686a5f397490563882cbfb88f9acd01 https://github.com/openshift/csi-external-snapshotter embedded-component 1b2240dca48840103558b499281effaea072b162 https://github.com/openshift/etcd embedded-component a5421dfe551a2e9c911a75062a4cdeb7473f5c26 -https://github.com/openshift/kubernetes embedded-component d92880b14300b76b867a83ec887e280a5b77b52e +https://github.com/openshift/kubernetes embedded-component 02b9b7e65987d5aa4559c318725354713838b5a2 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 2b36e46ab36a5a7581c9ed763e0a7646f90b94e7 -https://github.com/openshift/machine-config-operator embedded-component a4ec776a829dbb473a2091180a0e9537a6721a9e -https://github.com/openshift/openshift-controller-manager embedded-component 42665fbed9780635a01d0205bf6ab1892f2da96b -https://github.com/openshift/operator-framework-olm embedded-component d5a91adaeab7e45176928f057a9913830564c323 +https://github.com/openshift/machine-config-operator embedded-component a08d5ec38c4f037766b4114dff5831b1c59a0772 +https://github.com/openshift/openshift-controller-manager embedded-component bef75e9ea2df7cf2d417299c353da4c360f22d02 +https://github.com/openshift/operator-framework-olm embedded-component 3b01b7b18a17f38952f7155d719bc7de23f6ff16 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 3c2c13b30c04c481423b1798e113596bf3fec279 +https://github.com/openshift/oc image-amd64 ea5c72052233361761ba371b7c39518d443422be https://github.com/openshift/coredns image-amd64 a69279e3393b269099dcaae967570741d4c5e469 https://github.com/openshift/csi-external-snapshotter image-amd64 1b2240dca48840103558b499281effaea072b162 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 31d2803e5f38207bf2137ba2ec15a95cee1d0802 -https://github.com/openshift/kubernetes image-amd64 d92880b14300b76b867a83ec887e280a5b77b52e +https://github.com/openshift/kubernetes image-amd64 02b9b7e65987d5aa4559c318725354713838b5a2 https://github.com/openshift/service-ca-operator image-amd64 4dfa6916f984d0fd7188380edc88b250738f07f7 https://github.com/openshift/oc image-arm64 ea5c72052233361761ba371b7c39518d443422be https://github.com/openshift/coredns image-arm64 a69279e3393b269099dcaae967570741d4c5e469 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index f99ffe4042..f61d01af21 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-20-214016" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-06-26-231650" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2025-06-28-115226" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-06-29-204627"