Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-09-10-135328_amd64-2025-09-10_arm64-2025-09-10 #5453

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
Sep 11, 2025
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-09-10-135328_amd64-2025-09-10_arm64-2025-09-10 #5453

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
1e4ae2e
update last_rebase.sh
Sep 11, 2025
bdc3e11
update changelog
Sep 11, 2025
b557c9f
update microshift/go.mod
Sep 11, 2025
0806f93
update microshift/deps
Sep 11, 2025
736194b
update microshift/vendor
Sep 11, 2025
950727d
update deps gofmt
Sep 11, 2025
79374f1
update etcd/go.mod
Sep 11, 2025
9c6619c
update etcd/vendor
Sep 11, 2025
5937505
update component images
Sep 11, 2025
57c74a8
update manifests
Sep 11, 2025
2bdf2fb
update buildfiles
Sep 11, 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
4 changes: 2 additions & 2 deletions Makefile.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=31
KUBE_GIT_VERSION=v1.31.11
KUBE_GIT_COMMIT=3c7968e741684de8dc08ebc8aef1890b099eccae
KUBE_GIT_VERSION=v1.31.12
KUBE_GIT_COMMIT=a4cad449903ebc0483194289514d09f1deac1b66
KUBE_GIT_TREE_STATE=clean
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-09-03-045711
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-09-10-195319
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-09-03-101304
OCP_VERSION := 4.18.0-0.nightly-2025-09-10-135328
2 changes: 1 addition & 1 deletion assets/controllers/kube-apiserver/defaultconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ apiServerArguments:
event-ttl:
- 3h
goaway-chance:
- "0"
- "0.001"
http2-max-streams-per-connection:
- "2000" # recommended is 1000, but we need to mitigate https://github.com/kubernetes/kubernetes/issues/74412
kubelet-certificate-authority:
Expand Down
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.aarch64.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:016753501f4be4bf083dd23a9bee607dcb458c4662fa3ac7898e08158f2f8c3a
digest: sha256:4896acd7055402c8d270fe7ff6fc30804978f6488052d9331fb94a9e0da3a58d
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3c78e13ec0fd31e80ccf2b3f4b08df9efb7854739c9e5d75a9f6572d81c5b4b4
digest: sha256:d789325b82fe8545c0ee4bbaf28e75287ce358c4ae6638866648bae63ab256eb
4 changes: 2 additions & 2 deletions assets/optional/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:ca78cad82282a70210b26c6781b9f86d6d18a62980d09c20e62e5e3592ccad1e
digest: sha256:32c341c90bc3bce981e83b143183bf7ee635d735fcdfdb8f6663bff629634049
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:545547b6c5226b309cd9cc577c0b91759d542e58f2bd60bfe00b15164a30b007
digest: sha256:ddf10104213897ba1fcadf2c66156c1aaa065cf58b027935a6aecb25b1a4c4f7
6 changes: 3 additions & 3 deletions assets/optional/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.18.0-0.nightly-arm64-2025-09-03-045711"
"base": "4.18.0-0.nightly-arm64-2025-09-10-195319"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:016753501f4be4bf083dd23a9bee607dcb458c4662fa3ac7898e08158f2f8c3a",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c78e13ec0fd31e80ccf2b3f4b08df9efb7854739c9e5d75a9f6572d81c5b4b4"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4896acd7055402c8d270fe7ff6fc30804978f6488052d9331fb94a9e0da3a58d",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d789325b82fe8545c0ee4bbaf28e75287ce358c4ae6638866648bae63ab256eb"
}
}
6 changes: 3 additions & 3 deletions assets/optional/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.18.0-0.nightly-2025-09-03-101304"
"base": "4.18.0-0.nightly-2025-09-10-135328"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca78cad82282a70210b26c6781b9f86d6d18a62980d09c20e62e5e3592ccad1e",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:545547b6c5226b309cd9cc577c0b91759d542e58f2bd60bfe00b15164a30b007"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32c341c90bc3bce981e83b143183bf7ee635d735fcdfdb8f6663bff629634049",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddf10104213897ba1fcadf2c66156c1aaa065cf58b027935a6aecb25b1a4c4f7"
}
}
10 changes: 5 additions & 5 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,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:91e28ef615d50aa6c72987991cd10b6f231419d356bda0783049e76b10ceb0ec
digest: sha256:5cf671637d8747c0c5c53c3342e30ea721e683e5cad51a627ad76a0687b6a286
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a8b3b7e6e540ba8ceb03d86638f6b53319db3465088e0372ef5309eebfec0fb4
digest: sha256:a34145f99c43f6eaa33d90ca5ded31709e70532e2bf2af699837c98041309f17
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e4d2928509a1b0daf46038b10a549e54df7d21810eee98b4a1c81ffe592a0e35
digest: sha256:5a32438138f59921a5124dec8f5fb2bc15dc21d69c8179d43e49fb54a6cd1a79

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:a8b3b7e6e540ba8ceb03d86638f6b53319db3465088e0372ef5309eebfec0fb4
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a34145f99c43f6eaa33d90ca5ded31709e70532e2bf2af699837c98041309f17
- 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:91e28ef615d50aa6c72987991cd10b6f231419d356bda0783049e76b10ceb0ec
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cf671637d8747c0c5c53c3342e30ea721e683e5cad51a627ad76a0687b6a286
target:
kind: Deployment
labelSelector: app=catalog-operator
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:b0711dd038e6c5b557797b40fd8896a5dfa708fafa0df5bd10fa67ea9f33a6ae
digest: sha256:f1547e9e79b1a63fc594687f88ba87f65b0d8cec9ef93c7df50f4a234f63ce33
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ec79bd4481898e4467d2e5f32d05662908936b06cd3f7ef1420a98c6f0a4e1f7
digest: sha256:506a711a325eb0f454232dbb1e538af4797f04ec3071f0fa407c8d712a9211c2
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:05ea4625eec55253f86b454dec2742638bd4f4993d2ba0d5422e8d7beaef864b
digest: sha256:0470599a9a0cb7e570b2e9169d59a9358d6304072260cee85312df8197a46283

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:ec79bd4481898e4467d2e5f32d05662908936b06cd3f7ef1420a98c6f0a4e1f7
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:506a711a325eb0f454232dbb1e538af4797f04ec3071f0fa407c8d712a9211c2
- 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:b0711dd038e6c5b557797b40fd8896a5dfa708fafa0df5bd10fa67ea9f33a6ae
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1547e9e79b1a63fc594687f88ba87f65b0d8cec9ef93c7df50f4a234f63ce33
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.18.0-0.nightly-arm64-2025-09-03-045711"
"base": "4.18.0-0.nightly-arm64-2025-09-10-195319"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91e28ef615d50aa6c72987991cd10b6f231419d356bda0783049e76b10ceb0ec",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8b3b7e6e540ba8ceb03d86638f6b53319db3465088e0372ef5309eebfec0fb4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4d2928509a1b0daf46038b10a549e54df7d21810eee98b4a1c81ffe592a0e35"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cf671637d8747c0c5c53c3342e30ea721e683e5cad51a627ad76a0687b6a286",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a34145f99c43f6eaa33d90ca5ded31709e70532e2bf2af699837c98041309f17",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a32438138f59921a5124dec8f5fb2bc15dc21d69c8179d43e49fb54a6cd1a79"
}
}
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.18.0-0.nightly-2025-09-03-101304"
"base": "4.18.0-0.nightly-2025-09-10-135328"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0711dd038e6c5b557797b40fd8896a5dfa708fafa0df5bd10fa67ea9f33a6ae",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec79bd4481898e4467d2e5f32d05662908936b06cd3f7ef1420a98c6f0a4e1f7",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05ea4625eec55253f86b454dec2742638bd4f4993d2ba0d5422e8d7beaef864b"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1547e9e79b1a63fc594687f88ba87f65b0d8cec9ef93c7df50f4a234f63ce33",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:506a711a325eb0f454232dbb1e538af4797f04ec3071f0fa407c8d712a9211c2",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0470599a9a0cb7e570b2e9169d59a9358d6304072260cee85312df8197a46283"
}
}
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.18.0-0.nightly-arm64-2025-09-03-045711"
"base": "4.18.0-0.nightly-arm64-2025-09-10-195319"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8bb731c8611bb5aca6f0a2523f0b6248ec2f10fb89cf3fd7520e4b01dbf79fa7",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56476d218d817f12156e67a5949dc5aa96cdfbc47b8af87494e68a5599e0ea52",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7dd551f8e626ec72f135fe7a90b7589b26cda72d831817dbd369701fc15429a1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4d2928509a1b0daf46038b10a549e54df7d21810eee98b4a1c81ffe592a0e35",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48c2f2e999d26681a196bd4f044efdef55a0d137bf01ee039d0d6af21d0f1d24",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ead78a41605a84c33874cf439f8fb7ca4e40d238311b944bb6573c3a74599c32",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dadd6f5c854815079e5dbb9cdd274399e396b242c3a6b60de24bc96355e6755e",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d3104dadbc2d4b3e8028bb48c77dbb10eebbb1af46615b579c7332d0b215353",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8130cb0c47349d7abd81f9dd9379e44de7b289f71b28902fc14055c0d0d4e069",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:039f507bbc6c42588ac61fce3c1e76ba44d2f8f9eee877fdd832f9bbff589274",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a32438138f59921a5124dec8f5fb2bc15dc21d69c8179d43e49fb54a6cd1a79",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb52b81af63bb16500acfc033ea69486717b76b34b2ca1cd3660e3e1d1290d40",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:843d145890e1f69ceadf72aa2762f15049f7c0b5699b0a36b40e36b6cbec5b56",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e148bece3e038fea83a6d35c660422e4cb5e1ba228c927012b7c67631be416ce",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:224aff3fd638d3a6ebb6954a7923e76ae25c013d65f6b257f5aceade4033ebdd"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39f715f20a7da3d58e20b1d8de46829df6b43bd86b5e9b0cb304e26ac0853a3c"
}
}
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.18.0-0.nightly-2025-09-03-101304"
"base": "4.18.0-0.nightly-2025-09-10-135328"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df2e6c589083d742ab3eeb863dc26a267b9e3b4a86f07fec2ff5c230733fa4ff",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d96ca6ca34d38debb586165c04ca6aa3735d09d25f89cb60043fb800f5ccdf7e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3afe86a1db4b0cadd29edd815c8106fc0cfca92916e8a7f33fcda8c5e5b21914",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05ea4625eec55253f86b454dec2742638bd4f4993d2ba0d5422e8d7beaef864b",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89cff1bdbc386572c0d8f2ea26087dfb728803b2c90329bf6f0f10e2ab781ee8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01dfbfa63c6a054c432b329ef61b460f97e35f9536a325ea6c79acad49775eb9",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f0bcbff40a7c02499b25e8c70386261eeb2e53d4fc26d302da44fdf71c6d336",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9565856231dcfc847f76c351203dd0b3058c852d3b3df9df14e0d108bd6067bc",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b84effe3edad35a85c588d56b732c2035aa254b2f1738b33e8bce57305f37dd4",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed41e709c229010ac299ad39d27abd6a889c94524c7c48bb4b2eb7fcb45e5140",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0470599a9a0cb7e570b2e9169d59a9358d6304072260cee85312df8197a46283",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec06d2ea571f182170ab35d042cc271868f907f13f40380a177d756a0d82913e",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f926ab7f668a1c2ab96002a10416d48fec768d6146fb2cb243e8adf2ed43aba",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22dcb1bbbde59f9d10a83423f39bbc54841cdbbd2eca48efc3a8c880b5ec0ef9",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:398184506d43278f5abb00b3dacb766c6cc3cffd94fa821c701e747add69a40c"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c16eee7d59491d224693ad415252a917a02172f5dc7c43bc4362cb874fcd69c"
}
}
2 changes: 1 addition & 1 deletion deps/github.com/openshift/kubernetes/.go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.23.10
1.23.11
Loading