diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index e998b63799..2bb3861de6 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2026-08-12-180320 +OCP_VERSION := 4.18.0-0.nightly-arm64-2026-08-18-132904 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 43ef161c6e..8017bb4856 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2026-08-12-221652 +OCP_VERSION := 4.18.0-0.nightly-2026-08-18-085616 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 2fac993e5a..7796de11f6 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/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:18026c078244992a0a5485077cdcef724de0e148ac5cbf99b16d5622e115b560 + digest: sha256:2646006b62a4712b2767230aea08adde988dcfd9614e5b941e2713cba54aa049 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c0c08f893471d0d4edbfe394b7674a952167329d55ef102565fd62856a6f4923 + digest: sha256:83929c41e6cf536262fa09f60df5a558c504c077f796519d23d5bc6f7698f9f3 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 8c856113f4..65d4491c80 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/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:57a31b89c794228b3cd506a16717f85e280d190b5f6b3d7c873a091aab90a486 + digest: sha256:47ec4d8b29538ee7953122f147bb1bc63adb6e2465848836468ea2e7017afc9d - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a2ccb718cdc0dc0c39a38e8b9fb03f580baa76c3c0de7659fb07bcf4cae5e75b + digest: sha256:067441a7b6d347e58c43599de21e3c3c54c98fb2b08bb9b78686c15190972ec7 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index f41a52f860..0d93e3e45b 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2026-08-12-180320" + "base": "4.18.0-0.nightly-arm64-2026-08-18-132904" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18026c078244992a0a5485077cdcef724de0e148ac5cbf99b16d5622e115b560", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0c08f893471d0d4edbfe394b7674a952167329d55ef102565fd62856a6f4923" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2646006b62a4712b2767230aea08adde988dcfd9614e5b941e2713cba54aa049", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83929c41e6cf536262fa09f60df5a558c504c077f796519d23d5bc6f7698f9f3" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index ded9b0014b..b2a3b85cc4 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.18.0-0.nightly-2026-08-12-221652" + "base": "4.18.0-0.nightly-2026-08-18-085616" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57a31b89c794228b3cd506a16717f85e280d190b5f6b3d7c873a091aab90a486", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2ccb718cdc0dc0c39a38e8b9fb03f580baa76c3c0de7659fb07bcf4cae5e75b" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47ec4d8b29538ee7953122f147bb1bc63adb6e2465848836468ea2e7017afc9d", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:067441a7b6d347e58c43599de21e3c3c54c98fb2b08bb9b78686c15190972ec7" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 045ce9919c..8cbb0edad3 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:7a6c5d82692c54be0c0eca3d4b9209c14249f1cfd19c6b6b6bacd2b52c63a770 + digest: sha256:57c249c79d13a7b44a6a005140e048612153fc9995604fd6f86273d6cc7ad20e - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e10582204da20575d91e00963216475556dc11ba4de507d6303c1f91e85f4e6b + digest: sha256:3b054abfb5c16cfcc75103510a32f7b0138999d533f01b1d263a66ce87b565a2 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:407cb9ce8524ac0956dc591d1ff71c24dbc2339cd30a96dd7db713049dab52e9 + digest: sha256:43e80f781c5189bd1481e5978505960f67a5ab99d94c9d648ef14d4926cbf042 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:e10582204da20575d91e00963216475556dc11ba4de507d6303c1f91e85f4e6b + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b054abfb5c16cfcc75103510a32f7b0138999d533f01b1d263a66ce87b565a2 - 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:7a6c5d82692c54be0c0eca3d4b9209c14249f1cfd19c6b6b6bacd2b52c63a770 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57c249c79d13a7b44a6a005140e048612153fc9995604fd6f86273d6cc7ad20e 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 c3c3f79346..89c6146afd 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:a71a4bde25c9d27fac89eb87b9b139f0b06fbfe7d1003fe0af101b2f5e8230eb + digest: sha256:d3ece58e0008f4de7711665b10276537142b1e8ae35f5c68601096ec0c8d1f2a - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:76907fb4a971f312bbb673b82b76a75608cdec8fc5561636f2909430e5af5286 + digest: sha256:252a620b6352f2275b1e4f799ea3302a6e405318daf1dfd29905d4d9fdc9a061 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:906039b7eb04d804de00bb8886961caa81d77ac0bab617763cd3514b3bf745a3 + digest: sha256:4f78697157df28a72179bf35a667e85ce42968e5a25dca1c7e1bb20de9bf8410 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:76907fb4a971f312bbb673b82b76a75608cdec8fc5561636f2909430e5af5286 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:252a620b6352f2275b1e4f799ea3302a6e405318daf1dfd29905d4d9fdc9a061 - 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:a71a4bde25c9d27fac89eb87b9b139f0b06fbfe7d1003fe0af101b2f5e8230eb + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3ece58e0008f4de7711665b10276537142b1e8ae35f5c68601096ec0c8d1f2a 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 abd153454d..c689ee9a8f 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.18.0-0.nightly-arm64-2026-08-12-180320" + "base": "4.18.0-0.nightly-arm64-2026-08-18-132904" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a6c5d82692c54be0c0eca3d4b9209c14249f1cfd19c6b6b6bacd2b52c63a770", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e10582204da20575d91e00963216475556dc11ba4de507d6303c1f91e85f4e6b", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:407cb9ce8524ac0956dc591d1ff71c24dbc2339cd30a96dd7db713049dab52e9" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57c249c79d13a7b44a6a005140e048612153fc9995604fd6f86273d6cc7ad20e", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b054abfb5c16cfcc75103510a32f7b0138999d533f01b1d263a66ce87b565a2", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43e80f781c5189bd1481e5978505960f67a5ab99d94c9d648ef14d4926cbf042" } } 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 aa2422fb7b..1da0dff9d4 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.18.0-0.nightly-2026-08-12-221652" + "base": "4.18.0-0.nightly-2026-08-18-085616" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a71a4bde25c9d27fac89eb87b9b139f0b06fbfe7d1003fe0af101b2f5e8230eb", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76907fb4a971f312bbb673b82b76a75608cdec8fc5561636f2909430e5af5286", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:906039b7eb04d804de00bb8886961caa81d77ac0bab617763cd3514b3bf745a3" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3ece58e0008f4de7711665b10276537142b1e8ae35f5c68601096ec0c8d1f2a", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:252a620b6352f2275b1e4f799ea3302a6e405318daf1dfd29905d4d9fdc9a061", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f78697157df28a72179bf35a667e85ce42968e5a25dca1c7e1bb20de9bf8410" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index e1b23f8d4b..9e0015a6a8 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2026-08-12-180320" + "base": "4.18.0-0.nightly-arm64-2026-08-18-132904" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:babf8ef9b2d93713eb2dd748fa7bdc38084cd4930c06005b0a21c36bb538a3a8", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cce44960dd5a315d1b320c23114ac00057d4b05b08a3c88a525ea2a0a1111cd", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1a1847a3a145d33a51e72e67ffcff6978e643d49c807bdcd58fa6b18d833b3d", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:407cb9ce8524ac0956dc591d1ff71c24dbc2339cd30a96dd7db713049dab52e9", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb53ad99309af74f0fcad202e11562703b42a6008a4149da9d4c29d42ed2f241", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf44b418da8a372f87e9fdbbc84adc2e9cdddab58d9799c9b3c84c3e6d382b96", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bd4dcb1520e5a2c1f1d8cdee0cdfb19653c92468c8a9ae81adfd4ae5d26cbae", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50c54af4e99883c67bb10c4cc2d72964ca46f3ce15ae76d6cc3052f721d3849f", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d29b79066117dfe83efd6780dde2c301164a7e2642c77fd33bb04671efded5d", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d23928442347fdbabd73f9b3b22f9a40c09852d3c72c9b58cb69564dd69b6c3a", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43e80f781c5189bd1481e5978505960f67a5ab99d94c9d648ef14d4926cbf042", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d74728059164442a0d74a0ee81522a7320db045a21a044a11d3a46087cfe87a3", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25eb8ce6cdc76788b929ca6331eac8efc5f28d9644e8369b818f6ee481e930a3", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d4ba6818136edc819d5541ca16ee857da37bcef60cfb73e8138a8b4275b6e2c", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:be49109ec5be53a783b2de9bc6529db99930a69021577c05cfa0bf1312e06d69", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33f256314d542f9d4c66aac619fb5b55923b501863651b47f7b6c1bd58dc592f" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16036d1c17e26567a4b62f2323432780b0ff12919c45d7f74e6a731af4ce839e" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 9441ccfde5..8eec352feb 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.18.0-0.nightly-2026-08-12-221652" + "base": "4.18.0-0.nightly-2026-08-18-085616" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ccd7b96a5b2a92709415bcd8a1629f2608b6b286ece37873b59965f906303c75", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fe0c5d7756b023356a72ef014091847a4c4186bae75e9988f95033bbfb4ffdb", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:232965b51a8d5a29d9ecad9cc3a48761643e95a5af39ad92d2cec9332f2a89f0", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:906039b7eb04d804de00bb8886961caa81d77ac0bab617763cd3514b3bf745a3", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4849888c0cac106542f9483344ea36f9f028e4b1a4c68cf420bc32599e3ccd1a", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c36db0d069c1010934c30f12190053840322aa17bc192d50a8e8f6bd863e0620", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d42e4bd786460c883fe9808202975093518a8fe919f78990968b5075830f784", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:64a70dbef6a7832c2b3e90c782264495c30212f7613d6d23a8327de0f67d679a", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57ae83251b3d5941385df48c1ac51b374c27870f10874287eefdb3e0a8147309", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:278978f8b408c64ff7d1114c6b8777634c42f6d56d1994901f18e0d9375a38a0", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f78697157df28a72179bf35a667e85ce42968e5a25dca1c7e1bb20de9bf8410", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1242369c003cb28ae8ad50e6d36322a4007a6de01b814cafac07495b6d3be297", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a700696dd47c2dad85b6e118bff538b884db444097a360708a6f5c096140feeb", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bffe83a0a98177f4278e49a7322c3768b13512cf0dddfd5529df0b628d2974c6", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:be49109ec5be53a783b2de9bc6529db99930a69021577c05cfa0bf1312e06d69", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e6895efacd6b7566f4796d71f844237b79bf93b0c0ae3d5da3ccdbf46baeedb" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe34e49c26027a0d39a6f0e9458c23ca93c0f47dbf576b9c9f35f3c9e140de47" } } diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index a25e914650..8e4ad3e06e 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -25,6 +25,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:c36db0d069c1010934c30f12190053840322aa17bc192d50a8e8f6bd863e0620" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a700696dd47c2dad85b6e118bff538b884db444097a360708a6f5c096140feeb" 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 88d8815b47..3fa2500db3 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -25,6 +25,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:bf44b418da8a372f87e9fdbbc84adc2e9cdddab58d9799c9b3c84c3e6d382b96" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25eb8ce6cdc76788b929ca6331eac8efc5f28d9644e8369b818f6ee481e930a3" 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 e69de29bb2..395f762883 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,11 @@ +- machine-config-operator embedded-component a362b5965c47d38e15cfe32f69e66a525819e45c to f313997e0ba83edd79b1d0091e85d6e25c793274 + - 4255295f 2026-08-10T09:12:03-04:00 mcc: replace wildcard permissions with explicit verbs and resources in MCC ClusterRole & scope configmap access to target namespace via Role instead of ClusterRole + +- router image-amd64 e5c059ea7a57d1ee5436b253cf214f144c9a7f27 to 347f03e9d6caaf6bf249bf1d2075965112eab228 + - b2e4b66 2026-07-22T17:09:17+05:30 OCPBUGS-86726: Run go mod tidy and vendor for dependency update + - 584c0dc 2026-07-22T17:06:56+05:30 OCPBUGS-86726: Prevent SSRF via FQDN-typed EndpointSlices + +- router image-arm64 e5c059ea7a57d1ee5436b253cf214f144c9a7f27 to 347f03e9d6caaf6bf249bf1d2075965112eab228 + - b2e4b66 2026-07-22T17:09:17+05:30 OCPBUGS-86726: Run go mod tidy and vendor for dependency update + - 584c0dc 2026-07-22T17:06:56+05:30 OCPBUGS-86726: Prevent SSRF via FQDN-typed EndpointSlices + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index bffaeceeac..7ad1100323 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -12,7 +12,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 70500bf https://github.com/openshift/etcd embedded-component b5a4f8d079fbb04200251d5a6bc7c56f79d9d1e3 https://github.com/openshift/kubernetes embedded-component 91c24081f468e7636c824f4f5a2eb68660b81012 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 815b43b7f7288da76dd314553e113aefe2a5897d -https://github.com/openshift/machine-config-operator embedded-component a362b5965c47d38e15cfe32f69e66a525819e45c +https://github.com/openshift/machine-config-operator embedded-component f313997e0ba83edd79b1d0091e85d6e25c793274 https://github.com/openshift/openshift-controller-manager embedded-component 8ee744063ed12b249f1a2b89e9af4f53b2f1daf7 https://github.com/openshift/operator-framework-olm embedded-component f3a32b076b409a9be12ca8082ef758f4ddffd41e https://github.com/openshift/route-controller-manager embedded-component 2484b3e8e7fbb8bf14f930a71f56781289276dfa @@ -20,7 +20,7 @@ https://github.com/openshift/service-ca-operator embedded-component 30efb529a5b7 https://github.com/openshift/oc image-amd64 6febe61977471b066f08d513424b226b82ee518f https://github.com/openshift/coredns image-amd64 8ca7f02b8becb40f7a9919243000e2620d7036d4 https://github.com/openshift/csi-external-snapshotter image-amd64 70500bf5ddedfc38ce3010e8007e07ac98569c56 -https://github.com/openshift/router image-amd64 e5c059ea7a57d1ee5436b253cf214f144c9a7f27 +https://github.com/openshift/router image-amd64 347f03e9d6caaf6bf249bf1d2075965112eab228 https://github.com/openshift/kube-rbac-proxy image-amd64 5a14ea9d338b2582c7c2a8f89f351a0c30f56371 https://github.com/openshift/ovn-kubernetes image-amd64 f8d50bf7fb4c0f4f74f9230a6b4bf2684bb6aae2 https://github.com/openshift/kubernetes image-amd64 91c24081f468e7636c824f4f5a2eb68660b81012 @@ -28,7 +28,7 @@ https://github.com/openshift/service-ca-operator image-amd64 30efb529a5b7db5d6f3 https://github.com/openshift/oc image-arm64 6febe61977471b066f08d513424b226b82ee518f https://github.com/openshift/coredns image-arm64 8ca7f02b8becb40f7a9919243000e2620d7036d4 https://github.com/openshift/csi-external-snapshotter image-arm64 70500bf5ddedfc38ce3010e8007e07ac98569c56 -https://github.com/openshift/router image-arm64 e5c059ea7a57d1ee5436b253cf214f144c9a7f27 +https://github.com/openshift/router image-arm64 347f03e9d6caaf6bf249bf1d2075965112eab228 https://github.com/openshift/kube-rbac-proxy image-arm64 5a14ea9d338b2582c7c2a8f89f351a0c30f56371 https://github.com/openshift/ovn-kubernetes image-arm64 f8d50bf7fb4c0f4f74f9230a6b4bf2684bb6aae2 https://github.com/openshift/kubernetes image-arm64 91c24081f468e7636c824f4f5a2eb68660b81012 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index f18676d71f..09f6c767e3 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.18.0-0.nightly-2026-08-12-221652" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-08-12-180320" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-08-18-085616" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-08-18-132904"