Skip to content

NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-02-26-013420_amd64-2024-02-26_arm64-2024-02-29 #3086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 5 commits into from
Feb 29, 2024
Merged

NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-02-26-013420_amd64-2024-02-26_arm64-2024-02-29 #3086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a6299b
update last_rebase.sh
Feb 29, 2024
0b233bc
update changelog
Feb 29, 2024
d7a8c70
update component images
Feb 29, 2024
8ec744e
update manifests
Feb 29, 2024
c2c796a
update buildfiles
Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-02-26-112450
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-02-29-010347
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:c38e246f97e33d87c01ba3a47f241d0860721fab0210301f5d3fb794902f567d
digest: sha256:f53242384353498917dc236e24f5feb77a9ce29248341cadd1d3dd84591a12c8
- name: container-networking-plugins
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:eab9319fa2de1ed67f183ccf7c7d8448445d20646f5a4b25d8e82d13b2526008
digest: sha256:6ce7185ad4c4526e043e9aef6ac97889a824ce775e533916fbebd2fd0f7b81c0
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-02-26-112450"
"base": "4.16.0-0.nightly-arm64-2024-02-29-010347"
},
"images": {
"multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c38e246f97e33d87c01ba3a47f241d0860721fab0210301f5d3fb794902f567d",
"container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eab9319fa2de1ed67f183ccf7c7d8448445d20646f5a4b25d8e82d13b2526008"
"multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f53242384353498917dc236e24f5feb77a9ce29248341cadd1d3dd84591a12c8",
"container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ce7185ad4c4526e043e9aef6ac97889a824ce775e533916fbebd2fd0f7b81c0"
}
}
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:7b24aa738c82406a7cbd58251d37cd4e9de988338672a85aba2a7e571d87ecd0
digest: sha256:a878e926b907e8a5497f01cc9d17d4ab4f92f4ce8f5825ca5a2bcdbcb1e6317f
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:62f56c290f5959853105bbf566075210f2f3ec387525924f12df40f17212c046
digest: sha256:b815fded047d105a36edb3a274bc99d692406dd0470ddea1b052f6579eafb9d9
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:dc03dc960ecab1b0aec202ceeb04c8b2fc7973f49ebc3ab8b7ba61ea84993c52
digest: sha256:03572476196ec28dc90723fc64f4a78d00c73e62ccb3c029d74f1344ac073946

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62f56c290f5959853105bbf566075210f2f3ec387525924f12df40f17212c046
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b815fded047d105a36edb3a274bc99d692406dd0470ddea1b052f6579eafb9d9
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b24aa738c82406a7cbd58251d37cd4e9de988338672a85aba2a7e571d87ecd0
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a878e926b907e8a5497f01cc9d17d4ab4f92f4ce8f5825ca5a2bcdbcb1e6317f
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-02-26-112450"
"base": "4.16.0-0.nightly-arm64-2024-02-29-010347"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b24aa738c82406a7cbd58251d37cd4e9de988338672a85aba2a7e571d87ecd0",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62f56c290f5959853105bbf566075210f2f3ec387525924f12df40f17212c046",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc03dc960ecab1b0aec202ceeb04c8b2fc7973f49ebc3ab8b7ba61ea84993c52"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a878e926b907e8a5497f01cc9d17d4ab4f92f4ce8f5825ca5a2bcdbcb1e6317f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b815fded047d105a36edb3a274bc99d692406dd0470ddea1b052f6579eafb9d9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03572476196ec28dc90723fc64f4a78d00c73e62ccb3c029d74f1344ac073946"
}
}
12 changes: 6 additions & 6 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-02-26-112450"
"base": "4.16.0-0.nightly-arm64-2024-02-29-010347"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:08cf8d0df812dd27ac5bedbc22099aff1c67e15395445a2cedaeb442ff0d9708",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:196c6dba246b9d8352687dfe109c7b7ca870f4707480c13208dbe22115cc7e49",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a7851f6eb85a1c3456241634fe974b5c04ef8b8d8843221c68e1487a7e05312",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22cf6ab24128f81f989067c159e9c89236e693ab486896f000d909a22d83993e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc03dc960ecab1b0aec202ceeb04c8b2fc7973f49ebc3ab8b7ba61ea84993c52",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbf0bb1afd1aead9e92db81f3500fc25f14a69173dfc5b3cb76b71a6fae23f9c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03572476196ec28dc90723fc64f4a78d00c73e62ccb3c029d74f1344ac073946",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4333fbb414056cf7db1bb97b6f023fbc07cf82c8eac860dfb1a008f3d5a82e96",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6aa192f80fd342ee724d7dd91ead692ab29e755ade4c1f9f2843ba3196298655",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51ed68ed18b2b9cc65ef66e453ad42d1103ad6f1c0df4ec8a8e7f7ca330cbda8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:996f6df182fcf546fd511d5c56fa547da71892a998f3afb496bf53e30fe01aa1",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1778ff50f1492ce90f93c2aab861a5b395f06a349d29ad7f9124dbbac0818f6",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ plugin_dirs = [
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6aa192f80fd342ee724d7dd91ead692ab29e755ade4c1f9f2843ba3196298655"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:996f6df182fcf546fd511d5c56fa547da71892a998f3afb496bf53e30fe01aa1"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
14 changes: 14 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- oc image-arm64 a36a8e36c0eaec9c6905becac2f5a941b78b5123 to 91ba77aaeedb6810a30eaf7418ee76e9fb45f8ee
- 846ce4d7 2024-02-26T10:16:41+03:00 Extract oc also for linux/ppc64le
- 6e766588 2024-02-13T10:14:26+03:00 Revert "Revert "NO-JIRA: Bump k8s dependencies to 1.29.1""

- router image-arm64 4c436c604e093a8cadcee72c8a45b214e24f40ac to cf0442b1850b94b4bf123eb0a37b5491513e0b70
- 34cf2a7 2024-02-14T13:53:53+00:00 container builds: add socat package
- 6c58af9 2024-02-14T13:49:35+00:00 Revert "Merge pull request #561 from dgoodwin/revert-551-1707829993043"

- kube-rbac-proxy image-arm64 6ea01c5c6e0c56d07b66c90e27caeda58b4ce872 to 49a835a819d735f5e0b059471f9c1ec0b447c995
- ca2ca5b 2024-02-27T10:13:15+00:00 Updating kube-rbac-proxy-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/7e3c85650685dcd13127a6bf27372dece89b5cc8/images/kube-rbac-proxy.yml

- kubernetes image-arm64 2eba5a9a34b4e3ac7f3cb5f03cf04282f7464356 to 6116860ab8000581009cd889e4cc1a1985207ddf
- 1a9c833e8 2024-02-26T14:11:59-05:00 UPSTREAM: 123055: Fix race condition between resizer and kubelet

8 changes: 4 additions & 4 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 6ea01c5c6e0c56d07b66c90
https://github.com/openshift/ovn-kubernetes image-amd64 9c7e3fa5d194d41af88cc381b081ff5572366a79
https://github.com/openshift/kubernetes image-amd64 2eba5a9a34b4e3ac7f3cb5f03cf04282f7464356
https://github.com/openshift/service-ca-operator image-amd64 f409fb9e308ace1e5f8596add187d2239b073e23
https://github.com/openshift/oc image-arm64 a36a8e36c0eaec9c6905becac2f5a941b78b5123
https://github.com/openshift/oc image-arm64 91ba77aaeedb6810a30eaf7418ee76e9fb45f8ee
https://github.com/openshift/coredns image-arm64 022a0530038602605b8f3e8866c2a6ded97708cc
https://github.com/openshift/csi-external-snapshotter image-arm64 196496e722fba017252b66e76d5dc05595d32ae2
https://github.com/openshift/csi-external-snapshotter image-arm64 196496e722fba017252b66e76d5dc05595d32ae2
https://github.com/openshift/csi-external-snapshotter image-arm64 196496e722fba017252b66e76d5dc05595d32ae2
https://github.com/openshift/router image-arm64 4c436c604e093a8cadcee72c8a45b214e24f40ac
https://github.com/openshift/kube-rbac-proxy image-arm64 6ea01c5c6e0c56d07b66c90e27caeda58b4ce872
https://github.com/openshift/router image-arm64 cf0442b1850b94b4bf123eb0a37b5491513e0b70
https://github.com/openshift/kube-rbac-proxy image-arm64 49a835a819d735f5e0b059471f9c1ec0b447c995
https://github.com/openshift/ovn-kubernetes image-arm64 9c7e3fa5d194d41af88cc381b081ff5572366a79
https://github.com/openshift/kubernetes image-arm64 2eba5a9a34b4e3ac7f3cb5f03cf04282f7464356
https://github.com/openshift/kubernetes image-arm64 6116860ab8000581009cd889e4cc1a1985207ddf
https://github.com/openshift/service-ca-operator image-arm64 f409fb9e308ace1e5f8596add187d2239b073e23
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-02-26-013420" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-02-26-112450"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-02-26-013420" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-02-29-010347"