Skip to content

rebase-4.13.0-0.nightly-2023-04-11-144406_amd64-2023-04-11_arm64-2023-04-11 #1661

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 4 commits into from
Apr 12, 2023
Merged

rebase-4.13.0-0.nightly-2023-04-11-144406_amd64-2023-04-11_arm64-2023-04-11 #1661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7901cf4
update last_rebase.sh
Apr 12, 2023
6d1d9b0
update changelog
Apr 12, 2023
2665aa0
update manifests
Apr 12, 2023
1e09314
update buildfiles
Apr 12, 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.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.13.0-0.nightly-arm64-2023-04-10-150453
OCP_VERSION := 4.13.0-0.nightly-arm64-2023-04-11-174952
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.13.0-0.nightly-2023-04-10-162321
OCP_VERSION := 4.13.0-0.nightly-2023-04-11-144406
6 changes: 3 additions & 3 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.13.0-0.nightly-arm64-2023-04-10-150453"
"base": "4.13.0-0.nightly-arm64-2023-04-11-174952"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd2e1c6dccbf1bfda3653b83eb0d34c84662c74565f7e070bbfcddf9e21f10c3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c9ce8d0fd1ca92ccca5a4cad3466241595e621c5d85fa3c511a53d448e45f7e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff50d1404acb73df1971fe174067e00a77a4073daa2be37428e7573306bba0a6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a80d78e13a543dcacd826904cd1b882d093f60d7014d585b45212e0ec88aaa1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45262e0f012c6164200943a0505748103c23ae1559cc79fb404a6804e4a416c9",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1975f0114a0a5038bee615011e2c2e145dc1df230c7192f8e5ea0b04b0d43f17",
"ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5fc7b7bb89e52f3342e2d9aa8aebf65c887f818ae9b7cef635e11f374ddd85fa",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cc299ed655f2000dbea2c17bd9b510e0c3f9bef67bbc9a208cd6744e87f9464",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e035535d64ed631d7faa889f16dc3b2162d088ba48defe9cd0d44fda71863a91",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.13.0-0.nightly-2023-04-10-162321"
"base": "4.13.0-0.nightly-2023-04-11-144406"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd9969cec172266143b779e4fb7b4130ed89435bd95fb7682747aeae13065ee6",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dab7cbb4ec3c211fd6c109e5de9ed848d8b96b35a4622f019eb324fa12adeb4d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5965979168568e6f4b6a79d195c4002941be7e7a250f9510e8e05c1d1deb68eb",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:343f6fdc5a63b904ec329020977cbbfcce7035893e5a1cc37388d77f5e7e7a15",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1861b0afe90f7cd3efc8f9b0ba0b96095f033ed06625179efee2dfff852ddeb7",
"ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b92244914980565bc508f74702670b8bce69554d8055dad75dfd5f04a9fe5ea",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14b0e8a15e2f026df1562094d6e6a0e4bd38f2961a23e8fd745c07aad5bd3506",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9783ff266388df6423e07a28f90b8a98761624663dc73c3544b92be647570800",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
Expand Down
31 changes: 9 additions & 22 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
# cluster-network-operator embedded-component 14d77982b2de583913a2b8c0b885c32cfe6362ba to b7b90a5bef21ebe3c91362bb1415469197e0290b
f4e8c66cfaa70d3e998b89fbfbacd989096c90c9 2023-04-07T09:38:38-07:00 update 4.13 Dockerfile to use rhel-8 and go 1.19
e4572bb8ea38cdaccc7bb41b716750b6a390b838 2023-04-05T15:33:20+02:00 Fix tier label, privileged, HOSTNAME/NODENAME in whereabouts reconciler
c6256d0ba6cbcfc168fa3c0fbaae193a25c0b1d4 2023-04-05T15:33:13+02:00 Whereabouts should implement the reconciliation controller
# kubernetes embedded-component 7195e44fb36b487f275becffbf5828e2021f94d4 to 22308ca177342eb6820b95e0cad1142e385ef4c9
582c77525a5a6928e9164b389487b86496332c3e 2022-12-07T15:36:23+00:00 UPSTREAM: <carry>: Updating openshift-enterprise-pod images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/61541c1c730569d20db98c885bb07d7ee96e648c/images/openshift-enterprise-pod.yml
# machine-config-operator embedded-component 428c2e0655c6a5fc876dad8864a5451142b5c3e2 to cfe839676e53af8617e762467336d5992e39ebfe
398cefa6f4aaf70a8979b6361dc43a2f966e23e9 2023-04-03T14:13:13+00:00 daemon: write certificate in OnceFrom and HyperShift
# ovn-kubernetes image-amd64 159a714da138391477024d824fd56b5e65083000 to b0c2ab425330f587517e7aeee369883e509717ac
a7bf3cea3eeb674e1311c5cfbaab72c8d76c6af1 2023-04-04T10:30:40-04:00 Lint fix in policy.go
b016909f6bcb91bf5693e3d9c2396487fc79a91d 2023-04-04T10:20:48-04:00 Fix node_dpu_test
3f0ffd25ac2ae0f0f982068099cbecd42a03a68e 2023-04-04T10:20:37-04:00 Add e2e test for static pods
b8de796d434fddfef8d738429dbb80a938929d26 2023-04-04T10:20:25-04:00 Allow static pod creation
62b001a83cc2c376f8731500af872ce6f9353926 2023-04-04T10:20:15-04:00 Add Functions needed to check for static pod
# kubernetes image-amd64 7195e44fb36b487f275becffbf5828e2021f94d4 to 22308ca177342eb6820b95e0cad1142e385ef4c9
582c77525a5a6928e9164b389487b86496332c3e 2022-12-07T15:36:23+00:00 UPSTREAM: <carry>: Updating openshift-enterprise-pod images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/61541c1c730569d20db98c885bb07d7ee96e648c/images/openshift-enterprise-pod.yml
# ovn-kubernetes image-arm64 159a714da138391477024d824fd56b5e65083000 to b0c2ab425330f587517e7aeee369883e509717ac
a7bf3cea3eeb674e1311c5cfbaab72c8d76c6af1 2023-04-04T10:30:40-04:00 Lint fix in policy.go
b016909f6bcb91bf5693e3d9c2396487fc79a91d 2023-04-04T10:20:48-04:00 Fix node_dpu_test
3f0ffd25ac2ae0f0f982068099cbecd42a03a68e 2023-04-04T10:20:37-04:00 Add e2e test for static pods
b8de796d434fddfef8d738429dbb80a938929d26 2023-04-04T10:20:25-04:00 Allow static pod creation
62b001a83cc2c376f8731500af872ce6f9353926 2023-04-04T10:20:15-04:00 Add Functions needed to check for static pod
# machine-config-operator embedded-component cfe839676e53af8617e762467336d5992e39ebfe to 0318874b6243752bb0bd30f8e99bd03d19278b37
90b3d03d97a797a5468f16eb70e71cbfd0825381 2023-04-11T07:36:58+00:00 Accomodate ART limitation in parsing [[]] bash The downstream build pipeline parses bash in Dockerfile `RUN` commands in order to smooth over yum/dnf invocations that break downstream builds. For example, upstream Dockerfiles may use `--disablerepo` / `--enablerepo` / `microdnf` -- none of which will work as intended in brew/koji builds.
333d9389069e1d5c12c6fa0ce6304cf0086934dd 2023-04-06T19:41:10+00:00 OCPBUGS-10787: Persist static IP addressed NIC names from rhel8
# ovn-kubernetes image-amd64 b0c2ab425330f587517e7aeee369883e509717ac to c66883c01e06722319fdf18e9997231b6abda3aa
c52131126d9fb909dbe48c1c695a961d7308b11c 2023-04-05T21:15:08+00:00 CARRY: use "prefer local" for annotated services
# kube-rbac-proxy image-arm64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e to 11b1439d48a47a408ae7e2dd851989f7b7b4f595
d5860627135014563aa3d06de75f9a82c4ce2821 2022-12-07T09:27:19+00:00 Updating kube-rbac-proxy images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/61541c1c730569d20db98c885bb07d7ee96e648c/images/kube-rbac-proxy.yml
# ovn-kubernetes image-arm64 b0c2ab425330f587517e7aeee369883e509717ac to c66883c01e06722319fdf18e9997231b6abda3aa
c52131126d9fb909dbe48c1c695a961d7308b11c 2023-04-05T21:15:08+00:00 CARRY: use "prefer local" for annotated services
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 @@ -8,21 +8,21 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed
https://github.com/openshift/cluster-policy-controller embedded-component d02c85ab3203fe22eddcc4694e17504ef34935de
https://github.com/openshift/etcd embedded-component f70da9d78221bc3e6bf8ac14c0c4ecc106f4f57d
https://github.com/openshift/kubernetes embedded-component 22308ca177342eb6820b95e0cad1142e385ef4c9
https://github.com/openshift/machine-config-operator embedded-component cfe839676e53af8617e762467336d5992e39ebfe
https://github.com/openshift/machine-config-operator embedded-component 0318874b6243752bb0bd30f8e99bd03d19278b37
https://github.com/openshift/openshift-controller-manager embedded-component 87de83867ac51730f506138ee790a56ca21d9fc9
https://github.com/openshift/route-controller-manager embedded-component d7a8e22db412b6fabb7028ca0da8de8f3d9ac3c3
https://github.com/openshift/service-ca-operator embedded-component 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a
https://github.com/openshift/oc image-amd64 92b1a3d0e5d092430b523f6541aa0c504b2222b3
https://github.com/openshift/coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb
https://github.com/openshift/router image-amd64 e28644631982fb4596e065d3ae85099f0886829d
https://github.com/openshift/kube-rbac-proxy image-amd64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e
https://github.com/openshift/ovn-kubernetes image-amd64 b0c2ab425330f587517e7aeee369883e509717ac
https://github.com/openshift/ovn-kubernetes image-amd64 c66883c01e06722319fdf18e9997231b6abda3aa
https://github.com/openshift/kubernetes image-amd64 22308ca177342eb6820b95e0cad1142e385ef4c9
https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a
https://github.com/openshift/oc image-arm64 92b1a3d0e5d092430b523f6541aa0c504b2222b3
https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb
https://github.com/openshift/router image-arm64 e28644631982fb4596e065d3ae85099f0886829d
https://github.com/openshift/kube-rbac-proxy image-arm64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e
https://github.com/openshift/ovn-kubernetes image-arm64 b0c2ab425330f587517e7aeee369883e509717ac
https://github.com/openshift/kube-rbac-proxy image-arm64 11b1439d48a47a408ae7e2dd851989f7b7b4f595
https://github.com/openshift/ovn-kubernetes image-arm64 c66883c01e06722319fdf18e9997231b6abda3aa
https://github.com/openshift/kubernetes image-arm64 22308ca177342eb6820b95e0cad1142e385ef4c9
https://github.com/openshift/service-ca-operator image-arm64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a
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.13.0-0.nightly-2023-04-10-162321" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-04-10-150453" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-04-11-144406" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-04-11-174952" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"