Skip to content

NO-ISSUE: rebase-main-nightly_amd64-2026-04-16-172425_arm64-2026-04-16-232425 #6520

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 11 commits into from
Apr 20, 2026
Merged

NO-ISSUE: rebase-main-nightly_amd64-2026-04-16-172425_arm64-2026-04-16-232425 #6520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a11004e
update last_rebase.sh
pacevedom Apr 17, 2026
cfb7db4
update changelog
pacevedom Apr 17, 2026
2c7240c
update etcd/go.mod
pacevedom Apr 17, 2026
8e81d3d
update etcd/vendor
pacevedom Apr 17, 2026
392d376
update component images
pacevedom Apr 17, 2026
7225bc5
update manifests
pacevedom Apr 17, 2026
b8099d5
update buildfiles
pacevedom Apr 17, 2026
c781b76
Update rebase job entrypoing to use 5.0 image names
pacevedom Apr 17, 2026
5137c1b
Fix fake_next_minor to cross major versions
pacevedom Apr 17, 2026
a90bb7b
Adjust version checks on prerun
pacevedom Apr 17, 2026
5db15d4
Adjust cross-major versions in blueprints
pacevedom Apr 18, 2026
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.22.0-0.nightly-arm64-2026-04-02-213117
OCP_VERSION := 5.0.0-0.nightly-arm64-2026-04-16-232425
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.22.0-0.nightly-2026-04-01-223038
OCP_VERSION := 5.0.0-0.nightly-2026-04-16-172425
8 changes: 4 additions & 4 deletions assets/components/multus/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bfb904a68e228e2fc306f4b69646c3a733cff4c10e6fda7fe75df3174c818ae2
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:eb6b8347d088bebcf85a1cec86d78330fbd99dbdfef75cdaba2a5f28d9323a5d
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6ad7f1c820b2b007971c60cdcf85dff0f20bc2f2b3c8b1fe5226522322b2792d
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:464cca590482118bb8263385816d870b3143215b66ef4a109138f9e665f73da0
8 changes: 4 additions & 4 deletions assets/components/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6fc2898a173a8a6831fcf079c9b8afb66851d2fc066ada6285e9fdb176f5d1fe
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:ee8059698e26e4376215c0df71ed72e548e7334be4061272bd3ca6087533cb6c
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6650ccac2f542d305f2dbf1c607da0b4b514f08a6f80b787b11c0d7659195e74
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:10729eece790c49f196e44ad121dd632f6a5722b3c0a4c49c76e151983c1f71d
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-04-02-213117"
"base": "5.0.0-0.nightly-arm64-2026-04-16-232425"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfb904a68e228e2fc306f4b69646c3a733cff4c10e6fda7fe75df3174c818ae2",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ad7f1c820b2b007971c60cdcf85dff0f20bc2f2b3c8b1fe5226522322b2792d"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:eb6b8347d088bebcf85a1cec86d78330fbd99dbdfef75cdaba2a5f28d9323a5d",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:464cca590482118bb8263385816d870b3143215b66ef4a109138f9e665f73da0"
}
}
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-04-01-223038"
"base": "5.0.0-0.nightly-2026-04-16-172425"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fc2898a173a8a6831fcf079c9b8afb66851d2fc066ada6285e9fdb176f5d1fe",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6650ccac2f542d305f2dbf1c607da0b4b514f08a6f80b787b11c0d7659195e74"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ee8059698e26e4376215c0df71ed72e548e7334be4061272bd3ca6087533cb6c",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:10729eece790c49f196e44ad121dd632f6a5722b3c0a4c49c76e151983c1f71d"
}
}
16 changes: 16 additions & 0 deletions assets/components/service-ca/clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,19 @@ rules:
- get
- list
- watch
- apiGroups:
- config.openshift.io
resources:
- featuregates
verbs:
- get
- list
- watch
- apiGroups:
- config.openshift.io
resources:
- pkis
verbs:
- get
- list
- watch
2 changes: 2 additions & 0 deletions assets/components/service-ca/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ spec:
requests:
memory: 120Mi
cpu: 10m
env:
- name: OPERATOR_IMAGE_VERSION
terminationMessagePolicy: FallbackToLogsOnError
Comment on lines +40 to 42

@coderabbitai coderabbitai Bot Apr 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Find consumers of OPERATOR_IMAGE_VERSION in vendored service-ca-operator, and any templating of this env elsewhere in assets.
rg -nP -C2 '\bOPERATOR_IMAGE_VERSION\b'
fd -t f 'deployment.yaml' assets/components | xargs rg -nP -C2 'OPERATOR_IMAGE_VERSION|ReleaseImage'

Repository: openshift/microshift

Length of output: 3732

🏁 Script executed:

cat assets/components/service-ca/deployment.yaml

Repository: openshift/microshift

Length of output: 2146

🏁 Script executed:

rg -n 'ReleaseImage' assets/ -A 1 -B 1 | head -50

Repository: openshift/microshift

Length of output: 3792

🏁 Script executed:

rg -n 'service_ca_operator' assets/ -A 2 -B 2

Repository: openshift/microshift

Length of output: 515

🏁 Script executed:

rg -n 'OPERATOR_IMAGE_VERSION' --type yaml assets/

Repository: openshift/microshift

Length of output: 250

🏁 Script executed:

find . -name "*.go" -o -name "*.py" | xargs rg -l 'OPERATOR_IMAGE_VERSION' 2>/dev/null | head -5

Repository: openshift/microshift

Length of output: 46

OPERATOR_IMAGE_VERSION env var has no value (or valueFrom)—resolves to empty string at runtime.

This is missing a value assignment. Compare to cert-manager/manager.yaml, which sets this to 1.18.1. If the operator consumes this variable, an empty string will likely cause issues (blank version metadata or operand misbehavior).

The suggested template field {{ .ReleaseImage.service_ca_operator_version }} does not exist in the codebase. Either:

  • Drop the env entry entirely if unused, or
  • Provide the correct value source (hardcoded, templated, or from release payload)
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@assets/components/service-ca/deployment.yaml` around lines 40 - 42, The env
entry OPERATOR_IMAGE_VERSION is declared without a value and will be empty at
runtime; either remove this env var if it's unused or set a concrete source—add
a value: "1.18.1" (or the correct operator version) or a valueFrom that
references the release payload/Helm value used by your charts (e.g., replace the
nonexistent {{ .ReleaseImage.service_ca_operator_version }} with the correct
template key like a .Values or other release variable); update the Deployment
spec where OPERATOR_IMAGE_VERSION is set so the operator receives a non-empty
value.

volumeMounts:
- mountPath: /var/run/secrets/signing-key
Expand Down
16 changes: 8 additions & 8 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@

images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ff87b8ca01872de4f6fddf890f0e7a243b179376f200567300b1c2c1918e5402
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:4a1ea3c63005636dbb62b68219c1059bccd2c6b60d59074dbf3356da7f0376b5
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:00f42ea149e7b5ab62b08da79da65bcd7e0785442bd5ee0314b924fbeb0df975
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:5c51341a1d1721b79d168547f301260d7c907f24268a9677f40c2dc4b759abba
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b2a0c592a6105fcba0299bcebf9c6079015f533bc2ebb8791e7953b26861c788
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:d4cb8ac0d9bd423f6f21c4746492568dae7514c7f4a6a38c02a400bc84a330d1

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00f42ea149e7b5ab62b08da79da65bcd7e0785442bd5ee0314b924fbeb0df975
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5c51341a1d1721b79d168547f301260d7c907f24268a9677f40c2dc4b759abba
- 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:ff87b8ca01872de4f6fddf890f0e7a243b179376f200567300b1c2c1918e5402
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4a1ea3c63005636dbb62b68219c1059bccd2c6b60d59074dbf3356da7f0376b5
target:
kind: Deployment
labelSelector: app=catalog-operator
16 changes: 8 additions & 8 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
@@ -1,27 +1,27 @@

images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:d0356b881554c2579ab4eabcd2433c0ec548df35766f03f0d03a87204742b8d2
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:3486df8d22a1d6da876f336fb0834b5b821d6755a74326902d441b694952412b
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fdf853cfa6b7b84c9b009bb3b81e4a896e97df95d9ea3657d0851a855311b2d8
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:697a6935830840e75e281f717c0a6d201fa2e8a4c1dbeaff2dfb2ea0ef7a5522
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:57a72fc145d1d8c46ea65ed851c48c96c3b3b3e7775a7ddddb1f7463ba4a3743
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:99226d69076922896e9ff9e8e46542baa477bf833d90775140f3128b18ce9e5b

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdf853cfa6b7b84c9b009bb3b81e4a896e97df95d9ea3657d0851a855311b2d8
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:697a6935830840e75e281f717c0a6d201fa2e8a4c1dbeaff2dfb2ea0ef7a5522
- 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:d0356b881554c2579ab4eabcd2433c0ec548df35766f03f0d03a87204742b8d2
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3486df8d22a1d6da876f336fb0834b5b821d6755a74326902d441b694952412b
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 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.22.0-0.nightly-arm64-2026-04-02-213117"
"base": "5.0.0-0.nightly-arm64-2026-04-16-232425"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff87b8ca01872de4f6fddf890f0e7a243b179376f200567300b1c2c1918e5402",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00f42ea149e7b5ab62b08da79da65bcd7e0785442bd5ee0314b924fbeb0df975",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2a0c592a6105fcba0299bcebf9c6079015f533bc2ebb8791e7953b26861c788"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4a1ea3c63005636dbb62b68219c1059bccd2c6b60d59074dbf3356da7f0376b5",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5c51341a1d1721b79d168547f301260d7c907f24268a9677f40c2dc4b759abba",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d4cb8ac0d9bd423f6f21c4746492568dae7514c7f4a6a38c02a400bc84a330d1"
}
}
8 changes: 4 additions & 4 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.22.0-0.nightly-2026-04-01-223038"
"base": "5.0.0-0.nightly-2026-04-16-172425"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0356b881554c2579ab4eabcd2433c0ec548df35766f03f0d03a87204742b8d2",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdf853cfa6b7b84c9b009bb3b81e4a896e97df95d9ea3657d0851a855311b2d8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57a72fc145d1d8c46ea65ed851c48c96c3b3b3e7775a7ddddb1f7463ba4a3743"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3486df8d22a1d6da876f336fb0834b5b821d6755a74326902d441b694952412b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:697a6935830840e75e281f717c0a6d201fa2e8a4c1dbeaff2dfb2ea0ef7a5522",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:99226d69076922896e9ff9e8e46542baa477bf833d90775140f3128b18ce9e5b"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-04-02-213117"
"base": "5.0.0-0.nightly-arm64-2026-04-16-232425"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:835082ac6f84153d7db69efe76862e92c29fd251803be928209e98f187c1bc8d",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7abb8320c380cfc7d75599f01e96907d1b9562a1be4a5e800c25b62de24eff62",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdb988f8075078798dc00de52f75d4b9c7aa9d80ffdd202fd7476a5de7430c91",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2a0c592a6105fcba0299bcebf9c6079015f533bc2ebb8791e7953b26861c788",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef9cad701c4c04fc7677bce9bdae0f39609f5c3578feb97c95c4ea0d5d9b8573",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0eee7f97711c71d3a4c559c0063d9752ccddc563e196b6a876a5184402495a86",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:433aa7050a25cf8eacbca42a490c715334f42ddb8c894036dfb3bed430a3a92e",
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c8de3e103b12e4521076a7056d65f9becfa015894a27576ad2582d9200a5849f",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:307ddfbdb0e221839c71c02a38484fd6f7c6f8efa5d162b968fa224f73a1855b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:77512153a5706d12001f4e4615a9df9ee97f3715d7fd66ad3356ca6bf62ae69b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d4cb8ac0d9bd423f6f21c4746492568dae7514c7f4a6a38c02a400bc84a330d1",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9760316816f8a91e97f447dec17f6484dad15513cdced87cc57648fca9687402",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:daa4e16c74261dfef83e76f804a6d46447d2ebf134267c663570566797c5e02a",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:27859086f1689e5dc15dd90aa6a32bcfa472bedc91e24b41d0725e78402b6552",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc954461f464bb9a26fbfa41aa3f9275d382fe0e529185827b829f5e1b075eb5"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:49de8598fb75c91e8a1dd1d2b2db58c58eb2f2f2ea8e50bdd8d5a7068d4b1158"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-04-01-223038"
"base": "5.0.0-0.nightly-2026-04-16-172425"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04f7a852610d92a3c751cc9a1d095349498027ab01199d177bf798b116fd1d8b",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7386c18b14ce499057b6cf9494d48ec02fe0f13474767306ff78f443c90d1450",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56078e74606f8111c021a599acae8779c787a6803bebba40b3b8c36b5a5469a6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57a72fc145d1d8c46ea65ed851c48c96c3b3b3e7775a7ddddb1f7463ba4a3743",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a57fe2d1c81778088dacc9992dc54a5c37df54904384a83285a23b1a4c654a5",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e33f10b68b3d6e40f059734d7943d995c792c79d2ca64d31f3d15f7e9d8ce807",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fcebe23dec478754c6d867eea754a7319d7f6919ee95cea8f47561ac6ecbf24",
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b41de1f2cd52ef59125223e3f563826e372593cae70ebdf7bae35e8b2a3b98b2",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b6c13ac7d813b23a2ef28f4005da58f1161eeee35fd12b8a272f6d1888267f99",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:905a1225d64d35b7e10236cc2de46341049efaf40d385e5376ecb23de64c777f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:99226d69076922896e9ff9e8e46542baa477bf833d90775140f3128b18ce9e5b",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:21fad56affa5aa8925f9eba4e9d656d00b1720127bc5915b0c2e8b96ffb72cf2",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b2c4aba5b37248adf70a343d02ba3a89fcf2a002e94f2f4b6f9892acb0008c56",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ec1502a640fb930fa3cc69e6de6031d75fbbedaa43868aa5c1f0611652d8b99e",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fbb958e9953a5af8bc2a8b93e5351559df3b22663e5578bcaae69d5863020cc8"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b94c727235d7529524a94382a9b77e974d850e67fb5b53e193755e7f6950c2d5"
}
}
2 changes: 1 addition & 1 deletion etcd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.25.0
replace github.com/openshift/microshift => ../

require (
github.com/openshift/api v0.0.0-20260402091533-d0af9d722390
github.com/openshift/api v0.0.0-20260416215613-f9587f6e7c60
github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af
github.com/openshift/microshift v0.0.0-00010101000000-000000000000
github.com/spf13/cobra v1.10.2
Expand Down
4 changes: 2 additions & 2 deletions etcd/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ github.com/oklog/run v1.2.0 h1:O8x3yXwah4A73hJdlrwo/2X6J62gE5qTMusH0dvz60E=
github.com/oklog/run v1.2.0/go.mod h1:mgDbKRSwPhJfesJ4PntqFUbKQRZ50NgmZTSPlFA0YFk=
github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
github.com/openshift/api v0.0.0-20260402091533-d0af9d722390 h1:tzmI6HyEB/2gQu3NEo/qzFsy2IMyuYaSy64Sg8vv5UI=
github.com/openshift/api v0.0.0-20260402091533-d0af9d722390/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
github.com/openshift/api v0.0.0-20260416215613-f9587f6e7c60 h1:/BT4yqpRo6O21GkacqhE7opGGjPvYOjfzecNggZq0QQ=
github.com/openshift/api v0.0.0-20260416215613-f9587f6e7c60/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af h1:UiYYMi/CCV+kwWrXuXfuUSOY2yNXOpWpNVgHc6aLQlE=
github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260312150232-d8d67b8ce849 h1:em2blvFukNrVPlEZuMA1rHioi0eFjSk5qvV/Yp02HxQ=
Expand Down
2 changes: 1 addition & 1 deletion etcd/vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ github.com/munnerz/goautoneg
# github.com/oklog/run v1.2.0
## explicit; go 1.20
github.com/oklog/run
# github.com/openshift/api v0.0.0-20260402091533-d0af9d722390
# github.com/openshift/api v0.0.0-20260416215613-f9587f6e7c60
## explicit; go 1.25.0
github.com/openshift/api/config/v1
github.com/openshift/api/operator/v1
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_amd64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# 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:e33f10b68b3d6e40f059734d7943d995c792c79d2ca64d31f3d15f7e9d8ce807"
pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b2c4aba5b37248adf70a343d02ba3a89fcf2a002e94f2f4b6f9892acb0008c56"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# 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:0eee7f97711c71d3a4c559c0063d9752ccddc563e196b6a876a5184402495a86"
pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:daa4e16c74261dfef83e76f804a6d46447d2ebf134267c663570566797c5e02a"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
Loading