Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-07-16-110135_amd64-2025-07-16_arm64-2025-07-16 #5208

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-bot merged 4 commits into from
Jul 17, 2025
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-07-16-110135_amd64-2025-07-16_arm64-2025-07-16 #5208

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
cb8b904
update last_rebase.sh
Jul 17, 2025
1c3caa8
update changelog
Jul 17, 2025
0a2dba7
update manifests
Jul 17, 2025
e5437b2
update buildfiles
Jul 17, 2025
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.18.0-0.nightly-arm64-2025-07-11-011909
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-07-16-110136
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.18.0-0.nightly-2025-07-10-031259
OCP_VERSION := 4.18.0-0.nightly-2025-07-16-110135
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2025-07-11-011909"
"base": "4.18.0-0.nightly-arm64-2025-07-16-110136"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be84e3b6e852ead249e5e2408e117e524c0e79c0d3cfe43c76990c6fdba08b99",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-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.18.0-0.nightly-2025-07-10-031259"
"base": "4.18.0-0.nightly-2025-07-16-110135"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1109090ebe36287360064786279731940b4f398193da21a16dddbb22663bf8dd",
Expand Down
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:31c46fb9f416b264926b5ea213b71864706a973b760fa3fac017da5a551b3158
digest: sha256:a2b39a55fe232526ddf8b198a22473ad2c98c0a3324d70be1aff88631e19c8dd
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f53347d85880008747c5496e7a7e96332fe25c1155874382e47d0bfcc300fea1
digest: sha256:d3c6b7fb5559921916f1c96bb270a674d74e83dd611eb3f988972f944dbc5f0b
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f71eda011790ef0bbed4964f56f9ca81f03d47ff5e14910f36ba4500b11de81c
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:f53347d85880008747c5496e7a7e96332fe25c1155874382e47d0bfcc300fea1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3c6b7fb5559921916f1c96bb270a674d74e83dd611eb3f988972f944dbc5f0b
- 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:31c46fb9f416b264926b5ea213b71864706a973b760fa3fac017da5a551b3158
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2b39a55fe232526ddf8b198a22473ad2c98c0a3324d70be1aff88631e19c8dd
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.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:5e52c45aa095beebcd5f0ab905b89b389c51d31545179291e9c6c3b7bd9f8fdf
digest: sha256:a49b803304335df42a37f96db613c36ff7b42681fb3b34db39fb63b73b5762ad
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:cdc47067fbe7768e72121b118663cc05413163f34f1ca450212165829d12c77e
digest: sha256:486b1aec8363ccd356f6828847154d5229a14e0fbe96793b0f946dad6d746ada
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ecf83d82182b1a9754af5df44df2f4945e413cf583c9ebbbad63f9bc47e2e8cd
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:cdc47067fbe7768e72121b118663cc05413163f34f1ca450212165829d12c77e
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:486b1aec8363ccd356f6828847154d5229a14e0fbe96793b0f946dad6d746ada
- 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:5e52c45aa095beebcd5f0ab905b89b389c51d31545179291e9c6c3b7bd9f8fdf
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a49b803304335df42a37f96db613c36ff7b42681fb3b34db39fb63b73b5762ad
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2025-07-11-011909"
"base": "4.18.0-0.nightly-arm64-2025-07-16-110136"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31c46fb9f416b264926b5ea213b71864706a973b760fa3fac017da5a551b3158",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f53347d85880008747c5496e7a7e96332fe25c1155874382e47d0bfcc300fea1",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2b39a55fe232526ddf8b198a22473ad2c98c0a3324d70be1aff88631e19c8dd",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3c6b7fb5559921916f1c96bb270a674d74e83dd611eb3f988972f944dbc5f0b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f71eda011790ef0bbed4964f56f9ca81f03d47ff5e14910f36ba4500b11de81c"
}
}
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.18.0-0.nightly-2025-07-10-031259"
"base": "4.18.0-0.nightly-2025-07-16-110135"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e52c45aa095beebcd5f0ab905b89b389c51d31545179291e9c6c3b7bd9f8fdf",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdc47067fbe7768e72121b118663cc05413163f34f1ca450212165829d12c77e",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a49b803304335df42a37f96db613c36ff7b42681fb3b34db39fb63b73b5762ad",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:486b1aec8363ccd356f6828847154d5229a14e0fbe96793b0f946dad6d746ada",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ecf83d82182b1a9754af5df44df2f4945e413cf583c9ebbbad63f9bc47e2e8cd"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2025-07-11-011909"
"base": "4.18.0-0.nightly-arm64-2025-07-16-110136"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fa090dc85d7f26ed0b94005ae3bb0c251218f18f62228e11b58aaeba524eabd1",
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.18.0-0.nightly-2025-07-10-031259"
"base": "4.18.0-0.nightly-2025-07-16-110135"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5fc3350e849c149da779fd20a44c9b1e4a3fbf54d570853c688ec2d73b151d20",
Expand Down
Loading