Skip to content

Commit 994a445

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-02-26-050226_amd64-2025-02-26_arm64-2025-02-27 (#4612)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 84da279 commit 994a445

File tree

10 files changed

+36
-73
lines changed

10 files changed

+36
-73
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.19.0-0.nightly-arm64-2025-02-26-230203
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-02-27-211136

‎assets/optional/multus/kustomization.aarch64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
images:
33
- name: multus-cni-microshift
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:a241e5ef6acb5bae6a5ad7599745f6a60251e7657978f76f9ade5144357cc17b
5+
digest: sha256:17accae06c6875ea8c558b9b68ff0947033f63d0e5c7b45bf2220b14d961fa49
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:101c83d142f3144577dd8100e97cbb22be0debc4f7976815cfc610eaf5d8c298
8+
digest: sha256:1edcb18681802ec9e21a818b707833f285fcd97984d70bb3821f3d6cbca1d654

‎assets/optional/multus/release-multus-aarch64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-02-26-230203"
3+
"base": "4.19.0-0.nightly-arm64-2025-02-27-211136"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a241e5ef6acb5bae6a5ad7599745f6a60251e7657978f76f9ade5144357cc17b",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:101c83d142f3144577dd8100e97cbb22be0debc4f7976815cfc610eaf5d8c298"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17accae06c6875ea8c558b9b68ff0947033f63d0e5c7b45bf2220b14d961fa49",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1edcb18681802ec9e21a818b707833f285fcd97984d70bb3821f3d6cbca1d654"
88
}
99
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:f0ab19340abd5616b184c26d236c9c146b47f2966517da61939be3c32b611664
5+
digest: sha256:fa458b1a5adf1d7b3cca8d976efaa37c25eaf8d5b7f4e16fdb7f8a22d8d9d4e5
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:79bc9755636d1f8c6631d9887a55f2eb0c35818ab6352eda7ab2411076d8685d
8+
digest: sha256:a7ae9748a5620e543c7f8fa40594d8c6458d0bb5b4e1330dfe384e2301cbc5cc
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:99b04b81df1b2b9309430f75ebd37da9722795bed71d0ce756f495f2c110a5fe
11+
digest: sha256:9f6aaee74e0a764b4813bbefe23ec07ea860dfa486dcfb61b0c52b39138a53e6
1212

1313
patches:
1414
- patch: |-
1515
- op: add
1616
path: /spec/template/spec/containers/0/env/-
1717
value:
1818
name: OPERATOR_REGISTRY_IMAGE
19-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79bc9755636d1f8c6631d9887a55f2eb0c35818ab6352eda7ab2411076d8685d
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7ae9748a5620e543c7f8fa40594d8c6458d0bb5b4e1330dfe384e2301cbc5cc
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
2323
name: OLM_IMAGE
24-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0ab19340abd5616b184c26d236c9c146b47f2966517da61939be3c32b611664
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fa458b1a5adf1d7b3cca8d976efaa37c25eaf8d5b7f4e16fdb7f8a22d8d9d4e5
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-02-26-230203"
3+
"base": "4.19.0-0.nightly-arm64-2025-02-27-211136"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0ab19340abd5616b184c26d236c9c146b47f2966517da61939be3c32b611664",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79bc9755636d1f8c6631d9887a55f2eb0c35818ab6352eda7ab2411076d8685d",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99b04b81df1b2b9309430f75ebd37da9722795bed71d0ce756f495f2c110a5fe"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fa458b1a5adf1d7b3cca8d976efaa37c25eaf8d5b7f4e16fdb7f8a22d8d9d4e5",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7ae9748a5620e543c7f8fa40594d8c6458d0bb5b4e1330dfe384e2301cbc5cc",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f6aaee74e0a764b4813bbefe23ec07ea860dfa486dcfb61b0c52b39138a53e6"
99
}
1010
}

‎assets/release/release-aarch64.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-02-26-230203"
3+
"base": "4.19.0-0.nightly-arm64-2025-02-27-211136"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0ab277a2c0343c1b6084b9803a2953ca03864637457221fec1c8ed1f3fec4fcd",
7-
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:795dcd2d7817d3c680fc783787a801a76f6fc75ec3754d2881cdd131c1eb3320",
8-
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28075bd8d296cf4ba0082812a6421e266ba3f6730c131b17da636cd24548a5ce",
9-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99b04b81df1b2b9309430f75ebd37da9722795bed71d0ce756f495f2c110a5fe",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e44b3d42b39aa4aef15e4af105d6dba04603ae41841c2ad58fd1f3368884baf",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:111992b91656c20e838473ec5ea708d3bf73e6b0806ceb94003c044419e5d216",
12-
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3992b7f8512dd782f0e091813ed3562aee1a641c13b0e8dd6e091a9acf95fdea",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c258dc6115d77a23444ee554dc000f5ac0911798960633b849a2a07c519c72a8",
7+
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1534e5f4a8c276615266bebb67dbbfd96fdfa53b7b5e7e604ec82b34d4ed5bce",
8+
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0cbcc4a5a74d0bc2044734fcc2696a8a6bdc6fa020e05226e771c815f78ecaf3",
9+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f6aaee74e0a764b4813bbefe23ec07ea860dfa486dcfb61b0c52b39138a53e6",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40a88e5cff12d4024ced5b3a2047298bafe6d21f43bae9bc193102d26a7a2982",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f330a4d7e61176c25f6e8db53eb268b729f308658287847fc05ac4d0b0baaeef",
12+
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:beefff29b6bdb51adbcc4513623979e87720ba73cd95382024ef5f1f594b8597",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
14-
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3afb667bedae57994cc8e362d03414a42eb09d2c1b5aaa6cbbaf07b3353f31f0"
14+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47d02aa98e0aa7e1cd26c4892571e6eedc953d25a77d03292c040adf54257488"
1515
}
1616
}

‎packaging/crio.conf.d/10-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:111992b91656c20e838473ec5ea708d3bf73e6b0806ceb94003c044419e5d216"
28+
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f330a4d7e61176c25f6e8db53eb268b729f308658287847fc05ac4d0b0baaeef"
2929
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
3030
pause_command = "/usr/bin/pod"

‎scripts/auto-rebase/changelog.txt

Lines changed: 8 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,9 @@
1-
- kubernetes embedded-component 86db063ce6f244acf7d437bda201600d568f9548 to c44e83d45f377c079cebd613a6ad987168462cda
2-
- f352d0b6b 2025-02-25T12:18:39+05:30 UPSTREAM: <drop>: bump openshift/api@107848b719c5
3-
- 6c59c65f0 2025-02-24T09:12:51+03:00 UPSTREAM: <carry>: Re-enable temporarily disabled port-forward test
4-
- d0b99d270 2025-02-07T15:23:56-05:00 UPSTREAM: <carry>: authorizer: move mininum kubelet version authorizer to pkg/kubeapiserver and add authorization mode
5-
- 9f66d116b 2025-02-07T15:23:56-05:00 UPSTREAM: <carry>: authorization: add minimumkubeletversion package
6-
- 3df68695d 2025-02-07T11:02:53-05:00 UPSTREAM: <carry>: update vendor to use new apiserver/node package
7-
- e78506633 2025-02-07T11:02:53-05:00 UPSTREAM: <carry>: features: add MinimumKubeletVersion feature
8-
9-
- machine-config-operator embedded-component 244bc58da1f9d1602dee94fbc89244992d400631 to b8ba7c1fba65dfa360f6b2f115d48b69cbc46513
10-
- 1169e575 2025-02-24T12:31:23-05:00 debug log
11-
- e5accd63 2025-02-24T12:31:23-05:00 daemon/osrelease: add additional case for IsEL()
12-
- d4817369 2025-02-24T08:38:25-05:00 increase WaitForPoolComplete() timeout
13-
- 1c2b8627 2025-02-20T12:03:21-05:00 Remove OCL Extensions test
14-
- a4131ad6 2025-02-20T16:35:48+01:00 Add two-node-ha extension support required by Two Node OpenShift
15-
16-
- operator-framework-olm embedded-component 500679af63800bd6dfc0acc5d153d3ef4ce706df to bf218bbc5469e1494fc9bbbe969b696a5a8cf371
17-
- d631a816 2025-02-25T00:03:35+00:00 :seedling: bump the k8s-dependencies group with 2 updates (#3520)
18-
- 31b22385 2025-02-25T00:02:38+00:00 :seedling: bump github.com/spf13/cobra from 1.8.1 to 1.9.1 (#3522)
19-
20-
- oc image-amd64 a7e8def99f63040840bc41427f4d1947f9d555bd to b2f8216d285c2ec38acc7aa8c41a5689062b61c8
21-
- b6bae7fc 2025-02-19T22:31:19-08:00 pkg/cli/admin/upgrade/recommend: "Upstream" -> "Upstream update service"
22-
- 96677c6c 2025-01-22T15:43:06-05:00 Test case for lowercase Jira ticket names
23-
24-
- kubernetes image-amd64 86db063ce6f244acf7d437bda201600d568f9548 to c44e83d45f377c079cebd613a6ad987168462cda
25-
- f352d0b6b 2025-02-25T12:18:39+05:30 UPSTREAM: <drop>: bump openshift/api@107848b719c5
26-
- 6c59c65f0 2025-02-24T09:12:51+03:00 UPSTREAM: <carry>: Re-enable temporarily disabled port-forward test
27-
- d0b99d270 2025-02-07T15:23:56-05:00 UPSTREAM: <carry>: authorizer: move mininum kubelet version authorizer to pkg/kubeapiserver and add authorization mode
28-
- 9f66d116b 2025-02-07T15:23:56-05:00 UPSTREAM: <carry>: authorization: add minimumkubeletversion package
29-
- 3df68695d 2025-02-07T11:02:53-05:00 UPSTREAM: <carry>: update vendor to use new apiserver/node package
30-
- e78506633 2025-02-07T11:02:53-05:00 UPSTREAM: <carry>: features: add MinimumKubeletVersion feature
31-
32-
- oc image-arm64 a7e8def99f63040840bc41427f4d1947f9d555bd to b2f8216d285c2ec38acc7aa8c41a5689062b61c8
33-
- b6bae7fc 2025-02-19T22:31:19-08:00 pkg/cli/admin/upgrade/recommend: "Upstream" -> "Upstream update service"
34-
- 96677c6c 2025-01-22T15:43:06-05:00 Test case for lowercase Jira ticket names
35-
36-
- kubernetes image-arm64 86db063ce6f244acf7d437bda201600d568f9548 to efd4d776fd6178a96e55e12bc035d4425febfe24
37-
- a0c862244 2025-02-25T14:13:59-05:00 UPSTREAM: <carry>: ./hack/update-vendor.sh for openshift-tests-extension
38-
- edf2ddc6d 2025-02-25T09:05:40-03:00 UPSTREAM: <drop>: make update
39-
- d169e64c9 2025-02-25T08:52:20-03:00 UPSTREAM: <carry>: unskip RecoverVolumeExpansionFailure tests
40-
- f352d0b6b 2025-02-25T12:18:39+05:30 UPSTREAM: <drop>: bump openshift/api@107848b719c5
41-
- 6c59c65f0 2025-02-24T09:12:51+03:00 UPSTREAM: <carry>: Re-enable temporarily disabled port-forward test
42-
- d0b99d270 2025-02-07T15:23:56-05:00 UPSTREAM: <carry>: authorizer: move mininum kubelet version authorizer to pkg/kubeapiserver and add authorization mode
43-
- 9f66d116b 2025-02-07T15:23:56-05:00 UPSTREAM: <carry>: authorization: add minimumkubeletversion package
44-
- 3df68695d 2025-02-07T11:02:53-05:00 UPSTREAM: <carry>: update vendor to use new apiserver/node package
45-
- e78506633 2025-02-07T11:02:53-05:00 UPSTREAM: <carry>: features: add MinimumKubeletVersion feature
1+
- oc image-arm64 b2f8216d285c2ec38acc7aa8c41a5689062b61c8 to 514a4581b8a6b8b0aef5832e50adf1037ffd9566
2+
- cbecb375 2025-02-25T15:41:27-08:00 pkg/cli/admin/upgrade/recommend: Configureable version for test fixtures
3+
- f7378ff1 2025-02-25T15:41:27-08:00 pkg/cli/admin/upgrade/recommend/examples/README: Catch up with --show-outdated-releases
4+
- 04ddd208 2025-02-25T10:45:16+03:00 Bump indirect dependency go-jose to 4.0.5 version
5+
6+
- kubernetes image-arm64 efd4d776fd6178a96e55e12bc035d4425febfe24 to 0d5e1846a2163960301184f0582fcfb3e805bee1
7+
- 33d7ffce5 2025-02-26T09:21:03-05:00 UPSTREAM: <carry>: admission: validate minimumKubeletVersion
8+
- 91780bc84 2025-02-26T09:21:03-05:00 UPSTREAM: <carry>: crdvalidation: move latency profile file to be agnostic of field
469

‎scripts/auto-rebase/commits.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 591277560f328601273f88f
2525
https://github.com/openshift/ovn-kubernetes image-amd64 2e689e10bffbd7a2833be5e75a48b5311586a83d
2626
https://github.com/openshift/kubernetes image-amd64 c44e83d45f377c079cebd613a6ad987168462cda
2727
https://github.com/openshift/service-ca-operator image-amd64 1e65678429c82df5ae97da4dde8dbe03d75062e6
28-
https://github.com/openshift/oc image-arm64 b2f8216d285c2ec38acc7aa8c41a5689062b61c8
28+
https://github.com/openshift/oc image-arm64 514a4581b8a6b8b0aef5832e50adf1037ffd9566
2929
https://github.com/openshift/coredns image-arm64 7a1451db77a68161d58af9b6ca2c9388d578310a
3030
https://github.com/openshift/csi-external-snapshotter image-arm64 1fc6ee158070b34f84a94489b33accb333714727
3131
https://github.com/openshift/router image-arm64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6
3232
https://github.com/openshift/kube-rbac-proxy image-arm64 591277560f328601273f88f2881e09ccccd90a97
3333
https://github.com/openshift/ovn-kubernetes image-arm64 2e689e10bffbd7a2833be5e75a48b5311586a83d
34-
https://github.com/openshift/kubernetes image-arm64 efd4d776fd6178a96e55e12bc035d4425febfe24
34+
https://github.com/openshift/kubernetes image-arm64 0d5e1846a2163960301184f0582fcfb3e805bee1
3535
https://github.com/openshift/service-ca-operator image-arm64 1e65678429c82df5ae97da4dde8dbe03d75062e6

‎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.19.0-0.nightly-2025-02-26-050226" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-02-26-230203"
2+
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-02-26-050226" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-02-27-211136"

0 commit comments

Comments
 (0)