Skip to content

NO-ISSUE: rebase-main-4.15.0-0.nightly-2023-12-04-223539_amd64-2023-12-04_arm64-2023-12-07 #2693

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

Closed
microshift-rebase-script wants to merge 5 commits into from
Closed

NO-ISSUE: rebase-main-4.15.0-0.nightly-2023-12-04-223539_amd64-2023-12-04_arm64-2023-12-07 #2693

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
646d206
update last_rebase.sh
Dec 7, 2023
f277a92
update changelog
Dec 7, 2023
707b967
update component images
Dec 7, 2023
a738a66
update manifests
Dec 7, 2023
5f265d4
update buildfiles
Dec 7, 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.15.0-0.nightly-arm64-2023-12-04-194438
OCP_VERSION := 4.15.0-0.nightly-arm64-2023-12-07-013635
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.15.0-0.nightly-2023-12-04-162702
OCP_VERSION := 4.15.0-0.nightly-2023-12-04-223539
8 changes: 4 additions & 4 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,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:860b34cda20ef2c8ac443c86607ca9f0c292c77e74f4dbe500c2a932fd6621f0
digest: sha256:b6bdd37db07396e9865d2e5b3ff30dbc6c7d1d610148a67588a62b10017b7c4c
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3caa3672ecf4c9bf67a7a869a776b8cf7aee4a02f1eb577e6eed7b24d993d77d
digest: sha256:dda2e20cdfe15af30cc68d24ea88b09445c149ce49e980b04462088b181633c0
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:910caa30c51db336ebcc5958f5be40e7907deaa0ff18b6777bc15b62eb7f8456
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3caa3672ecf4c9bf67a7a869a776b8cf7aee4a02f1eb577e6eed7b24d993d77d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dda2e20cdfe15af30cc68d24ea88b09445c149ce49e980b04462088b181633c0
- 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:860b34cda20ef2c8ac443c86607ca9f0c292c77e74f4dbe500c2a932fd6621f0
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6bdd37db07396e9865d2e5b3ff30dbc6c7d1d610148a67588a62b10017b7c4c
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2023-12-04-194438"
"base": "4.15.0-0.nightly-arm64-2023-12-07-013635"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:860b34cda20ef2c8ac443c86607ca9f0c292c77e74f4dbe500c2a932fd6621f0",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3caa3672ecf4c9bf67a7a869a776b8cf7aee4a02f1eb577e6eed7b24d993d77d",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6bdd37db07396e9865d2e5b3ff30dbc6c7d1d610148a67588a62b10017b7c4c",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dda2e20cdfe15af30cc68d24ea88b09445c149ce49e980b04462088b181633c0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:910caa30c51db336ebcc5958f5be40e7907deaa0ff18b6777bc15b62eb7f8456"
}
}
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-2023-12-04-162702"
"base": "4.15.0-0.nightly-2023-12-04-223539"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bae1e174c72a19628090f8d2d90c5070b526f21c808482b9bddcad31ad53285",
Expand Down
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,15 +1,15 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2023-12-04-194438"
"base": "4.15.0-0.nightly-arm64-2023-12-07-013635"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:122e6b454985904e4d8a976dd06211f5a253c8e3ae20c7460a89675a1e15481a",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73f0d348bf1f7ba1d8a14cedd818f50468eb1143c00acc131084b492d2c568c4",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:404a31047200cb42ad683bd76888a5c326eb7efcba1ea5f7fe7fa394962c505b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff837e374c3d07035785b5b5b595a95c443d3105c2da567ab5c84097ace0b60c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:910caa30c51db336ebcc5958f5be40e7907deaa0ff18b6777bc15b62eb7f8456",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e462f12247ce1dbe547f2cae577e1e7c33aa83194c771f22ac9264f0c03498e1",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd4e1103dbea81c27fa4a3507c2d65e64621454ba132250da4a0730676d93faa",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bdfb1bd39d1d0979f52dd6950beeac29bf5b18a12fd9f7f7410f8e3e69640a2",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:582a7455ddb64a1f4d9fa6eab33d551c4f459f55b244c48e7fe774b2a8f1b777",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-2023-12-04-162702"
"base": "4.15.0-0.nightly-2023-12-04-223539"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06363e3b16931bae248f856cb803fa60e74dc290a9eb9246d08992aa3cc6391e",
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:fd4e1103dbea81c27fa4a3507c2d65e64621454ba132250da4a0730676d93faa"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bdfb1bd39d1d0979f52dd6950beeac29bf5b18a12fd9f7f7410f8e3e69640a2"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
Loading