Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-03-05-211248_amd64-2025-03-05_arm64-2025-03-05 #4640

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
Mar 6, 2025
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-03-05-211248_amd64-2025-03-05_arm64-2025-03-05 #4640

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
691f55d
update last_rebase.sh
Mar 6, 2025
b2bac87
update changelog
Mar 6, 2025
4851c5f
update manifests
Mar 6, 2025
d5358f4
update buildfiles
Mar 6, 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-03-03-215530
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-03-05-225510
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-03-03-170152
OCP_VERSION := 4.18.0-0.nightly-2025-03-05-211248
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-03-03-215530"
"base": "4.18.0-0.nightly-arm64-2025-03-05-225510"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f62ca3fc667a599b4a8874adc5f6bca07ed5f9aa1781ffbb42a0774f48e5d895",
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-03-03-170152"
"base": "4.18.0-0.nightly-2025-03-05-211248"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1ac93dcc27518bcfda5a0319cf224f033567ec3ba7599a176ae3e863c2854b6",
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:37e9d2ecd802988b12885eb5a4a8c2f43e0a7558c54e95fcf6c75590ae59e533
digest: sha256:89ee0ae197486eb02ec942fb5cbc4f929414ac51f192437db1372218ed7fca4c
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e7e5edabbb1f3f0c144adf19f9b5b2ecb69802a7eee4efcab0b1cbf11dbc9b35
digest: sha256:e455488427db7f303cafb55c2c212a9e6b8546be6f53fc7630baa13f41799e57
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:5a9f83f1fd0b8218cf4f2859773a5a4eefd833334dda20699c0fa007c9a16390
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:e7e5edabbb1f3f0c144adf19f9b5b2ecb69802a7eee4efcab0b1cbf11dbc9b35
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e455488427db7f303cafb55c2c212a9e6b8546be6f53fc7630baa13f41799e57
- 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:37e9d2ecd802988b12885eb5a4a8c2f43e0a7558c54e95fcf6c75590ae59e533
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89ee0ae197486eb02ec942fb5cbc4f929414ac51f192437db1372218ed7fca4c
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:8857f18845f1aebf044ec78755662bd8fa9fa84efb6cf9e59c1a58f5909cef27
digest: sha256:a540268cd54ca63c1a573d7419a846eb38d9d68ff9b2af1bffee22fe3f34871b
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:c34a7d4a5ba7d78debe6b3961498a19e7c2416b2a8a2c10e5086a02934b4e956
digest: sha256:6cfff3dbffda135fce480d741aeddccd619cf13d91611c8f5dee0c2e8c23d42c
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:07de5857445b9f5df7eff649e65766359feaae23fb20175e4996e0f79e985b4c
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:c34a7d4a5ba7d78debe6b3961498a19e7c2416b2a8a2c10e5086a02934b4e956
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cfff3dbffda135fce480d741aeddccd619cf13d91611c8f5dee0c2e8c23d42c
- 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:8857f18845f1aebf044ec78755662bd8fa9fa84efb6cf9e59c1a58f5909cef27
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a540268cd54ca63c1a573d7419a846eb38d9d68ff9b2af1bffee22fe3f34871b
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-03-03-215530"
"base": "4.18.0-0.nightly-arm64-2025-03-05-225510"
},
"images": {
"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",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89ee0ae197486eb02ec942fb5cbc4f929414ac51f192437db1372218ed7fca4c",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e455488427db7f303cafb55c2c212a9e6b8546be6f53fc7630baa13f41799e57",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a9f83f1fd0b8218cf4f2859773a5a4eefd833334dda20699c0fa007c9a16390"
}
}
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-03-03-170152"
"base": "4.18.0-0.nightly-2025-03-05-211248"
},
"images": {
"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",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a540268cd54ca63c1a573d7419a846eb38d9d68ff9b2af1bffee22fe3f34871b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cfff3dbffda135fce480d741aeddccd619cf13d91611c8f5dee0c2e8c23d42c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07de5857445b9f5df7eff649e65766359feaae23fb20175e4996e0f79e985b4c"
}
}
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-03-03-215530"
"base": "4.18.0-0.nightly-arm64-2025-03-05-225510"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7a77e2cf905e30f7567f1e0c9838b4fcaf0dab181c761fba758ab25c701f84d",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"release": {
"base": "4.18.0-0.nightly-2025-03-03-170152"
"base": "4.18.0-0.nightly-2025-03-05-211248"
},
"images": {
"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:a15dc0079ede4dd65b348feb267429a7c1537167255aabe4a0808f0a0be89963",
"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",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57c1889ce7800e426fd135de1b93d792ea347b31b9d97873413942963b40fdfb",
"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",
Expand Down
18 changes: 17 additions & 1 deletion scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
- ovn-kubernetes image-arm64 5f6ad07d88d8470b2d525803c60bdb5cd0164639 to 799f96146c2056a50ae8252a87c03de1cc698f13
- api embedded-component cb44c196e68fc38178d56190d9de078069154a7b to e7f23be12279d3c245c013c234f967e5ccb426e2
- cb627f2 2025-03-04T08:19:59-05:00 Add example of ratcheting minimum value in example tests
- 6d07156 2025-03-04T08:19:48-05:00 Add initialCRDPatches option to onUpdate tests
- a8e9c1e 2025-03-04T08:19:40-05:00 Add yaml-patch to tests vendor
- c8ef681 2025-03-04T08:19:29-05:00 Remove unexpected example CRDs
- e424d05 2025-02-27T13:06:16+00:00 operators/v1: reject new node statuses with current or target revision set

- machine-config-operator embedded-component 7f706b7a3b7d8ac3ca8bd058229ed66dbddf789e to c0e95912c69b3404355e056fb157acbbeb6be285
- 0a28a500 2025-02-27T16:20:11+00:00 OCPBUGS-41489: configure-ovs workaround for ovs-if-br-ex bug
- 0315a04a 2025-02-14T15:40:31+00:00 OCPBUGS-49436: Make resolv-prepender env file optional
- 753614ec 2025-01-23T17:43:15+00:00 OCPBUGS-48566: Enable nmstate-configuration on all platforms
- 74348f8a 2025-01-10T21:10:56+00:00 Update machine-config-daemon-pull.service.yaml and policy-no-sigstoresigned.yaml

- operator-framework-olm embedded-component 182471a8d72ee38d2ff82ce44db6903e66c4b22b to 877b6fd3d425043a1bd45b5d24ecebb69f5544c4
- e31a86b2 2025-02-28T13:43:59-05:00 Bump github.com/distribution/distribution/v3 (#1580)

- ovn-kubernetes image-amd64 5f6ad07d88d8470b2d525803c60bdb5cd0164639 to 799f96146c2056a50ae8252a87c03de1cc698f13
- ee203116 2025-02-24T10:20:56+00:00 Fix CM-EIP controller flake
- 6b21a404 2025-02-24T10:20:56+00:00 Fix Kind IPV6 deplyoment with RUN_IN_CONTAINER
- 4e4539ea 2025-02-24T10:20:56+00:00 Change dynamic_neigh_routers to false for the Interconnect topology.
Expand Down
8 changes: 4 additions & 4 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
https://github.com/openshift/api embedded-component cb44c196e68fc38178d56190d9de078069154a7b
https://github.com/openshift/api embedded-component e7f23be12279d3c245c013c234f967e5ccb426e2
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 6fe700087e8be6513285edd18f461790fecc65c3
https://github.com/openshift/cluster-dns-operator embedded-component 208d50c1a5e0aaeb991366daa749abdffa803224
https://github.com/openshift/cluster-ingress-operator embedded-component a730e8a7af570d3921cd44c1468f38a250a6e647
Expand All @@ -12,17 +12,17 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 838d248
https://github.com/openshift/etcd embedded-component afac40f734a0440eb0983d7308e86aea9a04bbe9
https://github.com/openshift/kubernetes embedded-component 6020cf5333bdeb77f95fa33f8272e5251ea28edc
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73
https://github.com/openshift/machine-config-operator embedded-component 7f706b7a3b7d8ac3ca8bd058229ed66dbddf789e
https://github.com/openshift/machine-config-operator embedded-component c0e95912c69b3404355e056fb157acbbeb6be285
https://github.com/openshift/openshift-controller-manager embedded-component 5bfc8081a65ea3e0d23306c0398143a9987d659e
https://github.com/openshift/operator-framework-olm embedded-component 182471a8d72ee38d2ff82ce44db6903e66c4b22b
https://github.com/openshift/operator-framework-olm embedded-component 877b6fd3d425043a1bd45b5d24ecebb69f5544c4
https://github.com/openshift/route-controller-manager embedded-component 07daee4d2f0b5c7aaca56ee45ff6dfdf97680db0
https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-amd64 eb9bc9b02fc27a48cceccc0140fc3f8ee1414c64
https://github.com/openshift/coredns image-amd64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949
https://github.com/openshift/csi-external-snapshotter image-amd64 838d2484157f076bbb81f1b584898aec6f051c2f
https://github.com/openshift/router image-amd64 d8058949aaf91dcdea050c58e6a34ef5f6670c67
https://github.com/openshift/kube-rbac-proxy image-amd64 526498ab32996a0f67a96530ad7173f955e3fbe2
https://github.com/openshift/ovn-kubernetes image-amd64 5f6ad07d88d8470b2d525803c60bdb5cd0164639
https://github.com/openshift/ovn-kubernetes image-amd64 799f96146c2056a50ae8252a87c03de1cc698f13
https://github.com/openshift/kubernetes image-amd64 6020cf5333bdeb77f95fa33f8272e5251ea28edc
https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-arm64 eb9bc9b02fc27a48cceccc0140fc3f8ee1414c64
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-03-03-170152" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-03-03-215530"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-03-05-211248" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-03-05-225510"