diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 694cbeae34..ec8a9469a5 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-arm64-2026-03-30-031707 +OCP_VERSION := 4.19.0-0.nightly-arm64-2026-04-02-032829 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 13f9e3e73b..a0d77fee90 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-2026-03-29-155409 +OCP_VERSION := 4.19.0-0.nightly-2026-04-01-194622 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 15e454535d..e550e8b563 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2026-03-30-031707" + "base": "4.19.0-0.nightly-arm64-2026-04-02-032829" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b27f7fc63cb9cdcaa488214a081b70cfe19664d3fed5a16bd5778672761b94e", diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index c90873a7db..83477b8989 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-2026-03-29-155409" + "base": "4.19.0-0.nightly-2026-04-01-194622" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70ff0ef04ae46f30e9e492c7ef223144a170bf732c08a6061263c7c4e6cbf011", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 489820add0..148f649d92 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:19ad0940699fb068a0f0bd674b11dde52ddf0ed1f2d5135ef8d51646337f7f76 + digest: sha256:9cfbcd60d17cac12cec933cbeb6990d3a0e902af5cebed7b80fa72501c66b6e5 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:10d4a3cdc3e9ea57debd7a57fab70e56c6fdb66d9fd3fbc4097336db04f07303 + digest: sha256:aa37496282f2ec5d6f190ba901449a936cc6a319d05ee3725002dbda3a588e57 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:5c9103797165d1ae0152d24f8ba8cc8f68c4bffc4c87084ca9145b1fd439a014 @@ -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:10d4a3cdc3e9ea57debd7a57fab70e56c6fdb66d9fd3fbc4097336db04f07303 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa37496282f2ec5d6f190ba901449a936cc6a319d05ee3725002dbda3a588e57 - 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:19ad0940699fb068a0f0bd674b11dde52ddf0ed1f2d5135ef8d51646337f7f76 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cfbcd60d17cac12cec933cbeb6990d3a0e902af5cebed7b80fa72501c66b6e5 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 a7feaebe0f..963797b6b8 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:34d44c43715eaf29fa81528ceade9a4b324c5f61b66bce8c851d3c6313baa07e + digest: sha256:79188e927cda7ea0c8b94ffc54066650b2e2713bbdb1b64b71ffce270a25354a - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b2ce29822fff92a571e271fe64369e76f0593ab76a21dacd08d09a1a2e0ffede + digest: sha256:3e6dca3f958161f47f8dd2d05cf493f46bfda34d4d923f63bc9c0b31e4994c37 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:b337c9f679f3ee512666b5154e84f567afd6fd4f97bb879f23a2691e0b8fbcd9 @@ -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:b2ce29822fff92a571e271fe64369e76f0593ab76a21dacd08d09a1a2e0ffede + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e6dca3f958161f47f8dd2d05cf493f46bfda34d4d923f63bc9c0b31e4994c37 - 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:34d44c43715eaf29fa81528ceade9a4b324c5f61b66bce8c851d3c6313baa07e + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79188e927cda7ea0c8b94ffc54066650b2e2713bbdb1b64b71ffce270a25354a 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 599dc2d0bc..3a1295ce04 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.19.0-0.nightly-arm64-2026-03-30-031707" + "base": "4.19.0-0.nightly-arm64-2026-04-02-032829" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19ad0940699fb068a0f0bd674b11dde52ddf0ed1f2d5135ef8d51646337f7f76", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10d4a3cdc3e9ea57debd7a57fab70e56c6fdb66d9fd3fbc4097336db04f07303", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cfbcd60d17cac12cec933cbeb6990d3a0e902af5cebed7b80fa72501c66b6e5", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa37496282f2ec5d6f190ba901449a936cc6a319d05ee3725002dbda3a588e57", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c9103797165d1ae0152d24f8ba8cc8f68c4bffc4c87084ca9145b1fd439a014" } } 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 93ff3bcbe8..a365942d2b 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.19.0-0.nightly-2026-03-29-155409" + "base": "4.19.0-0.nightly-2026-04-01-194622" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34d44c43715eaf29fa81528ceade9a4b324c5f61b66bce8c851d3c6313baa07e", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2ce29822fff92a571e271fe64369e76f0593ab76a21dacd08d09a1a2e0ffede", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79188e927cda7ea0c8b94ffc54066650b2e2713bbdb1b64b71ffce270a25354a", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e6dca3f958161f47f8dd2d05cf493f46bfda34d4d923f63bc9c0b31e4994c37", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b337c9f679f3ee512666b5154e84f567afd6fd4f97bb879f23a2691e0b8fbcd9" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 8988c3dfcf..824031938d 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2026-03-30-031707" + "base": "4.19.0-0.nightly-arm64-2026-04-02-032829" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3126f5ae04869a108aa0f44d234558d585fbb5769fe6ac7bdf2b1e53b12a9468", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 6da539095d..b3e85ad4a3 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-2026-03-29-155409" + "base": "4.19.0-0.nightly-2026-04-01-194622" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77ddd0677ceda1221e5165610dc5bd8adbc276d93c14de0d8eb238fff55ffd27", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 0294c0eaf8..f818d272fa 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,9 @@ -- machine-config-operator embedded-component 27993cf190c12bd5f2191019206b9290e286694d to 18f009eeb40748895fe8a6eba3778ad275655124 - - c106a8a4 2026-03-27T13:51:25+00:00 chore: update AMIs +- cluster-network-operator embedded-component b7adb6895b84c1916904e6eccd93ce578731171f to c56dbe730979a72781c87e01bb5bccffe527e6c6 + - e97a257 2026-01-21T09:06:18+00:00 Skip _stackmanager execution for libreswan 5.3+ + +- machine-config-operator embedded-component 18f009eeb40748895fe8a6eba3778ad275655124 to 9c50d5330ae771d7e8682cbb58480867b2a874da + - ebbe491b 2026-03-28T10:36:19+00:00 server: re-order logger setting + +- operator-framework-olm embedded-component 457b7eb2fdaeb469c117c3e87201ba88281795b4 to 93649380ab6fdccf8ec1716f89162b506c7de172 + - 70ea3b50 2026-03-30T14:20:21+08:00 Fix nil pointer dereference in sortUnpackJobs when sorting non-failed jobs (#3793) diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 43bf7b5ca4..166d00b037 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -5,16 +5,16 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 7ce99b2 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 4bbd3be9dfda4a08dca98648209151de2a869f25 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 7c4e44698b6004e52c59e03dd0c89611fbbfa999 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component bf8cd78f223b3d27ea4fb170d22edea14df26df3 -https://github.com/openshift/cluster-network-operator embedded-component b7adb6895b84c1916904e6eccd93ce578731171f +https://github.com/openshift/cluster-network-operator embedded-component c56dbe730979a72781c87e01bb5bccffe527e6c6 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 0ab30996207ada63ef2e2fd4f47aac03b0872c9a https://github.com/openshift/cluster-policy-controller embedded-component 748524784686a5f397490563882cbfb88f9acd01 https://github.com/openshift/csi-external-snapshotter embedded-component 580c6960cd665dfdc3d77538bb7744b8754aca26 https://github.com/openshift/etcd embedded-component 3ebce536634cb76794f1b9668072a094c132c16a https://github.com/openshift/kubernetes embedded-component a674efabac8b5044e6256ce4e2385914be215376 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component fdef30c84b3d45ede364500984221c3f492b1415 -https://github.com/openshift/machine-config-operator embedded-component 18f009eeb40748895fe8a6eba3778ad275655124 +https://github.com/openshift/machine-config-operator embedded-component 9c50d5330ae771d7e8682cbb58480867b2a874da https://github.com/openshift/openshift-controller-manager embedded-component 5b3063ff149f290bebca0783fc508dfbf07689a5 -https://github.com/openshift/operator-framework-olm embedded-component 457b7eb2fdaeb469c117c3e87201ba88281795b4 +https://github.com/openshift/operator-framework-olm embedded-component 93649380ab6fdccf8ec1716f89162b506c7de172 https://github.com/openshift/route-controller-manager embedded-component 25d79fdf101f3d41f4583a970e5f324b79fb42d8 https://github.com/openshift/service-ca-operator embedded-component 4dfa6916f984d0fd7188380edc88b250738f07f7 https://github.com/openshift/oc image-amd64 b2a93a639c07ebf4d547d10877b6c13f65583248 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index c99b162fe4..9e380f148e 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.19.0-0.nightly-2026-03-29-155409" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2026-03-30-031707" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2026-04-01-194622" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2026-04-02-032829"