diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 889d90ee92..4d0a5732b5 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-04-223906 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-08-000403 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index d0db3ec6e3..7991793e9d 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2024-07-04-171958 +OCP_VERSION := 4.15.0-0.nightly-2024-07-07-041929 diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 010ab53335..8e72695da0 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.15.0-0.nightly-arm64-2024-07-04-223906" + "base": "4.15.0-0.nightly-arm64-2024-07-08-000403" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e684f0f539dfd5a3c132f4ba3f3449e25ba299063bee7f635bda12f8403c794", 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 93963db73f..753cee9fb7 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-2024-07-04-171958" + "base": "4.15.0-0.nightly-2024-07-07-041929" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f496b42ea4096b6f9ad04c8710a134fb51d1e7cd4604c483145b8964687c92c", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index bb9fca8c14..ebc28c62f8 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-07-04-223906" + "base": "4.15.0-0.nightly-arm64-2024-07-08-000403" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75b3d2698e118c5cbc55a997a55c03755db3e67e1106a7a7cf235b5dd8e6d511", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 3f779e3f79..e5508ed2ae 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-2024-07-04-171958" + "base": "4.15.0-0.nightly-2024-07-07-041929" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2dfc4ecb963ff42e8da864e9821b6afc8790e3d566b2dfaae1299063a6cea648", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e75bb9533c..39c12f2541 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,16 +1,18 @@ -- cluster-network-operator embedded-component f273783444ca6f251dfdaba3843322e09cb09488 to 6b2734f030911c065d25e1319444222956b2d1ac - - f1a512e 2024-07-01T10:52:04+02:00 Update whereabouts crd +- cluster-kube-apiserver-operator embedded-component eae692607f7ef1cfc6ef95bcd57c67f04d2c165c to 62a9eff944bfbdc1b4e79332fe4d8ae2df053c8c + - 078c319 2024-06-20T12:17:55+04:00 Revert "Add sno section to alert description" + - 2ecf632 2024-06-20T12:15:24+04:00 add highcpuusagesnoalertcontroller tests + - de24ac1 2024-06-20T12:14:50+04:00 add SNO control plane high cpu usage alert -- machine-config-operator embedded-component 98cf6fbede4d0ba3746bcaa5c13211e2e88faa86 to 42e07574113781d4fde76aa50a146ee72d637a2d - - 53018a02 2024-06-25T10:55:52-04:00 [release-4.15] OCPBUGS-27436: Fix mirrorSourcePolicy error prompt imagecontentsourcepolicies +- cluster-network-operator embedded-component 6b2734f030911c065d25e1319444222956b2d1ac to 853b1bd8f59f22cdc020c6b916b80e64ee71dc6d + - 4e49207 2024-06-28T22:28:25+00:00 Create the configmap mtu if not found + - 848c7d4 2024-06-27T11:12:49-04:00 Add ability to configure transit and join switch subnet + - c3c500c 2024-06-27T11:12:49-04:00 Configure CNO as per new API changes for join and transit switch subnet + - 34a5219 2024-06-27T11:12:24-04:00 Bump openshift/api + - e874a03 2024-05-21T14:34:49-04:00 Add knobs in cno referencing api change -- ovn-kubernetes image-amd64 7e8054a8ddb596087186c8c4b68dbf82767026b5 to ad798f2aca6a471fbb6bcd8d2395e069f53ad7dc - - b7ba318 2024-07-01T10:58:10+00:00 Handle IP fragments in SGW mode - - 3fe4301 2024-07-01T10:58:09+00:00 Move custom conntrack zones to the config package - - e6f139e 2024-07-01T10:58:07+00:00 ovnkube-node: Make service conntrack zone configurable +- cluster-openshift-controller-manager-operator embedded-component 9c4fb818258a579901343fec3c2c47ec20ad2555 to 45d342cb8ecde4e2fe51ceb613827fb3d219b8a0 + - a8f96f9 2024-06-27T10:23:07+01:00 set required-scc for openshift workloads -- ovn-kubernetes image-arm64 7e8054a8ddb596087186c8c4b68dbf82767026b5 to ad798f2aca6a471fbb6bcd8d2395e069f53ad7dc - - b7ba318 2024-07-01T10:58:10+00:00 Handle IP fragments in SGW mode - - 3fe4301 2024-07-01T10:58:09+00:00 Move custom conntrack zones to the config package - - e6f139e 2024-07-01T10:58:07+00:00 ovnkube-node: Make service conntrack zone configurable +- machine-config-operator embedded-component 42e07574113781d4fde76aa50a146ee72d637a2d to 0b30396ac09af31e99f99a75e8ad0ed26d4fff47 + - 0261a611 2024-07-04T10:50:48+00:00 MCD-pull: run after network-online.target in Azure diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 97d6a00b53..9079583f74 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,17 +1,17 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 65dbb12b710b7126f662f5f7f2d8272f9f6868cc https://github.com/openshift/cluster-dns-operator embedded-component 49290d7db2194df73dfaeb1e719580dabf166690 https://github.com/openshift/cluster-ingress-operator embedded-component 6d63904f882d23871e332e93dfb740b05aca7097 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component eae692607f7ef1cfc6ef95bcd57c67f04d2c165c +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 62a9eff944bfbdc1b4e79332fe4d8ae2df053c8c https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ee8cf52558df0862f9927dbc7275fbe6cc1a1e5f https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f054dfaf189b43b262c11ef7f97038c79592c796 -https://github.com/openshift/cluster-network-operator embedded-component 6b2734f030911c065d25e1319444222956b2d1ac -https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 9c4fb818258a579901343fec3c2c47ec20ad2555 +https://github.com/openshift/cluster-network-operator embedded-component 853b1bd8f59f22cdc020c6b916b80e64ee71dc6d +https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 45d342cb8ecde4e2fe51ceb613827fb3d219b8a0 https://github.com/openshift/cluster-policy-controller embedded-component cc48f3152213bfe6e42fdd82f760246e862d208f https://github.com/openshift/csi-external-snapshotter embedded-component 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/etcd embedded-component a7005ef1eae85eec6c59411860538169cea182fd https://github.com/openshift/kubernetes embedded-component add48d0c4f679a95d1c06d80a00be54644bbdeaf https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb -https://github.com/openshift/machine-config-operator embedded-component 42e07574113781d4fde76aa50a146ee72d637a2d +https://github.com/openshift/machine-config-operator embedded-component 0b30396ac09af31e99f99a75e8ad0ed26d4fff47 https://github.com/openshift/openshift-controller-manager embedded-component 104b9ece0feb24da89fa6b87d90d60dd27fce813 https://github.com/openshift/operator-framework-olm embedded-component 89cf3705e28c59cc9228f606de8b555771eb474a https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 1da2ca8d7e..240900c706 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.15.0-0.nightly-2024-07-04-171958" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-04-223906" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-07-07-041929" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-08-000403"