Skip to content

Commit 5d46bab

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-01-10-101042_amd64-2024-01-10_arm64-2024-01-11 (#2871)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent c08cfa6 commit 5d46bab

File tree

6 files changed

+9
-53
lines changed

6 files changed

+9
-53
lines changed

‎Makefile.version.aarch64.var

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-01-10-105735
1+
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-01-11-034526

‎assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ images:
88
digest: sha256:5578b8a17f736d5cee554b46aa517844d453bddb8540eed5d0d5f0bf9deaa8cc
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:3330d44d7b4b3c1b87e879a53b762ad9dcb552dc4f5ca535c772d7927983b75e
11+
digest: sha256:6ecd9c2f589fa9f72c7d38e15d8653572434e63694aa49214b324394fe2486bf
1212

1313
patches:
1414
- patch: |-

‎assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.15.0-0.nightly-arm64-2024-01-10-105735"
3+
"base": "4.15.0-0.nightly-arm64-2024-01-11-034526"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff198164be7f0178d0ce4cfbce8194467968265a767018d6aa8f89f7df3bf304",
77
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5578b8a17f736d5cee554b46aa517844d453bddb8540eed5d0d5f0bf9deaa8cc",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3330d44d7b4b3c1b87e879a53b762ad9dcb552dc4f5ca535c772d7927983b75e"
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ecd9c2f589fa9f72c7d38e15d8653572434e63694aa49214b324394fe2486bf"
99
}
1010
}

‎assets/release/release-aarch64.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"release": {
3-
"base": "4.15.0-0.nightly-arm64-2024-01-10-105735"
3+
"base": "4.15.0-0.nightly-arm64-2024-01-11-034526"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b540fb501a8edbf41814aec67833849532465d1af3746f31e888423f315083c6",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0eb4ee658f54eab6453571380793ad1d55207026d6032e833bcc379df34a5b4",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f150afb3f41d8ae52d052d5df4fcda2ea923b58745082d5a13c72bb0d5335945",
8-
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9bcd3c7b23714eb47c46afc49102fe3dabe3a502a5637acdbf99cf8d98f4881",
9-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3330d44d7b4b3c1b87e879a53b762ad9dcb552dc4f5ca535c772d7927983b75e",
8+
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:301607b5991fe4225efcd010728c719ec7a8e798ae110f23d3f1728271f154a0",
9+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ecd9c2f589fa9f72c7d38e15d8653572434e63694aa49214b324394fe2486bf",
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:2ff82f3593c96a975728ea481dfab455e3d7c3a2e8b35da198d01b4331459ceb",
1212
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb6875d76bfcd70b82b411d5ed46421029b263229c0996fe8f52a0e89cdc5df1",

‎scripts/auto-rebase/changelog.txt

-44
Original file line numberDiff line numberDiff line change
@@ -1,44 +0,0 @@
1-
- etcd embedded-component 969d7afab8258b4610569d001e9a06b677acd021 to 5acb4f3078adbea40d050365ac5294229e574c67
2-
- 51dffdbd 2023-12-10T13:24:58+01:00 Merge pull request #215 from openshift-bot/art-consistency-openshift-4.15-ose-etcd
3-
- 792d4fb5 2023-12-10T13:23:56+01:00 DOWNSTREAM <carry>: resolve merge conflicts
4-
- 3b252db4 2023-12-07T11:29:12+01:00 version: bump up to 3.5.11
5-
- ebb7e796 2023-12-06T11:12:14-08:00 etcdserver: add linearizable_read check to readyz.
6-
- 13bafdff 2023-12-06T20:02:25+01:00 etcd: Update go version to 1.20.12
7-
- 98aa4669 2023-12-05T10:59:25-08:00 server: disable redirects in peer communication
8-
- 293fc21c 2023-11-27T12:52:15-08:00 etcdserver: add metric counters for livez/readyz health checks.
9-
- f5d7f997 2023-11-27T12:52:15-08:00 etcdserver: add livez and ready http endpoints for etcd.
10-
- 2b54660a 2023-11-27T12:52:15-08:00 http health check bug fixes
11-
- 46e39424 2023-11-27T09:31:00-08:00 server: Split metrics and health code
12-
- 8ab1c0f2 2023-11-27T09:31:00-08:00 server: Cover V3 health with tests
13-
- 9db8ddbb 2023-11-27T09:31:00-08:00 server: Refactor health checks
14-
- eed94f6f 2023-11-27T09:31:00-08:00 server: Run health check tests in subtests
15-
- 2f6c84e9 2023-11-27T09:31:00-08:00 server: Rename test case expect fields
16-
- c6784a7e 2023-11-27T09:31:00-08:00 server: Use named struct initialization in healthcheck test
17-
- 9e21048c 2023-11-27T21:48:50+13:00 Backport server: Don't follow redirects when checking peer urls.
18-
- f9521978 2023-11-26T10:30:49+13:00 Backport embed: Add tracing integration test.
19-
- 5a564d56 2023-11-26T10:22:10+13:00 Backport server: Have tracingExporter own resources it initialises.
20-
- 3a54851f 2023-11-26T10:22:10+13:00 Backport server: Add sampling rate to distributed tracing.
21-
- 7f7b9150 2023-11-15T17:10:40+01:00 upgrade github.com/stretchr/testify,google.golang.org/genproto/googleapis/api,google.golang.org/grpc to make it consistent
22-
- f26074ae 2023-11-15T14:09:07+01:00 CVE-2023-47108: Backport go.opentelemetry.io/[email protected] and go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/[email protected]
23-
- f9f38bc9 2023-11-13T16:56:29-08:00 github workflow: run arm64 tests on every push
24-
- e1aa1b97 2023-11-12T17:45:27-06:00 etcd: upgrade go version from 1.20.10 to 1.20.11
25-
26-
- kubernetes embedded-component 9605db49fe85405b9448edf78cdd0c78d53b41c9 to b400f2077ca1e5191282c53a64bd650209a430af
27-
- a5bbb429d 2024-01-08T13:20:11+00:00 UPSTREAM: <carry>: Update IP/CIDR CEL for 1.28 compatibility
28-
- 6f4ce59cb 2024-01-04T14:06:27+00:00 UPSTREAM: <carry>: Backport IP and CIDR CEL base for 1.28
29-
- 4da6e9fc0 2024-01-04T14:06:25+00:00 UPSTREAM: 121912: Add IP address CEL extension
30-
31-
- machine-config-operator embedded-component 6457fc9a0c23702f8b0756b543a286ed4d2f9874 to 860ecd31f1b68d021b316a0793b6cc3eadacece1
32-
- 7ae9b61a 2024-01-05T19:10:51+00:00 Azure: Run ovs-configuration.service before dnsmasq.service
33-
- 153fa048 2024-01-02T18:43:22+00:00 kubelet: fix kubelet labels and turn off selinux execstack
34-
35-
- kubernetes image-amd64 9605db49fe85405b9448edf78cdd0c78d53b41c9 to b400f2077ca1e5191282c53a64bd650209a430af
36-
- a5bbb429d 2024-01-08T13:20:11+00:00 UPSTREAM: <carry>: Update IP/CIDR CEL for 1.28 compatibility
37-
- 6f4ce59cb 2024-01-04T14:06:27+00:00 UPSTREAM: <carry>: Backport IP and CIDR CEL base for 1.28
38-
- 4da6e9fc0 2024-01-04T14:06:25+00:00 UPSTREAM: 121912: Add IP address CEL extension
39-
40-
- kubernetes image-arm64 9605db49fe85405b9448edf78cdd0c78d53b41c9 to b400f2077ca1e5191282c53a64bd650209a430af
41-
- a5bbb429d 2024-01-08T13:20:11+00:00 UPSTREAM: <carry>: Update IP/CIDR CEL for 1.28 compatibility
42-
- 6f4ce59cb 2024-01-04T14:06:27+00:00 UPSTREAM: <carry>: Backport IP and CIDR CEL base for 1.28
43-
- 4da6e9fc0 2024-01-04T14:06:25+00:00 UPSTREAM: 121912: Add IP address CEL extension
44-

‎scripts/auto-rebase/last_rebase.sh

+1-1
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.15.0-0.nightly-2024-01-10-101042" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-01-10-105735"
2+
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-01-10-101042" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-01-11-034526"

0 commit comments

Comments
 (0)