Skip to content
Merged
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.14.0-0.nightly-arm64-2023-03-30-083323"
"base": "4.14.0-0.nightly-arm64-2023-04-05-165512"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e0a06b56633d3bdf5fa82e7376674180d1333151b7177726dac451a5cff60217",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db6ef9b02d061297a06a1a4dc262f3239c0ccd66c90785c5d47b80f634388484",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c8e3dc0cc066af4e2ff949495c2806053c9767fec31f22659aec870eca608fc",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:092859805f8869ed5412124a8aa8c41489ef8060c6bc84b2477488cc8a6fc0ef",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e713e51b0277b98e27e79c04e895eaae26e1e9ab331eb096243bf024fd4b0660",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:856a6840bf81539d966d10289a4809ef050389136d4cfb3b2c0b8cacbb0efe87",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0fcaff5e758f3217b54c4d220692f7428babfaa766153549e9be687f347ebde2",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:955c6a5087d6c845c224af527fa04e26da6ad9f98f0ac84027251ab9642dfdbc",
"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:ad6a1b1a01f928dad3ed9b1d1288c4d5e665868c1713ca54c64ff21ebe4fb8ca",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8c998fd87893faeb970a1bc1c8f85ae66eeb94965626fd6854ff369533d81dc",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2c845173d9e7128fabe5c34ff07a43f5aff1370dbe824980306275f2e34e04e",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db77498f062c865577bf2debf0b062255275af6cbf07708f28d2361d6ab05a42",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c53d3cf91fda236d104a6ba39559f4494a68866e08300722fa0099c9607fdfa",
"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
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:e8c998fd87893faeb970a1bc1c8f85ae66eeb94965626fd6854ff369533d81dc"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db77498f062c865577bf2debf0b062255275af6cbf07708f28d2361d6ab05a42"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
15 changes: 11 additions & 4 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
- machine-config-operator embedded-component 60de0ad4be10a7fa84305dc1fe1ad53223d700af to 4acaaded2422e859d9f500f45a1b39f7e6d60600
- 10e17d65 2023-03-31T15:03:38-04:00 daemon: write certificate in OnceFrom and HyperShift

- oc image-amd64 2727f37143ee46259ddd0d569d9bf42926291433 to c6df0e998fd1fd1c54586e5b6e9e366a91916f20
- oc image-arm64 bb3e40f7518e6955e9f7e77d86990bdbe6b117cb to c6df0e998fd1fd1c54586e5b6e9e366a91916f20
- 03056a3 2023-03-22T20:12:51-04:00 IR-301: generates ImageStreamTags with import-mode when using oc new-build
- cace2b4 2023-03-22T20:12:51-04:00 IR-300: enhances oc new-app with ImageRegistry ImportMode
- ddf90d3 2023-03-13T15:16:21+00:00 Updating ose-tools images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7ce51feaf65258715109cad8d18b1bd0db0fbb2e/images/ose-tools.yml
- 323f313 2023-03-06T07:59:59-08:00 append: expose keep-manifest-list option and preserve manifestlist when appending to specific arch images
- a2a49c1 2023-02-28T13:11:08-08:00 pkg/cli/admin/upgrade: Client-side checks for --to-multi-arch

- coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb to 5af9cd2d70adaf8f4a7346879dbd593934ad3cc0
- 20fb775 2023-03-09T20:06:18+00:00 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml

- kubernetes image-arm64 54b552033300ab1f94ddf8a9d16032e6619556da to ff8ecbc24c150ec5bd0669ce6644d1c7046f636e
- f27d453cb 2023-04-03T13:56:19+02:00 UPSTREAM: <drop>: bump: apiserver-lib-go for fixed SCC admission
- c25f8d98c 2023-04-03T13:56:05+02:00 UPSTREAM: <carry>: SCC pod extractor: assume default SA if SA is empty

6 changes: 3 additions & 3 deletions scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ https://github.com/openshift/router image-amd64 d35eab518fb332b19a75a51a92c19971
https://github.com/openshift/kube-rbac-proxy image-amd64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e
https://github.com/openshift/kubernetes image-amd64 54b552033300ab1f94ddf8a9d16032e6619556da
https://github.com/openshift/service-ca-operator image-amd64 8f1e2fabfc0ded40557cdb7f6f2894020c465e8c
https://github.com/openshift/oc image-arm64 bb3e40f7518e6955e9f7e77d86990bdbe6b117cb
https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb
https://github.com/openshift/oc image-arm64 c6df0e998fd1fd1c54586e5b6e9e366a91916f20
https://github.com/openshift/coredns image-arm64 5af9cd2d70adaf8f4a7346879dbd593934ad3cc0
https://github.com/openshift/router image-arm64 d35eab518fb332b19a75a51a92c19971e61e4f20
https://github.com/openshift/kube-rbac-proxy image-arm64 0aa2830ed7359fd8cd0e2f7db0ed96a733c5990e
https://github.com/openshift/kubernetes image-arm64 54b552033300ab1f94ddf8a9d16032e6619556da
https://github.com/openshift/kubernetes image-arm64 ff8ecbc24c150ec5bd0669ce6644d1c7046f636e
https://github.com/openshift/service-ca-operator image-arm64 8f1e2fabfc0ded40557cdb7f6f2894020c465e8c
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.14.0-0.nightly-2023-04-03-211601" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-03-30-083323" "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-04-03-211601" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-04-05-165512" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"