Skip to content

NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-03-05-070435_amd64-2026-03-05_arm64-2026-03-06 #6317

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 8 commits into from
Closed

NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-03-05-070435_amd64-2026-03-05_arm64-2026-03-06 #6317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
91ea225
update last_rebase.sh
Mar 6, 2026
bbf256d
update changelog
Mar 6, 2026
31063b9
update microshift/go.mod
Mar 6, 2026
4fa42a3
update microshift/vendor
Mar 6, 2026
5dfb428
update etcd/vendor
Mar 6, 2026
dd5a1c6
update component images
Mar 6, 2026
47d46f5
update manifests
Mar 6, 2026
9b9db16
update buildfiles
Mar 6, 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-03-05-024021
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-03-06-030256
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-03-02-153725
OCP_VERSION := 4.22.0-0.nightly-2026-03-05-070435
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:709d3f3d6e6a49fabacefd96ed468ad973ae0f5da1f1b61b5140bea099e7a725
digest: sha256:29238ab465cb0f5796cf44271bbfee9b33f06db286c00110dc9e65097a878b9f
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fef5e57ea4cbccaf400b4df0c2429f1b6ba00707acb593b6c58e719cb19c5132
digest: sha256:6fe248247385085b35dfc68c0d427325062785c884ac956711b08417ade062e5
2 changes: 1 addition & 1 deletion assets/components/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.22.0-0.nightly-arm64-2026-03-05-024021"
"base": "4.22.0-0.nightly-arm64-2026-03-06-030256"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:067b86d045349126085a17e0d067719a8050fe99f968d49f28cb8d677641f4bc",
Expand Down
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-03-02-153725"
"base": "4.22.0-0.nightly-2026-03-05-070435"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:709d3f3d6e6a49fabacefd96ed468ad973ae0f5da1f1b61b5140bea099e7a725",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fef5e57ea4cbccaf400b4df0c2429f1b6ba00707acb593b6c58e719cb19c5132"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29238ab465cb0f5796cf44271bbfee9b33f06db286c00110dc9e65097a878b9f",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fe248247385085b35dfc68c0d427325062785c884ac956711b08417ade062e5"
}
}
10 changes: 5 additions & 5 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,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6ae79da6531bf3b60092e0d20de14251bf11530c0339c6c2b616f79584867f26
digest: sha256:8f1610403468c8a26c104177a18275c14bdfe82f9f075a81b899edd5d2e0d91d
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:c29ea5cb6e084b49b115f1c26c7967090d009e39e68f905841c95415abc40007
digest: sha256:3a64fb2be9f64229ad14b6fa028d57c7782724adb06b4a9b282a9591630d282e
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:957bb71c53f9f45a46cd471fe6ece04fe0adf65a489a5cf36c20d7941cb3bfe6
digest: sha256:d0c76b89772bac508b693aabe733e57c6c401d6fe58411b2384ff84b2e53d2d0

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:c29ea5cb6e084b49b115f1c26c7967090d009e39e68f905841c95415abc40007
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a64fb2be9f64229ad14b6fa028d57c7782724adb06b4a9b282a9591630d282e
- 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:6ae79da6531bf3b60092e0d20de14251bf11530c0339c6c2b616f79584867f26
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f1610403468c8a26c104177a18275c14bdfe82f9f075a81b899edd5d2e0d91d
target:
kind: Deployment
labelSelector: app=catalog-operator
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-03-05-024021"
"base": "4.22.0-0.nightly-arm64-2026-03-06-030256"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:274bc2a82a869641e4f9a659faa5c42a442032968905330fc0a08a15d4b92a02",
Expand Down
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-03-02-153725"
"base": "4.22.0-0.nightly-2026-03-05-070435"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ae79da6531bf3b60092e0d20de14251bf11530c0339c6c2b616f79584867f26",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c29ea5cb6e084b49b115f1c26c7967090d009e39e68f905841c95415abc40007",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:957bb71c53f9f45a46cd471fe6ece04fe0adf65a489a5cf36c20d7941cb3bfe6"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f1610403468c8a26c104177a18275c14bdfe82f9f075a81b899edd5d2e0d91d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a64fb2be9f64229ad14b6fa028d57c7782724adb06b4a9b282a9591630d282e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0c76b89772bac508b693aabe733e57c6c401d6fe58411b2384ff84b2e53d2d0"
}
}
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,13 +1,13 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-03-05-024021"
"base": "4.22.0-0.nightly-arm64-2026-03-06-030256"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:449d216388a8a0a7b0dbe806e1fd29c6585160bdb46a147e9eb31fb3b29ad877",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9fc96a3d358b814aa5048e1bc73ad8e63eeab680e5c3aab739ebe10d0b93520",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b84634605e4bd062dbe81a3a9fff3bcb174740ba5fa4d520515c1e0a12d8f01c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5043a834f264505fee0c0288abca18674cefbbb40ec0961fb19c73ed71b6f145",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c11fbc6f32b7cff7d11d63dda6c4b785c3425f1c80521312801975b5e4032bac",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2ae854ce7b05e77b90c17388cb6f8a667aea653e665c17748033a81d2a927a6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d39bd6be404474ecbad5026ae7ebffabadce61fc751b4bc751205a346a7dbf4",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9a144aa54b3ea4cbf410f8f73bff7a3dccf0cd1ad34def12aac956e0df18b40",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:edf4758055c34352ee56691cd37392dc86b6a48350bbef396c3092a0f922a416",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
Expand Down
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-03-02-153725"
"base": "4.22.0-0.nightly-2026-03-05-070435"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d600215f1d3c3edf54f73df338eb83a591e93dde1ae71259e79938a411289d82",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0f51efef00cea2f5454676bdb1482242df6d4408ee945daaecfbf318d16fdb3",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec2ff966be587330cca9fa4c902c839145ffbb8450b1696f0b39e54bc5f491e6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:957bb71c53f9f45a46cd471fe6ece04fe0adf65a489a5cf36c20d7941cb3bfe6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20d9e421fae5fd366a66811b9619185a48760df6144983796a1661fc2966515f",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03a68878becdf9f19ea8dba9d20d9b14e505e568194f6345a0bf8e64a445203e",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03eb33da41f46489f667be895479b155e8e51be44aa60d9313aa13bd238be0d5",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6df35b0ec72c2edf626ce7635780673c14e298bc7add2e43df295dce413825b",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81838f93e999144edecbc646e9106583809104e6f1a54137054552bc82aa1518",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ed0855bd67a9ed63c581755272f61fc1e15276a8eb6db67d5438ed74dcec02b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0c76b89772bac508b693aabe733e57c6c401d6fe58411b2384ff84b2e53d2d0",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53e440411d63269cef975183d03dd38fbee33c2aad2b0f99daf369f8bfd45351",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acb68a6933a56ff97b5ae13cd611cede0143fd59e4821c8d6adcca2098023056",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:94e2a598fc3f5a60b763e19861e64a818266869c2cb62e2c1acae2847eb7450b",
"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:1cbdacd9960820b43a589963b1bcc45a9c7114985b960bac8a2006113f3ba98a"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2999ae872e0674d64b2eb5c7ceffa20eb3480eec50df9de2add78fb977218aee"
}
}
25 changes: 17 additions & 8 deletions etcd/vendor/github.com/openshift/microshift/pkg/config/apiserver.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ replace (
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 // from kubernetes
k8s.io/klog/v2 => ./deps/k8s.io/klog // deps clone github.com/kubernetes/klog from kubernetes
k8s.io/kubernetes => ./deps/github.com/openshift/kubernetes // deps copy
sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260226203502-a740e5343a8b // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator
sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260304192652-72835e43c775 // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator
)

replace (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,8 @@ github.com/openshift/client-go v0.0.0-20251205093018-96a6cbc1420c h1:TBE0Gl+oCo/
github.com/openshift/client-go v0.0.0-20251205093018-96a6cbc1420c/go.mod h1:IsynOWZAfdH+BgWimcFQRtI41Id9sgdhsCEjIk8ACLw=
github.com/openshift/cluster-policy-controller v0.0.0-20251120141414-8b775487512f h1:qL/G4RbBeYWNBeZ8XIhB6MAOh1rld7HWUAue22l0cw8=
github.com/openshift/cluster-policy-controller v0.0.0-20251120141414-8b775487512f/go.mod h1:LXi/198uMe/91uydJ/yHz+jS66JCP1DtSonVDFhVVPs=
github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260226203502-a740e5343a8b h1:MOPgMyH3XLYEvWGNL1UUzgKN6oRX9Fe0XPxo/W0O+rE=
github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260226203502-a740e5343a8b/go.mod h1:o5cKv/pQ+exEYKq97WapNa5cxSPxuwBezHZHNW5RNRo=
github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260304192652-72835e43c775 h1:4gZibdvRUsxsQ55Tp+HFRjVzkYh+bcRezmYqhiCMk4U=
github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260304192652-72835e43c775/go.mod h1:o5cKv/pQ+exEYKq97WapNa5cxSPxuwBezHZHNW5RNRo=
github.com/openshift/library-go v0.0.0-20260121132910-dc3a1c884c04 h1:Fm9C8pT4l6VjpdqdhI1cBX9Y3D3S+rFxptVhCPBbMAI=
github.com/openshift/library-go v0.0.0-20260121132910-dc3a1c884c04/go.mod h1:nIzWQQE49XbiKizVnVOip9CEB7HJ0hoJwNi3g3YKnKc=
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 h1:PMTgifBcBRLJJiM+LgSzPDTk9/Rx4qS09OUrfpY6GBQ=
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:03a68878becdf9f19ea8dba9d20d9b14e505e568194f6345a0bf8e64a445203e"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acb68a6933a56ff97b5ae13cd611cede0143fd59e4821c8d6adcca2098023056"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
Loading