diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index d6892c02b1..047059019b 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-arm64-2024-05-30-231944 +OCP_VERSION := 4.16.0-0.nightly-arm64-2024-06-02-232232 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 529a0dba77..b55e394aec 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-2024-05-30-130713 +OCP_VERSION := 4.16.0-0.nightly-2024-06-02-202327 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 40df958469..feb22bb106 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-05-30-231944" + "base": "4.16.0-0.nightly-arm64-2024-06-02-232232" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2dfb3b49a0d6fa10f589ecacc8578f7447c830d3dcd24006811721ada8329a94", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 678e358fd7..f564f53a88 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-2024-05-30-130713" + "base": "4.16.0-0.nightly-2024-06-02-202327" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:daa12838cee6c5a3f5235bf4505bd7c8bcbe7e36deb2219f9057bb283dd5c9c3", diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index c8ed897a26..8efbae4a66 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.16.0-0.nightly-arm64-2024-05-30-231944" + "base": "4.16.0-0.nightly-arm64-2024-06-02-232232" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b6455e0dbc02ff431a1adc06beb7a916b438b0edca6c316aaff184da8d538e2", 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 b9d55b8931..7d573277de 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.16.0-0.nightly-2024-05-30-130713" + "base": "4.16.0-0.nightly-2024-06-02-202327" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:612296c176a8c387fbd415b7f8346dac1aeba34db00079126610c63af7eed62c", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 81507efe57..83b5ac511f 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-05-30-231944" + "base": "4.16.0-0.nightly-arm64-2024-06-02-232232" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:961bb3802a67c4c92337b76de2bc36f0e7b511b57535917caae29dd666b7cc08", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 6db7f5aedd..601f194f56 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-2024-05-30-130713" + "base": "4.16.0-0.nightly-2024-06-02-202327" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ac250546ce1b8226ccc4a50aec8996a70a79bccbf43e3c02e514e3a83defa96", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 6e3181be5c..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,54 +0,0 @@ -- cluster-kube-apiserver-operator embedded-component 313bc06912503443d3422da07b4ea4ea57b9fc84 to 4bbe9882ca10f723e80ff0ce7dacdd2622f7466b - - 61631fc 2024-05-23T21:38:22+00:00 Create one-shot migrations for the flowcontrol group. - -- cluster-network-operator embedded-component 019fa77b2afb6186320ebe15604f7d26d76bcfab to a569598f94a18290db95075bc317de562ec5d92e - - 231348a 2024-05-22T22:53:24+09:00 Add conditions for ignored-namespaces - - 48d18bf 2024-05-21T15:49:33+05:30 Add custom masquerade subnet against right key at ovnkube-config CM - -- kubernetes embedded-component 4a87b5377b72baed624e7afa315bb8622117ebf9 to 87992f48b0ead9af80145861d1bffff0810e70d9 - - c32ad7590 2024-05-23T11:48:14+02:00 UPSTREAM: : OCPBUGS-34102: force static build of linux binaries - - 0e89f731a 2024-05-17T17:32:01+05:30 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 59755ff59 2024-05-14T10:39:37+00:00 Release commit for Kubernetes v1.29.5 - - 53e6260d3 2024-05-08T20:53:48+08:00 scheduler: preallocation for NodeToStatusMap - - 040c9b0fa 2024-05-03T22:13:44+08:00 add e2e test when a plugin (in-tree or out-of-tree) return non-existent/illegal nodes, the pod should be scheduled normally if suitable nodes exists - - 6ac65b152 2024-05-03T21:17:59+08:00 add integration test for pod with pvc has node-affinity to non-existent/existent nodes - - 3f5007d80 2024-05-03T21:17:37+08:00 test to catch illegal nodeNames returned by PreFilterResult - - c2d2e822c 2024-05-03T21:15:52+08:00 hotfix when a plugin (in-tree or out-of-tree) return non-existent/illegal nodes, the pod scheduling flow will abort immediately. - - fa26f8add 2024-05-02T23:22:49+03:00 kubeadm: fix upgrading external CA cluster to 1.29 - - 5e93536e1 2024-04-24T21:58:20+02:00 Idempotent transformers in scheduler & kcm - - b5d929c49 2024-04-23T11:19:25-04:00 cluster/gce: upgrade cos-97-lts -> cos-109-lts - - c3298f511 2024-04-22T11:24:09+08:00 storage e2e: update hostpath and mock images - - 470aa87a1 2024-04-18T01:50:41+00:00 add log verbosity to endpoint topology hint loop. - - 00117569f 2024-04-16T15:26:33+00:00 Update CHANGELOG/CHANGELOG-1.29.md for v1.29.4 - - d995bfa25 2024-04-12T09:37:35-04:00 Rename `cluster` to `storage_cluster_id` for apiserver_storage_size_bytes metric - -- machine-config-operator embedded-component 90660896de993b904e1d5e7612b5c8652cbb4390 to c2bd74b90f71474fc7eeda568ebbe652b885babc - - d0933ecf 2024-05-17T16:43:18+00:00 OCL test must write secrets to the node for now - - 6b269431 2024-05-17T16:43:18+00:00 remove internal registry secret templating - -- oc image-amd64 2574bc791f17f3ca33d055e7645775e5db79159d to 12a2e98239d503af3e8e30a6fa9d0186c9524b77 - - 4292caa9 2024-05-23T21:11:34+00:00 `upgrade status`: upgrade -> update - - 0614888c 2024-05-23T21:11:34+00:00 OCPBUGS-33903: Simplify output when not updating - - bdd75eef 2024-05-18T21:23:01+00:00 adm update status: Fix target version field for install. - - 12f58d05 2024-05-18T21:23:01+00:00 adm update status: Show information about upgrade target version - -- ovn-kubernetes image-amd64 9e6ce7fd4528f49b60cdbf280a247ff71f3a198e to d90fa545e17a27bdf253fa820a1d7552e3079465 - - 377a0dfc 2024-05-23T22:57:09+02:00 dns: fix deadlock in case of error - -- kubernetes image-amd64 4a87b5377b72baed624e7afa315bb8622117ebf9 to 87992f48b0ead9af80145861d1bffff0810e70d9 - - c32ad7590 2024-05-23T11:48:14+02:00 UPSTREAM: : OCPBUGS-34102: force static build of linux binaries - - 0e89f731a 2024-05-17T17:32:01+05:30 UPSTREAM: : hack/update-vendor.sh, make update and update image - - 59755ff59 2024-05-14T10:39:37+00:00 Release commit for Kubernetes v1.29.5 - - 53e6260d3 2024-05-08T20:53:48+08:00 scheduler: preallocation for NodeToStatusMap - - 040c9b0fa 2024-05-03T22:13:44+08:00 add e2e test when a plugin (in-tree or out-of-tree) return non-existent/illegal nodes, the pod should be scheduled normally if suitable nodes exists - - 6ac65b152 2024-05-03T21:17:59+08:00 add integration test for pod with pvc has node-affinity to non-existent/existent nodes - - 3f5007d80 2024-05-03T21:17:37+08:00 test to catch illegal nodeNames returned by PreFilterResult - - c2d2e822c 2024-05-03T21:15:52+08:00 hotfix when a plugin (in-tree or out-of-tree) return non-existent/illegal nodes, the pod scheduling flow will abort immediately. - - fa26f8add 2024-05-02T23:22:49+03:00 kubeadm: fix upgrading external CA cluster to 1.29 - - 5e93536e1 2024-04-24T21:58:20+02:00 Idempotent transformers in scheduler & kcm - - b5d929c49 2024-04-23T11:19:25-04:00 cluster/gce: upgrade cos-97-lts -> cos-109-lts - - c3298f511 2024-04-22T11:24:09+08:00 storage e2e: update hostpath and mock images - - 470aa87a1 2024-04-18T01:50:41+00:00 add log verbosity to endpoint topology hint loop. - - 00117569f 2024-04-16T15:26:33+00:00 Update CHANGELOG/CHANGELOG-1.29.md for v1.29.4 - - d995bfa25 2024-04-12T09:37:35-04:00 Rename `cluster` to `storage_cluster_id` for apiserver_storage_size_bytes metric - diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 58d6e350da..d33f40c5ae 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.16.0-0.nightly-2024-05-30-130713" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-05-30-231944" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-06-02-202327" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-06-02-232232"