Skip to content

Commit 3cfb480

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-4.14.0-0.nightly-2024-01-03-152035_amd64-2024-01-03_arm64-2024-01-03 (#2841)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent 04fe87d commit 3cfb480

File tree

8 files changed

+26
-8
lines changed

8 files changed

+26
-8
lines changed

Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-12-26-121134
1+
OCP_VERSION := 4.14.0-0.nightly-arm64-2024-01-03-214226

Makefile.version.x86_64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.14.0-0.nightly-2024-01-01-134822
1+
OCP_VERSION := 4.14.0-0.nightly-2024-01-03-152035

assets/release/release-aarch64.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.14.0-0.nightly-arm64-2023-12-26-121134"
3+
"base": "4.14.0-0.nightly-arm64-2024-01-03-214226"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42c1aa1b31cbe8c5e7edd9356a7da672db25b68896cd7f7af38d6f0fcaf8dab3",
@@ -9,7 +9,7 @@
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddd75c30edd44babf5f90527263aea60b39efc197092a130fd2ceb68e22d5400",
1010
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
1111
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00e128d8b2faa9948c2c05ca5f430d75a31ead3d7e1224a5cf43cb0167ed4ff0",
12-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b9e0fb53a88daa9e6435d0b61314f6ea9d27821a6e154906615067009d544e5",
12+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e67a39b2770b63b2c235f407a319f6dd6414c8d770fc3ce005891e08a93feeb9",
1313
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90cf3bc42e3d5c15658c14194b3c0d594fae2aec5137ac7cada579583788f1c3",
1414
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73",
1515
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55",

assets/release/release-x86_64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.14.0-0.nightly-2024-01-01-134822"
3+
"base": "4.14.0-0.nightly-2024-01-03-152035"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:460b501afaec82f7de37964e8f44f9d021a6c9d1d7e9f3a8ae17edae3489155f",

packaging/crio.conf.d/microshift_arm64.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ plugin_dirs = [
2525
# for community builds on top of OKD, this setting has no effect
2626
[crio.image]
2727
global_auth_file="/etc/crio/openshift-pull-secret"
28-
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b9e0fb53a88daa9e6435d0b61314f6ea9d27821a6e154906615067009d544e5"
28+
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e67a39b2770b63b2c235f407a319f6dd6414c8d770fc3ce005891e08a93feeb9"
2929
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
3030
pause_command = "/usr/bin/pod"

scripts/auto-rebase/changelog.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
- kubernetes image-arm64 4fab27b79307fcf0c6301964f3212d7d101f48cc to 0f0272f4e3a8d8a43e88e963e072c79e2e46c70f
2+
- c6f50265d 2024-01-02T17:51:29-03:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
3+
- b4def7f82 2024-01-02T15:10:36-03:00 UPSTREAM: <drop>: manually resolve conflicts
4+
- d15213f69 2023-12-19T13:32:13+00:00 Release commit for Kubernetes v1.27.9
5+
- a169e9ed6 2023-12-14T09:23:20-08:00 run update-vendor script
6+
- 23d10364a 2023-12-07T13:40:39+01:00 [go] Bump images, dependencies and versions to go 1.20.12
7+
- 10aa4e028 2023-11-27T14:19:27-08:00 pass GOTOOLCHAIN to build containers
8+
- 430f4a5c8 2023-11-27T14:19:26-08:00 handle GOTOOLCHAIN in kube::golang::verify_go_version
9+
- 39df88c3b 2023-11-27T19:04:03+00:00 Move adding GroupVersion log until after an update is confirmed
10+
- f899a310e 2023-11-26T08:02:14+00:00 fix: requeue pods rejected by Extenders properly
11+
- 4296f2022 2023-11-21T09:21:32+01:00 Bump distroless-iptables to 0.2.8 based on Go 1.20.11
12+
- f7e235c03 2023-11-16T11:26:42+01:00 Make StatefulSet restart pods with phase Succeeded
13+
- f4f01e743 2023-11-15T17:23:41+00:00 Update CHANGELOG/CHANGELOG-1.27.md for v1.27.8
14+
- f757fadbe 2023-11-14T13:03:25-08:00 run hack scripts to update cyphar/filepath-securejoin to v0.2.4 correctly
15+
- 7a34f59d1 2023-11-14T13:03:25-08:00 update filepath-securejoin dependency to 0.2.4 to fix security vulnerability
16+
- de94d863d 2023-11-01T16:41:50+08:00 Fix panic when process RunScorePlugins for cap out of range
17+
- 910da6677 2023-10-02T10:48:47+02:00 e2e: bootstrap vsphere tests earlier
18+

scripts/auto-rebase/commits.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 0bf9276611e57c
3333
https://github.com/openshift/router image-arm64 b3af193f191b8d20c0b7bac328cb2c397d5c2c27
3434
https://github.com/openshift/kube-rbac-proxy image-arm64 1a646b98d8864e53accb726531d86f084ab13977
3535
https://github.com/openshift/ovn-kubernetes image-arm64 8114b59e7f4548167e942fdcf6a96a60f14b6327
36-
https://github.com/openshift/kubernetes image-arm64 4fab27b79307fcf0c6301964f3212d7d101f48cc
36+
https://github.com/openshift/kubernetes image-arm64 0f0272f4e3a8d8a43e88e963e072c79e2e46c70f
3737
https://github.com/openshift/service-ca-operator image-arm64 3c3f82f7112ee4b5656e5c554f9887acdf881175

scripts/auto-rebase/last_rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash -x
2-
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-01-01-134822" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-12-26-121134"
2+
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-01-03-152035" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-01-03-214226"

0 commit comments

Comments
 (0)