Skip to content

Commit 5478e95

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2024-12-05-191355_amd64-2024-12-05_arm64-2024-12-07 (#4287)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 903dc57 commit 5478e95

File tree

10 files changed

+44
-30
lines changed

10 files changed

+44
-30
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.18.0-0.nightly-arm64-2024-11-27-205553
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-12-07-130635

‎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:aae82cf11ed3889a004884a7eeae86aaf2b5fc9873483a019501cf9d5ff69ad1
5+
digest: sha256:eab4512b45eb0de157c22747828bd79e3318df748a450fd3b5ede86986bdbdb0
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:56d10dbfb3045575fbb7c3c4e81e0b57fcf5942d7c78dda835d0bee9f052b988
8+
digest: sha256:e5a6ffa9905d74343681af9308475cf3c01513368b359eda722089a91515d42c

‎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.18.0-0.nightly-arm64-2024-11-27-205553"
3+
"base": "4.18.0-0.nightly-arm64-2024-12-07-130635"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aae82cf11ed3889a004884a7eeae86aaf2b5fc9873483a019501cf9d5ff69ad1",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56d10dbfb3045575fbb7c3c4e81e0b57fcf5942d7c78dda835d0bee9f052b988"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eab4512b45eb0de157c22747828bd79e3318df748a450fd3b5ede86986bdbdb0",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5a6ffa9905d74343681af9308475cf3c01513368b359eda722089a91515d42c"
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:a25667d51adb40e3d03db998a77768c23d19b0a085f1653edeae3d3af1131889
5+
digest: sha256:1c67667a54bbbe571e2ccb7e7df209dce55f5c298529a332db243d7319baec9d
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:450c339f5e08d189076433842f52f1b780f31b359dd77f9da38219307c67286e
8+
digest: sha256:7ce5e56eacf25188e0afc04996f63abb4e07831d62339a5da1d135272891200e
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:0282e8b262e1941b09d3f49ba9117634a2c569ff5fc8493f4c9cd28ad20aee5e
11+
digest: sha256:274b237ef96b691604dfc0161a6ac936477b0b7b2faad4147ccf1a34237aff67
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:450c339f5e08d189076433842f52f1b780f31b359dd77f9da38219307c67286e
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ce5e56eacf25188e0afc04996f63abb4e07831d62339a5da1d135272891200e
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:a25667d51adb40e3d03db998a77768c23d19b0a085f1653edeae3d3af1131889
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c67667a54bbbe571e2ccb7e7df209dce55f5c298529a332db243d7319baec9d
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.18.0-0.nightly-arm64-2024-11-27-205553"
3+
"base": "4.18.0-0.nightly-arm64-2024-12-07-130635"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a25667d51adb40e3d03db998a77768c23d19b0a085f1653edeae3d3af1131889",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:450c339f5e08d189076433842f52f1b780f31b359dd77f9da38219307c67286e",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0282e8b262e1941b09d3f49ba9117634a2c569ff5fc8493f4c9cd28ad20aee5e"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c67667a54bbbe571e2ccb7e7df209dce55f5c298529a332db243d7319baec9d",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ce5e56eacf25188e0afc04996f63abb4e07831d62339a5da1d135272891200e",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:274b237ef96b691604dfc0161a6ac936477b0b7b2faad4147ccf1a34237aff67"
99
}
1010
}

‎assets/release/release-aarch64.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2024-11-27-205553"
3+
"base": "4.18.0-0.nightly-arm64-2024-12-07-130635"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35506474c92ca744f0fb35ab2b0da6c174f99ee3bfc5d032960f6c0c94ca3ec0",
7-
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0735740d68631dae35292a8ee138e180c11845496e09c3708946280410896ea4",
8-
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cd3715fb3d02dc156b39403307792d656c94df80f2c9cc77ea2f86ae53a76cb",
9-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0282e8b262e1941b09d3f49ba9117634a2c569ff5fc8493f4c9cd28ad20aee5e",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9919fe54d469c741a2da93a1b1e9d501f1eded182d68c45d19e31621a396aff1",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0f6fe4ed3a4e9f2b0f4f4bfcdc94260ea57f57d966dd0b0901a1d6f0121646f",
12-
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:853dd56a2d0b466e23bcc0fc9b3c784641176e3327d7278eab4e00b8c8ed2710",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa169e76af6fd508295475f940dc839c00db67b0e1ac99e3141586a34c9c3e6e",
7+
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6515b0e02e7517c6f46d66d24f4d50c6ebecf2f9cc08a97d00665b1f10a30e6e",
8+
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2f5120ce0e89f5ada4b08f6fd3e60bed3ad1ded01c4a9d589f03a332bd84b63",
9+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:274b237ef96b691604dfc0161a6ac936477b0b7b2faad4147ccf1a34237aff67",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b35be9a6211fc55bfc3ed5c67f8dad1dcc40298f617eff208088e1c5bf3e4c0",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48ce6b45ba42bf1d22fdc20294c28c24f00c56a595febb644a18f91550a97966",
12+
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cce974fe9f6a49573317bbb2a38471b69266225bb139907b171ea3cd499e428",
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:057c99dafe84de8ed781cc08bd316f38cdea166a7fccdc1be90d335094eb0e48",
15-
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c86ba0e2fa57f2e2dbb8f081eeb3424b7cadd6dea5fdd04ff76b7245a8c48c7"
14+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0edbad0db89c0fe22e3de30e877af458c48ba0610a1eb5e896873c147280521b",
15+
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03342f05cb8179acc8ac2e487aa3d622fad98beb994660941ac437177f175c7b"
1616
}
1717
}

‎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:b0f6fe4ed3a4e9f2b0f4f4bfcdc94260ea57f57d966dd0b0901a1d6f0121646f"
28+
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48ce6b45ba42bf1d22fdc20294c28c24f00c56a595febb644a18f91550a97966"
2929
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
3030
pause_command = "/usr/bin/pod"

‎scripts/auto-rebase/changelog.txt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1-
- oc image-amd64 9e568296a9b2f774e9321825e2b0c314ee9df566 to c64c430e48013ced1705344bb95ba1bdfb2a1a0b
1+
- oc image-arm64 9e568296a9b2f774e9321825e2b0c314ee9df566 to c64c430e48013ced1705344bb95ba1bdfb2a1a0b
22
- a6fd1c8b 2024-12-04T14:50:13+00:00 adm node-logs: Also parse logs when encountered with standard html header
33

4+
- kubernetes image-arm64 db7182344d1535fb685200e03c2acad2fc276527 to 205ac00c56dd2340b90dc0e328be84e77219197c
5+
- 588d9d315 2024-11-25T13:36:26-03:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
6+
- cf36527d9 2024-11-25T13:20:22-03:00 UPSTREAM: <drop>: manually resolve conflicts
7+
- c83cbee11 2024-11-19T13:48:19+00:00 Release commit for Kubernetes v1.31.3
8+
- 7682b7427 2024-11-04T09:25:58+01:00 Fix TestCacherDontMissEventsOnReinitialization test
9+
- 2d540ade5 2024-10-30T15:36:30+08:00 bugfix(scheduler): preemption picks wrong victim node with higher priority pod on it.
10+
- 962408693 2024-10-28T15:33:54+08:00 Update metrics documentation for v1.31
11+
- c94baacff 2024-10-26T00:12:37+08:00 fix(leaderelection): nil check in OnStoppedLeading func
12+
- 1ef7d6687 2024-10-22T20:52:27+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.2
13+
- fb63fe692 2024-10-22T10:19:54+08:00 Fix crash on kube manager's service-lb-controller after v1.31.0.
14+
- 32286d571 2024-10-08T14:12:25+02:00 server/config: assing system:apiserver user to system:authenticated group
15+
- d8d31947d 2024-09-24T06:41:05+00:00 tests for nodes with different nodeName and name
16+
- fdca80f8d 2024-09-24T06:41:05+00:00 manually revert #109877
17+

‎scripts/auto-rebase/commits.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 526498ab32996a0f67a9653
2626
https://github.com/openshift/ovn-kubernetes image-amd64 99c44e88d2c7aa7a95f950dc182a2979ae729e97
2727
https://github.com/openshift/kubernetes image-amd64 205ac00c56dd2340b90dc0e328be84e77219197c
2828
https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
29-
https://github.com/openshift/oc image-arm64 9e568296a9b2f774e9321825e2b0c314ee9df566
29+
https://github.com/openshift/oc image-arm64 c64c430e48013ced1705344bb95ba1bdfb2a1a0b
3030
https://github.com/openshift/coredns image-arm64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949
3131
https://github.com/openshift/csi-external-snapshotter image-arm64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
3232
https://github.com/openshift/csi-external-snapshotter image-arm64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
3333
https://github.com/openshift/router image-arm64 be319d0bb83f75b52b707df46422f6892dfaaa56
3434
https://github.com/openshift/kube-rbac-proxy image-arm64 526498ab32996a0f67a96530ad7173f955e3fbe2
3535
https://github.com/openshift/ovn-kubernetes image-arm64 99c44e88d2c7aa7a95f950dc182a2979ae729e97
36-
https://github.com/openshift/kubernetes image-arm64 db7182344d1535fb685200e03c2acad2fc276527
36+
https://github.com/openshift/kubernetes image-arm64 205ac00c56dd2340b90dc0e328be84e77219197c
3737
https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755

‎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.18.0-0.nightly-2024-12-05-191355" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-11-27-205553"
2+
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-12-05-191355" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-12-07-130635"

0 commit comments

Comments
 (0)