Skip to content
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.

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

rebase-4.13.0-0.nightly-2023-03-17-161027_amd64-2023-03-17_arm64-2023-03-19 #1531

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.13.0-0.nightly-arm64-2023-03-14-173645"
"base": "4.13.0-0.nightly-arm64-2023-03-19-052247"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae6c33506ce9d8774313aa43f2d51081b2d72c8d2954669e609b5a8efe09df1b",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a25edfcdcfb5169694c9e9f4c32e32133edcea185e63ff16018a710d546d750",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7e855f833595e8871b140b2b02ec51bf553c2186615b095f2caf34bfec99fc6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f67aabd2c69a990bcf8ff6565b615ef5c519bedd6ad3f74784bd2ce126cb0540",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:445670bcaf530b0608f2ebba64ec716b1d84840d43149576b68980a689412bc2",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec2a9cb239bbce0ff1bb58e4bbfca7fc86744a63b454509923e6ee5532f61cae",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:648e659a4fb921feb87712e29ffb8b291c51da5b13028b2b492a13066e894492",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11085faadac204f2eab74f84ca956581a689cf0543ac8f17ad366b941fa19c57",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad6a1b1a01f928dad3ed9b1d1288c4d5e665868c1713ca54c64ff21ebe4fb8ca",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce7b69828d3928ff464a8c0decfbf668d4ac3d6cc932ed67867c7b2c2d4c5b53",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dd1449567b0a39e4dd99868caba37a61e212f1865df45538a2030001d9c3ac2",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b163fc8ae8e729728ab08fae22245dc16c88c624afdd96b7cc6623bbb4a8b5f8",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8feb18d7423f4fc6f01203d7fe7c5652324f2b1ec673a3f47b612248ef4977be",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.13.0-0.nightly-2023-03-14-053612"
"base": "4.13.0-0.nightly-2023-03-17-161027"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2448f5c3de0d96379a8a496adf09a8521e4a117b027b823b25eaff31d922984",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cff27b32ff02730a4cdc513ff5641d3c3b632a0af37a21594dd7314beb95dc41",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42bcf8599fe7e55a2fb01cc6009007143619a507fb9e587e1568791cc4a5c8db",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce5e10eef4461c3717d9e0283cb04d592dfa1dcff3f9c27ca71ac908b967a0ea",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:017a208e4b613bd3085a0504a8494eb60763af28ed9906a94affdb884b54a04e",
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/microshift_arm64.conf
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:ce7b69828d3928ff464a8c0decfbf668d4ac3d6cc932ed67867c7b2c2d4c5b53"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b163fc8ae8e729728ab08fae22245dc16c88c624afdd96b7cc6623bbb4a8b5f8"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
13 changes: 13 additions & 0 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# cluster-network-operator embedded-component c0208114e49b3ee34bb073ea7d09cf82273573b0 to a7ff73ab336c8b3ed8467f14bbcd5657ff08d9cf
53d3972e5e287c3d4eabbbb8485324f72ceddb4f 2023-03-10T13:05:19+00:00 HyperShift: Set priority class for CNCC
7f983c90f1f9a1c2259bc41503c443b62dc5b10c 2023-03-10T13:05:19+00:00 HyperShift: Adapt affinity and tolerations
1756b472710f9a53e6669ae4923246c267c63d98 2023-03-10T13:05:19+00:00 HyperShift: Co-locate CNCC and multus admission controller with other hcp pods
fa7c5559546a8a3434c41a7be945dbfcd5de10f6 2023-03-09T15:24:09+01:00 Set healthz-bind-address to 0.0.0.0:10256 for ovnk
ea081581bf467c22faeb9f178cab66c551fad588 2023-03-09T15:24:08+01:00 Pass POD_NAME to ovnkube node for node healthz server checks
fa545fad09bd9d8fbc447fd7a6759c96c12d5390 2023-03-03T14:26:59+00:00 OVN-K alerts: add OVS overflow alerts
# machine-config-operator embedded-component 02d35277a879c72f48e63c31f36072376c7e2598 to 6c040c7be4b1459a0cd0db114e1aaa078943d487
f9f358260da206bf27d4c6579bcab3ec93a4875f 2023-03-14T02:28:32+00:00 Remove hard requirement for the afterburn from early-running aws-related services
# oc image-amd64 02362102a19e81ebecb90906f41687e4e4350dfe to eed143055ede731029931ad204b19cd2f565ef1a
c3d6a7830ec95b4cf8dc413c15b57d0c5176e3ca 2023-03-16T06:25:04+00:00 Add microshift into generate-docs
# oc image-arm64 02362102a19e81ebecb90906f41687e4e4350dfe to eed143055ede731029931ad204b19cd2f565ef1a
c3d6a7830ec95b4cf8dc413c15b57d0c5176e3ca 2023-03-16T06:25:04+00:00 Add microshift into generate-docs
8 changes: 4 additions & 4 deletions scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 6aa482c
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 5cec361179f3658986890a87d0b51f40a1da89ad
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 4ca346ef97def3697f1aa0368c9b35459b9b2f59
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component d3978864fb58063235be176c18fe50457b5223f3
https://github.com/openshift/cluster-network-operator embedded-component c0208114e49b3ee34bb073ea7d09cf82273573b0
https://github.com/openshift/cluster-network-operator embedded-component a7ff73ab336c8b3ed8467f14bbcd5657ff08d9cf
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 7867c26e6c91e2cc279317dfc080befe63a60749
https://github.com/openshift/cluster-policy-controller embedded-component ac01e3463245f2dd9312145368d7f4099a8a0bb9
https://github.com/openshift/etcd embedded-component 13c18c444a8c6a86ccbba16cce664008f5f948bd
https://github.com/openshift/kubernetes embedded-component 06e8c46c9f0d3f6bfcd1e146c09647e4b634e4eb
https://github.com/openshift/machine-config-operator embedded-component 02d35277a879c72f48e63c31f36072376c7e2598
https://github.com/openshift/machine-config-operator embedded-component 6c040c7be4b1459a0cd0db114e1aaa078943d487
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 02362102a19e81ebecb90906f41687e4e4350dfe
https://github.com/openshift/oc image-amd64 eed143055ede731029931ad204b19cd2f565ef1a
https://github.com/openshift/coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb
https://github.com/openshift/router image-amd64 69eda4bd427c3f27d9993afa35461f4fc1dc0357
https://github.com/openshift/kube-rbac-proxy image-amd64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e
https://github.com/openshift/kubernetes image-amd64 06e8c46c9f0d3f6bfcd1e146c09647e4b634e4eb
https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a
https://github.com/openshift/oc image-arm64 02362102a19e81ebecb90906f41687e4e4350dfe
https://github.com/openshift/oc image-arm64 eed143055ede731029931ad204b19cd2f565ef1a
https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb
https://github.com/openshift/router image-arm64 69eda4bd427c3f27d9993afa35461f4fc1dc0357
https://github.com/openshift/kube-rbac-proxy image-arm64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
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-03-14-053612" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-14-173645" "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-03-17-161027" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-03-19-052247" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"