diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 8b03c8dd90..bf4cd483c1 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-arm64-2025-12-04-225354 +OCP_VERSION := 4.21.0-0.nightly-arm64-2025-12-07-231112 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index cb2d18875e..2d7997262e 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2025-12-04-225354" + "base": "4.21.0-0.nightly-arm64-2025-12-07-231112" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c268397397578e3e67e51dc218d79f3ed001a00a7fd05eb4558d20cf6634bc8", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index bafebdbf9d..967cc13a98 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.21.0-0.nightly-arm64-2025-12-04-225354" + "base": "4.21.0-0.nightly-arm64-2025-12-07-231112" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:804e6ba4646614a8ffc4a265e7d5efc9a726c9280dc200ded0c426b9ef725ffe", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index ab61eea570..dc57d58958 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2025-12-04-225354" + "base": "4.21.0-0.nightly-arm64-2025-12-07-231112" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6adb12c1a581666273ffb26cc791e7ec84d33c4e7abcbb4edb6ab9464d59983", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 5b3d8f521b..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,36 +0,0 @@ -- oc image-arm64 02aba637a54c5d1317b5c284e213d7a85d64d6bb to 345800dc3c4164fbca313c1cbfb383f262547903 - - 232df150 2025-12-01T13:39:19+01:00 .claude: Improve pr-review command/skill - - 201abbf9 2025-11-28T16:57:51+03:00 Fall back to simpler behavior, if setsid,ps,pkill are not installed - -- router image-arm64 0e388de223c63d7ea8e735c9bfaa05be2cc01717 to b231c65b5c06c1f74590ca8e77caecc6213beb6a - - bee7676 2025-10-28T08:39:20-04:00 dynamicallyReplaceEndpoints: Check for idled svc - -- ovn-kubernetes image-arm64 dc442479932a9173cc16317d114bc54bd945f04c to 25a714b82c643bcfdf5543cb467afa32dac06787 - - af2a37fc 2025-12-01T16:59:24+01:00 Revert "Update libovsdb bindings to ovn 25.09" - - 49e73090 2025-11-28T13:30:10+01:00 Unskip kubernetes conformance test - - f41c3632 2025-11-28T13:30:10+01:00 Add unit tests for UDP conntrack entry deletion on service update - - b5ed1c74 2025-11-28T13:30:10+01:00 Cleanup UDP conntrack entries for service updates - - 4f79ff03 2025-11-28T13:30:10+01:00 DeleteConntrack function updates - - 676c1b30 2025-11-28T10:14:47+01:00 Add Patryk to maintainers group - - 1483ec16 2025-11-27T20:39:12+05:30 Update ocp-dnsnameresolver coredns plugin version - - 9a3366db 2025-11-21T11:28:08+08:00 Update libovsdb bindings to ovn 25.09 - - 0f360806 2025-11-20T17:31:57-08:00 Bump ubuntu version to 25.10 - - 74e5e6f4 2025-11-20T14:20:24+00:00 Bump back to go 1.24 - - 9429d250 2025-11-20T13:07:58+01:00 Fix misuse of time.Duration values Comparing or setting a variable of type time.Duration to an integer, the integer is considered to be in nanoseconds - - 9ab20b93 2025-11-20T13:07:58+01:00 Bump kubevirt to v1.6.2 in kind clusters - - 3faa93d5 2025-11-20T13:07:58+01:00 Kind Updates > Update kubernetes version in the files below: github/workflows/test.xml contrib/kind-common test/scripts/upgrade-ovn.sh test/scripts/install-kind.sh docs/installation/launching-ovn-kubernetes-on-kind.md docs/developer-guide/local_testing_guide.md - - 584138e0 2025-11-20T13:07:58+01:00 test/conformance rebase 1.34 > test/conformance go get k8s.io/kubernetes@v1.34.1 go get k8s.io/client-go@v0.34.1 go get k8s.io/kube-openapi go get k8s.io/utils go get sigs.k8s.io/structured-merge-diff/v4@v4.7.0 go get sigs.k8s.io/controller-runtime@v0.22.1 go get sigs.k8s.io/network-policy-api@v0.1.7 go mod tidy make conformance - - 25ac6f54 2025-11-20T13:07:58+01:00 test/e2e rebase 1.34 > test/e2e go get k8s.io/kubernetes@v1.34.1 go get k8s.io/api@v0.34.1 go get k8s.io/client-go@v0.34.1 go get k8s.io/pod-security-admission@v0.34.1 go get k8s.io/kubectl@v0.34.1 go get sigs.k8s.io/controller-runtime@v0.22.1 go get k8s.io/mount-utils@v0.34.1 go get k8s.io/cri-client@v0.34.1 go get k8s.io/dynamic-resource-allocation@v0.34.1 go get k8s.io/kube-scheduler@v0.34.1 go get k8s.io/csi-translation-lib@v0.34.1 go get k8s.io/cloud-provider@v0.34.1 go get k8s.io/controller-manager@v0.34.1 go get k8s.io/kube-openapi go get golang.org/x/tools@v0.38.0 go mod tidy - - 30f80751 2025-11-20T13:07:58+01:00 go-controller rebase 1.34 > go-controller go get k8s.io/api@v0.34.1 go get k8s.io/client-go@v0.34.1 go get k8s.io/component-helpers@v0.34.1 go get k8s.io/kubernetes@v1.34.1 go get k8s.io/apiextensions-apiserver@v0.34.1 go get sigs.k8s.io/controller-runtime@v0.22.1 go get k8s.io/controller-manager@v0.34.1 go get sigs.k8s.io/structured-merge-diff/v4@v4.7.0 go get sigs.k8s.io/knftables@v0.0.19 go get k8s.io/kubelet@v0.34.1 go get sigs.k8s.io/apiserver-network-proxy/konnectivity-client@v0.33.0 go get k8s.io/kube-openapi go get sigs.k8s.io/json go get k8s.io/utils go get github.com/openshift/api go get github.com/openshift/client-go go get golang.org/x/tools@v0.38.0 go mod tidy go mod vendor - - 18a31708 2025-11-17T14:13:00-08:00 cleanup primary pUDN connection details annotaton in cmdDel - - e60a35ba 2025-11-17T15:16:11+01:00 Update enhancement replacing connectivityEnabled with connectivity - - 5a79a636 2025-11-17T15:16:11+01:00 Enable ClusterNetworkConnect tests to run in NetSeg lane - - 8f0ccf02 2025-11-17T15:16:11+01:00 Add API Validation E2E tests - - 0ac7c29b 2025-11-17T15:16:11+01:00 Generate CNC YAMLs - - 0605aafe 2025-11-17T15:16:11+01:00 Add ClusterNetworkConnect API - -- kubernetes image-arm64 f6c89d1c3286d2f58dff24c38cbb0eaedab00c4c to 0987ea121e432412b7582943a195708e67e0a38f - - 850445a7f 2025-12-02T15:01:27-08:00 UPSTREAM: : Add HPA specific OTE suite - - ce2ef9665 2025-11-26T13:47:28-08:00 UPSTREAM: : move disabled HPA tests from Broken to DedicatedJob - - d3c4628d8 2025-10-24T07:15:08-04:00 UPSTREAM: : Remove duplicate VolumeGroupSnapshottableTestSuite from CSISuites - diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index a2d789459d..8a9637c099 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.21.0-0.nightly-2025-11-22-193140" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2025-12-04-225354" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2025-11-22-193140" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2025-12-07-231112"