Skip to content

USHIFT-1256: rebase-4.14.0-0.nightly-2023-05-03-163151_amd64-2023-05-03_arm64-2023-05-11 #1803

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-robot merged 5 commits into from
May 16, 2023
Merged

USHIFT-1256: rebase-4.14.0-0.nightly-2023-05-03-163151_amd64-2023-05-03_arm64-2023-05-11 #1803

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
6d503c3
update last_rebase.sh
May 16, 2023
b247aa4
update changelog
May 16, 2023
cdf8fd2
update component images
May 16, 2023
8550d20
update manifests
May 16, 2023
88bfcc8
update buildfiles
May 16, 2023
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.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=26
KUBE_GIT_VERSION=v1.26.0
KUBE_GIT_VERSION=v1.26.2
KUBE_GIT_COMMIT=d2e245fcc3f3d67b3bbedfe317ad0106f1b23f5d
KUBE_GIT_TREE_STATE=clean
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.14.0-0.nightly-arm64-2023-05-04-012046
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-05-11-000606
8 changes: 4 additions & 4 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.14.0-0.nightly-arm64-2023-05-04-012046"
"base": "4.14.0-0.nightly-arm64-2023-05-11-000606"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13f209711520ae5df940ac889904317a331ac6984de594da6f5974258392f917",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6e3ed7b3aa60647d0324de8bdb23a329e1c5536b4dc8b03e17a87cbf761af75",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6141d293f5ccfeefe41e0153ef91aea6d9f443604868b6895f096f37ed199063",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdc31692d2e8382e02e8ab45415f8be6fe915b3ac79ac7e123de5793646f5701",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb239b7f30ce0c39f91d8a0495cfea99e0da20fe38b5d144b077bb08ac26ad32",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:976215eeabfbd8ad74c42a3df338afd9a147111b67ea967c92ef3a7554f35f69",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:012df57eaefd0f27e17816c4c000f4bcade278d6f3cb057e76368cd9df8289ce",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:407dcb58df16cb62d10e235f6d14f56f92f9d8736e295bd0100c550b92b2db31",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22d4eee49df03f284ec85913a6d8a83758dead0ccba51746a3b262f1d46a248b",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a0ca55b7fc7565fc8d50139df4809db0ac27bc97e6212b4d5c523cf14e19d75",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/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:012df57eaefd0f27e17816c4c000f4bcade278d6f3cb057e76368cd9df8289ce"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22d4eee49df03f284ec85913a6d8a83758dead0ccba51746a3b262f1d46a248b"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
1,996 changes: 1,935 additions & 61 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 27c255551673ba529ac6c94
https://github.com/openshift/ovn-kubernetes image-amd64 7a7d6050fbde5df36471764eaa5f7c2fcbed978c
https://github.com/openshift/kubernetes image-amd64 d2e245fcc3f3d67b3bbedfe317ad0106f1b23f5d
https://github.com/openshift/service-ca-operator image-amd64 f0bd313003d3d79593b44936fb7cf0bab2a6daae
https://github.com/openshift/oc image-arm64 42126f8cb42302f0cb4cc559fd545f8bb9fcf175
https://github.com/openshift/oc image-arm64 f843bb1e3acc667e60fd6831afbc6da5b0063518
https://github.com/openshift/coredns image-arm64 a2c62dd3976b27d6a45e273532c63ba914700917
https://github.com/openshift/router image-arm64 c407ebbc5d8d85daea2ef2d1ba539444a06f4d25
https://github.com/openshift/kube-rbac-proxy image-arm64 27c255551673ba529ac6c9419abe13451afa3e4d
https://github.com/openshift/ovn-kubernetes image-arm64 7a7d6050fbde5df36471764eaa5f7c2fcbed978c
https://github.com/openshift/kubernetes image-arm64 d2e245fcc3f3d67b3bbedfe317ad0106f1b23f5d
https://github.com/openshift/ovn-kubernetes image-arm64 a2eb4c392dce404b578f12e65c971d4c836c04f2
https://github.com/openshift/kubernetes image-arm64 53f3066f47d3a594d6b93843916e8711ee673715
https://github.com/openshift/service-ca-operator image-arm64 f0bd313003d3d79593b44936fb7cf0bab2a6daae
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.14.0-0.nightly-2023-05-03-163151" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-05-04-012046" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-05-03-163151" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-05-11-000606" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"