diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 3182849139..69e5a98260 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2024-01-30-205726 +OCP_VERSION := 4.15.0-0.nightly-2024-01-31-130653 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 91f88d1c8a..43bf4e559c 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-01-30-205726" + "base": "4.15.0-0.nightly-2024-01-31-130653" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b258cf549b8c1ea7584603ed5aaa3c042cbc674258e394de6f72acc56246ae50", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 97e507f77a..445b7c44f3 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-01-30-205726" + "base": "4.15.0-0.nightly-2024-01-31-130653" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c72ef70d0732e4d00a6725e9038a4e1975651de7e08880b7d2f26c4870907a95", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 3620bfaae6..c2fc0b106a 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,31 +1,4 @@ -- cluster-kube-apiserver-operator embedded-component 9f6208d68b7207e819767ffbad8bb95e6b8b7bb2 to 90d35d617b6b87004530fb974cbc6eb39bc3fe3b - - eecfa10 2024-01-22T14:36:59+00:00 webhookcontroller: report when a webhook resource is missing a caBundle provided by the service-ca-operator - - 5c22848 2024-01-22T14:36:59+00:00 webhookcontroller: update degraded webhook condition types to errors - -- cluster-kube-controller-manager-operator embedded-component 8a3e677c03f7e821f5b9e2639eb6621b15f96edb to 642fb08461913d9352b781693311727da42ffc0a - - e97a1fa 2024-01-16T15:57:30+00:00 fix: remove deprecated exclude annotation - - a5d8f36 2024-01-16T15:57:30+00:00 fix: add internal-openshift-hosted - -- cluster-network-operator embedded-component f092c967f8c6a32acd1f40cb92ff8c1e6244a486 to d4ebd6af6ca400f22acd071532be50da7eae0f4b - - ef4d793 2024-01-23T15:14:18+00:00 Deploy CNO IPsec MC even if user already have one - - b8f203d 2023-12-19T01:19:05+00:00 OCPBUGS-19830: fix whereabouts conformance test failures - -- machine-config-operator embedded-component fd594960f56ce9ad4c5f61abc61b4094457d86b9 to 90cab989d0062333daea41c24596e35385ef1ea0 - - 9f33506c 2024-01-26T00:14:50+00:00 daemon: allow the user to override drains on IR changes - - fc7b1795 2024-01-22T17:22:32+00:00 Add Image Credential Provider flags for Kubelet on AWS - -- operator-framework-olm embedded-component b66c6693482904e415a3effcbcc2eec250f8a1d0 to 8b7ee21aa330b9bd60505c0b51caf2ce7c9e7de1 - - 57473dbd 2024-01-24T23:25:25+05:30 Bump go-git/v5 version to 5.11.0 - - 2b9b74f1 2024-01-24T10:50:44-05:00 Fix Condition check for Reconcile InstallPlan status (#3153) - - dadbd656 2024-01-24T10:49:16-05:00 Fix snapshot failure when catalogSourceNamespace does not contain OperatorGroup. (#3149) - - 8e8426b0 2024-01-24T10:48:30-05:00 Fix Create InstallPlan with Permissions test (#3129) - - 79f565eb 2024-01-24T10:48:14-05:00 Improve condition check for installplan (#3145) - - 04a2206f 2024-01-23T17:24:02-05:00 bump go-git/v5 to 5.11.0 (#1175) - -- coredns image-amd64 44797b00e47789c9a15960773806dccc1612fff7 to 22f950eae53fcba187c2303ac4f1a8305b6c1c8a - - 969220a 2024-01-24T14:57:26+00:00 UPSTREAM: 6277: openshift: Fix OCPBUGS-27397 - -- ovn-kubernetes image-amd64 00d9aeb42013387a87ba289953bb81966bad14bc to 2476c75ade680f6324391be71a6edfe15fb60d98 - - 8185be7 2024-01-17T11:38:05+01:00 Dockerfile: Bump OVN to ovn-23.09.0-100.el9fdp - - 5c4c45c 2024-01-17T11:38:05+01:00 Add e2e test for session affinity after the chosen backend pod is deleted. +- cluster-network-operator embedded-component d4ebd6af6ca400f22acd071532be50da7eae0f4b to a1ddc470cb58e599d16b7a7878cc37a339b47b0f + - 5f4573e 2024-01-25T16:04:26+00:00 Add unit tests for function ensureMachineConfigPools + - e5071b4 2024-01-25T16:04:26+00:00 Not update migration conditions when any MCP is updating diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index a9b7ad5556..263cce49bd 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -4,7 +4,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 611011b https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 90d35d617b6b87004530fb974cbc6eb39bc3fe3b https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 642fb08461913d9352b781693311727da42ffc0a https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e1a1e3a845fd27d2dc8cbd7eb40975505ff294ab -https://github.com/openshift/cluster-network-operator embedded-component d4ebd6af6ca400f22acd071532be50da7eae0f4b +https://github.com/openshift/cluster-network-operator embedded-component a1ddc470cb58e599d16b7a7878cc37a339b47b0f https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component e87e15acee1bbdbc1663aec1bda9517a876023f2 https://github.com/openshift/cluster-policy-controller embedded-component cc48f3152213bfe6e42fdd82f760246e862d208f https://github.com/openshift/csi-external-snapshotter embedded-component 090cd57847b98aebe42ecd5091c3a626eb870022 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index c44e940dc5..33ed4f11ce 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-01-30-205726" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-01-30-193622" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-01-31-130653" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-01-30-193622"