Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-02-26-103013_amd64-2025-02-26_arm64-2025-02-26 #4609

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 9 commits into from
Feb 27, 2025
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-02-26-103013_amd64-2025-02-26_arm64-2025-02-26 #4609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
402522c
update last_rebase.sh
Feb 27, 2025
45d52e6
update changelog
Feb 27, 2025
98c8e2e
update microshift/go.mod
Feb 27, 2025
8d2ce26
update microshift/vendor
Feb 27, 2025
ae0e0c8
update etcd/go.mod
Feb 27, 2025
d29903a
update etcd/vendor
Feb 27, 2025
afa6d88
update component images
Feb 27, 2025
7ce3cc0
update manifests
Feb 27, 2025
c723ce0
update buildfiles
Feb 27, 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.5
KUBE_GIT_COMMIT=acb9630c20d2fa0d11bad4c38c7b28e2db9d818b
KUBE_GIT_VERSION=v1.31.6
KUBE_GIT_COMMIT=6020cf5333bdeb77f95fa33f8272e5251ea28edc
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-02-25-002144
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-02-26-165117
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-02-19-132725
OCP_VERSION := 4.18.0-0.nightly-2025-02-26-103013
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:323d90fcfad79d87bfff2e5db95f5d887cb02dd116ea10ee67150b6bb70ea9fa
digest: sha256:f62ca3fc667a599b4a8874adc5f6bca07ed5f9aa1781ffbb42a0774f48e5d895
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e9101acfc38167063077b4fbf899ef746d7917437a84ed2ed09eb2ac1e7f4df0
digest: sha256:36c8180dd6b35b87a1215eae217aa1f2fafac25a5dea95e38d36e4efe3cda492
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:ff0df1dab1c67dcbef8cd5ffd79ec3b417b153568ada0d34f86111c633a65b45
digest: sha256:e1ac93dcc27518bcfda5a0319cf224f033567ec3ba7599a176ae3e863c2854b6
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:19f7c702f016173a725b0e5d21dc0296f9cfdc3a6aef7d861c744486323c0b07
digest: sha256:d1d4685fe20ad6bc338a651463071fe5f46c590329f6d5e0b5be5c57e72a075a
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-02-25-002144"
"base": "4.18.0-0.nightly-arm64-2025-02-26-165117"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:323d90fcfad79d87bfff2e5db95f5d887cb02dd116ea10ee67150b6bb70ea9fa",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9101acfc38167063077b4fbf899ef746d7917437a84ed2ed09eb2ac1e7f4df0"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f62ca3fc667a599b4a8874adc5f6bca07ed5f9aa1781ffbb42a0774f48e5d895",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36c8180dd6b35b87a1215eae217aa1f2fafac25a5dea95e38d36e4efe3cda492"
}
}
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-02-19-132725"
"base": "4.18.0-0.nightly-2025-02-26-103013"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff0df1dab1c67dcbef8cd5ffd79ec3b417b153568ada0d34f86111c633a65b45",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19f7c702f016173a725b0e5d21dc0296f9cfdc3a6aef7d861c744486323c0b07"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1ac93dcc27518bcfda5a0319cf224f033567ec3ba7599a176ae3e863c2854b6",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1d4685fe20ad6bc338a651463071fe5f46c590329f6d5e0b5be5c57e72a075a"
}
}
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:27431568ce9c2ba9a0ace84cc02b049d86c1cab73f25432423816f1bc918ea4e
digest: sha256:37e9d2ecd802988b12885eb5a4a8c2f43e0a7558c54e95fcf6c75590ae59e533
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:51daa5f9a27ddd7d7f678197a4d7f0620006e53ec5dfbbf587f49f38fd7d6ee4
digest: sha256:e7e5edabbb1f3f0c144adf19f9b5b2ecb69802a7eee4efcab0b1cbf11dbc9b35
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bf5e4ce5f92883654beff7d9240ca5a6fce0d5d808611660c6553144a47ad20c
digest: sha256:5a9f83f1fd0b8218cf4f2859773a5a4eefd833334dda20699c0fa007c9a16390

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:51daa5f9a27ddd7d7f678197a4d7f0620006e53ec5dfbbf587f49f38fd7d6ee4
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7e5edabbb1f3f0c144adf19f9b5b2ecb69802a7eee4efcab0b1cbf11dbc9b35
- 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:27431568ce9c2ba9a0ace84cc02b049d86c1cab73f25432423816f1bc918ea4e
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37e9d2ecd802988b12885eb5a4a8c2f43e0a7558c54e95fcf6c75590ae59e533
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:d7a1c3713f77cf256eb8e77aa83b5bc508495bb9fcd187dc854d60f078c66670
digest: sha256:8857f18845f1aebf044ec78755662bd8fa9fa84efb6cf9e59c1a58f5909cef27
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8a549516b7eed62077f3cd28cf809908c7bde915891bf16deecb2c238610f81d
digest: sha256:c34a7d4a5ba7d78debe6b3961498a19e7c2416b2a8a2c10e5086a02934b4e956
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:c1390a9bf6a4c15e4d74d07e7659962f7094dba2ec2e1ac17bfa52552c2778e0
digest: sha256:07de5857445b9f5df7eff649e65766359feaae23fb20175e4996e0f79e985b4c

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:8a549516b7eed62077f3cd28cf809908c7bde915891bf16deecb2c238610f81d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c34a7d4a5ba7d78debe6b3961498a19e7c2416b2a8a2c10e5086a02934b4e956
- 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:d7a1c3713f77cf256eb8e77aa83b5bc508495bb9fcd187dc854d60f078c66670
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8857f18845f1aebf044ec78755662bd8fa9fa84efb6cf9e59c1a58f5909cef27
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-02-25-002144"
"base": "4.18.0-0.nightly-arm64-2025-02-26-165117"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27431568ce9c2ba9a0ace84cc02b049d86c1cab73f25432423816f1bc918ea4e",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51daa5f9a27ddd7d7f678197a4d7f0620006e53ec5dfbbf587f49f38fd7d6ee4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf5e4ce5f92883654beff7d9240ca5a6fce0d5d808611660c6553144a47ad20c"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37e9d2ecd802988b12885eb5a4a8c2f43e0a7558c54e95fcf6c75590ae59e533",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7e5edabbb1f3f0c144adf19f9b5b2ecb69802a7eee4efcab0b1cbf11dbc9b35",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a9f83f1fd0b8218cf4f2859773a5a4eefd833334dda20699c0fa007c9a16390"
}
}
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-02-19-132725"
"base": "4.18.0-0.nightly-2025-02-26-103013"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7a1c3713f77cf256eb8e77aa83b5bc508495bb9fcd187dc854d60f078c66670",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a549516b7eed62077f3cd28cf809908c7bde915891bf16deecb2c238610f81d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1390a9bf6a4c15e4d74d07e7659962f7094dba2ec2e1ac17bfa52552c2778e0"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8857f18845f1aebf044ec78755662bd8fa9fa84efb6cf9e59c1a58f5909cef27",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c34a7d4a5ba7d78debe6b3961498a19e7c2416b2a8a2c10e5086a02934b4e956",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07de5857445b9f5df7eff649e65766359feaae23fb20175e4996e0f79e985b4c"
}
}
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-02-25-002144"
"base": "4.18.0-0.nightly-arm64-2025-02-26-165117"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4ed992e689c4a19403cd6b1d1a50c73fdf0bb32c92b288e7b0246b7b785a664",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fdf518c8fba238d75f21958a259f882d4c6a00f979d6cce94efa3dcedb7637b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e71d029878da2ee8de7c9e0fa93fed36cb487998873a374cd01a8b5fda9962d4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf5e4ce5f92883654beff7d9240ca5a6fce0d5d808611660c6553144a47ad20c",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8b8087300495e26223337006e892aaab4613bccfaa7b4d25fa316ff5a7a050c",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:688aeb4a1bed7a8fa44a0895858e8ed89b99c2baafdd67916c5e9f06f1738ada",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81a8d386fa7a1c2b08d6d1aa308c88960605043ae9fd2098bbe3a386922270fe",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7a77e2cf905e30f7567f1e0c9838b4fcaf0dab181c761fba758ab25c701f84d",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cbe68b88c6f469871b0d6fb76de6997562e9d6505fe75beaee9ee1cda0a48642",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4de82976dee63572b3f3dec030f41008d73a47f4fc314a5fe1f4fd1c9d859f30",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a9f83f1fd0b8218cf4f2859773a5a4eefd833334dda20699c0fa007c9a16390",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:266106ee4f873c21a1302af5b9348fd93d87be46f8d885afd0119e9509fedbf5",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:92c090f68bf2014a82cf4d659f12955ea650a3bb5abe310a59ce35f1a4cd4d94",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7dbd92b8958df41c34c084929fd15dd6cfb4495354307a8c5de35f00e42eee21",
"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:3249c90f5533ed3968acf5c34bafa5afc446ca5a2c9dd0c35b514ee632a731b5"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dbedccef5d45a9d565031baeb1a1b6064dc70be457790e2d6ba1948ba8fa846"
}
}
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-02-19-132725"
"base": "4.18.0-0.nightly-2025-02-26-103013"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf7ce3e0b21288a56aa1f6057a5fb6a67ab6f43623c901f201d9d5426d75d25d",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04eafb9273c15e6f920c4f1662bc9f142de85a476790780924c8b4f28423b37b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f2be1a381f98f31cff77d48331d673acb39abfe6e79c56e9dbae30b72d6aa3a7",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1390a9bf6a4c15e4d74d07e7659962f7094dba2ec2e1ac17bfa52552c2778e0",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:905f1ed5df0c9558dbf67baf79986ba9e942340e4cfdf77ecfc1c68fe6669f3e",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fa7aefa0595d704d0f3062f2216d42515a67ab04ae7768dbe5cf6266d876bceb",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6aae3ed1869bb5b43ec4a48e32b36fa5d161bbb26d45ad6ea6976490a8411d1d",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8201a3ccbfc0a655d8830d3017abd177107ac53b36012c498a27985285d903bc",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4e11cce33c194855259317a1c46c14de374641d876216e537d8cf2f0bf83c4c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:744a183daa89e7d3ab1f78e3bc3de5621872bedfb41475de60cc158e6f5ab872",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07de5857445b9f5df7eff649e65766359feaae23fb20175e4996e0f79e985b4c",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd4d22e583d07ee6f88902d35e652342db8fa06b686dc6eec049176cc8043ba5",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f89f7dfad06ab329ff8cd87221789cb9ab48ef89287b10ce9d6d654728b06013",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13f4e01257e2737471a7427af9360c4837971ead5d25613d30b76e5f1011c5eb",
"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:c5b3e15cd1c4bbbeb3aef526fdb2f1b0f0dda08a18468efea032bb44b65aec4f"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9167772a51b6a59fdd919494af9e6ca7b85a9df5b4c47781d543e8c94aa3b87"
}
}
Loading