Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-02-03-072713_amd64-2025-02-03_arm64-2025-02-04 #4507

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
merged 4 commits into from
Feb 4, 2025
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-02-03-072713_amd64-2025-02-03_arm64-2025-02-04 #4507

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
cff5975
update last_rebase.sh
Feb 4, 2025
29cc459
update changelog
Feb 4, 2025
f4789bf
update manifests
Feb 4, 2025
df11582
update buildfiles
Feb 4, 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-02-02-171234
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-02-04-012511
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-01-185117
OCP_VERSION := 4.18.0-0.nightly-2025-02-03-072713
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-02-02-171234"
"base": "4.18.0-0.nightly-arm64-2025-02-04-012511"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cff936abaaf77fcae90d16563afaffa5fabed681ff6a84cd0d07cd753f23483e",
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-02-01-185117"
"base": "4.18.0-0.nightly-2025-02-03-072713"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:098bab222712ecdbf85e748e0b676814b0e08debfdbc15127b057b63c136fcab",
Expand Down
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.18.0-0.nightly-arm64-2025-02-02-171234"
"base": "4.18.0-0.nightly-arm64-2025-02-04-012511"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77b44abd29994f5e934a1158c909eaa4a944e10c12c580fca1ff1e18b13f0427",
Expand Down
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2025-02-01-185117"
"base": "4.18.0-0.nightly-2025-02-03-072713"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47b0670fa1051335fd2d2c9e8361e4ed77c7760c33a2180b136f7c7f59863ec2",
Expand Down
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-02-02-171234"
"base": "4.18.0-0.nightly-arm64-2025-02-04-012511"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c69f94d8076acdcb1ac6191e05cf6ef600c874cd24ec3bb7aadb4cc00ffb3bc9",
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-02-01-185117"
"base": "4.18.0-0.nightly-2025-02-03-072713"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72e5ac3a4c17df7293e16f3bd1bde34f95d882d99dadc4faf76071a0b038911b",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:487c0a8d5200bcdce484ab1169229d8fcb8e91a934be45afff7819c4f7612f57",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe009d03910e18795e3bd60a3fd84938311d464d2730a2af5ded5b24e4d05a6b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:242b3d66438c42745f4ef318bdeaf3d793426f12962a42ea83e18d06c08aaf09",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7463f642c3a29b62b0a657286948ce48db230554c34aef1ee2b25856898c45a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f7093ff0639c463f8c9ac05be7fcd27f7dd756adf29ec2202e667b29942746b",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6fd13f15b83994bb36583a36e13bd640aceefbf30b4173167a502bff19733c4",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:898cae57123c5006d397b24af21b0f24a0c42c9b0be5ee8251e1824711f65820",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
Expand Down
64 changes: 3 additions & 61 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,7 @@
- cluster-network-operator embedded-component 8d768a83424e930352ca565094c24208dadb4725 to 4616940d5e04f53b5bed811449b89acf2bb11514
- 4676c51 2025-01-28T18:16:40+02:00 ovn-k, units-test: Test OVN Kubernetes rendering
- 139a937 2025-01-28T18:15:07+02:00 ovn-k,rbac: Enable non-admin users create & modify UDN CRs
- f2eac1b 2025-01-28T18:15:07+02:00 ovn-k,rbac: Add UDN to cluster-reader
- cluster-network-operator embedded-component 4616940d5e04f53b5bed811449b89acf2bb11514 to 224efe3703ae1b01eeb815d9db6dd5ccc445feff
- 2add839 2025-01-30T17:47:23+00:00 OVNK should be able to annotate network ID on NADs

- kubernetes embedded-component e411fa899e95a590ef75e2ef7defad8221c1edac to e18ecb4c7c8e2d8ca398f0ecdf76119d9f471cf3
- a11999713 2025-01-29T12:15:23+01:00 UPSTREAM: <carry>: Bump openshift-eng/openshift-tests-extension to main
- 6e655184a 2025-01-16T17:25:29+00:00 UPSTREAM: 129506: Simplify status subresource ratcheting testing
- 2fad11e71 2025-01-16T17:25:28+00:00 UPSTREAM: 129506: Fix status subresource ratcheting

- machine-config-operator embedded-component c4babd8a0ae9508fc29285d9d46745a8ac3b0b05 to d6090f11285d3b9a9262290f17bc3f90eb3dd8e5
- 5a481d7b 2025-01-29T14:57:50+00:00 operator: clear co degrade immediately

- router image-amd64 be319d0bb83f75b52b707df46422f6892dfaaa56 to 061909a4c397c048e6def163fda5d227c75f176b
- e48048d 2025-01-31T14:45:11+00:00 OCPBUGS-47761: Update default_pub_keys.pem to use SHA256

- ovn-kubernetes image-amd64 b41a3aba093f66f7dd46680339d06fb75dba7492 to 9f68300ef68a4c77a61007208eb6bcbca50a9015
- b3fc2c91 2025-01-30T16:46:11+00:00 Fix CUDN unit test for status matching
- 65bc5c82 2025-01-30T16:46:11+00:00 Fixes starting services/multinetpolicy on wrong controllers
- b842cd58 2025-01-30T16:46:11+00:00 Make open default ports semantically correct
- fb74e44f 2025-01-30T16:46:11+00:00 Do not get active network for non-primary controllers
- bc37ea98 2025-01-30T16:46:11+00:00 UserDefinedNetworks: Ignore pods and namespaces from different networks
- 67203d35 2025-01-30T16:46:11+00:00 Get the network ID from the NAD for zone/node ctrls
- c3613809 2025-01-30T16:46:11+00:00 Use partial parsing for network sepcific CIDRs
- bd18b0f0 2025-01-30T16:46:11+00:00 Improve annotation changes detection
- 51322a05 2025-01-29T12:53:49+00:00 Check if cluster manager controller has retry pod framework
- 5cd56cfb 2025-01-29T12:53:49+00:00 Reconcile pending pods when a NAD is added to an existing network
- 42ecd7a6 2025-01-29T12:53:49+00:00 Clone frrFactory in ShallowClone
- 116f7faa 2025-01-29T12:53:49+00:00 factory: Set default event queue size to 100.
- 9be70caa 2025-01-29T12:53:49+00:00 Clone raFactory in ShallowClone
- 74dfde8c 2025-01-29T12:53:49+00:00 helm: Update documentation for ic and non-ic deployments
- 18c95642 2025-01-29T12:53:49+00:00 Replace ovn-org with ovn-kubernetes to reflect repo move

- kubernetes image-amd64 e411fa899e95a590ef75e2ef7defad8221c1edac to e18ecb4c7c8e2d8ca398f0ecdf76119d9f471cf3
- a11999713 2025-01-29T12:15:23+01:00 UPSTREAM: <carry>: Bump openshift-eng/openshift-tests-extension to main
- 6e655184a 2025-01-16T17:25:29+00:00 UPSTREAM: 129506: Simplify status subresource ratcheting testing
- 2fad11e71 2025-01-16T17:25:28+00:00 UPSTREAM: 129506: Fix status subresource ratcheting

- router image-arm64 be319d0bb83f75b52b707df46422f6892dfaaa56 to 061909a4c397c048e6def163fda5d227c75f176b
- e48048d 2025-01-31T14:45:11+00:00 OCPBUGS-47761: Update default_pub_keys.pem to use SHA256

- ovn-kubernetes image-arm64 b41a3aba093f66f7dd46680339d06fb75dba7492 to 5086614cde9fbec2cce4c8184ea407adaef5c2a3
- ovn-kubernetes image-amd64 9f68300ef68a4c77a61007208eb6bcbca50a9015 to 5086614cde9fbec2cce4c8184ea407adaef5c2a3
- 2a8db097 2025-02-01T16:28:46+00:00 Fixes 1 minute delay for primary UDN controllers to start
- 97e762bc 2025-02-01T16:28:46+00:00 Fix UDN and CUDN subnet validation
- b3fc2c91 2025-01-30T16:46:11+00:00 Fix CUDN unit test for status matching
- 65bc5c82 2025-01-30T16:46:11+00:00 Fixes starting services/multinetpolicy on wrong controllers
- b842cd58 2025-01-30T16:46:11+00:00 Make open default ports semantically correct
- fb74e44f 2025-01-30T16:46:11+00:00 Do not get active network for non-primary controllers
- bc37ea98 2025-01-30T16:46:11+00:00 UserDefinedNetworks: Ignore pods and namespaces from different networks
- 67203d35 2025-01-30T16:46:11+00:00 Get the network ID from the NAD for zone/node ctrls
- c3613809 2025-01-30T16:46:11+00:00 Use partial parsing for network sepcific CIDRs
- bd18b0f0 2025-01-30T16:46:11+00:00 Improve annotation changes detection
- 51322a05 2025-01-29T12:53:49+00:00 Check if cluster manager controller has retry pod framework
- 5cd56cfb 2025-01-29T12:53:49+00:00 Reconcile pending pods when a NAD is added to an existing network
- 42ecd7a6 2025-01-29T12:53:49+00:00 Clone frrFactory in ShallowClone
- 116f7faa 2025-01-29T12:53:49+00:00 factory: Set default event queue size to 100.
- 9be70caa 2025-01-29T12:53:49+00:00 Clone raFactory in ShallowClone
- 74dfde8c 2025-01-29T12:53:49+00:00 helm: Update documentation for ic and non-ic deployments
- 18c95642 2025-01-29T12:53:49+00:00 Replace ovn-org with ovn-kubernetes to reflect repo move

- kubernetes image-arm64 e411fa899e95a590ef75e2ef7defad8221c1edac to e18ecb4c7c8e2d8ca398f0ecdf76119d9f471cf3
- a11999713 2025-01-29T12:15:23+01:00 UPSTREAM: <carry>: Bump openshift-eng/openshift-tests-extension to main
- 6e655184a 2025-01-16T17:25:29+00:00 UPSTREAM: 129506: Simplify status subresource ratcheting testing
- 2fad11e71 2025-01-16T17:25:28+00:00 UPSTREAM: 129506: Fix status subresource ratcheting

4 changes: 2 additions & 2 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 8be1749
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 4babb3f18c19d2bef584a8389f34b8428cf52b9c
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ce2c021f23f5d178da6ea35d98a229137e5a81c4
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e4c772cd344e538342a4e1cd91635b387e1c18ba
https://github.com/openshift/cluster-network-operator embedded-component 4616940d5e04f53b5bed811449b89acf2bb11514
https://github.com/openshift/cluster-network-operator embedded-component 224efe3703ae1b01eeb815d9db6dd5ccc445feff
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component f1711cf30f683ec0eaa187cd5168caae9e8c1254
https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9
https://github.com/openshift/csi-external-snapshotter embedded-component 838d2484157f076bbb81f1b584898aec6f051c2f
Expand All @@ -22,7 +22,7 @@ https://github.com/openshift/coredns image-amd64 cb1abfaeb7b0c5df4f0c56b0a009b43
https://github.com/openshift/csi-external-snapshotter image-amd64 838d2484157f076bbb81f1b584898aec6f051c2f
https://github.com/openshift/router image-amd64 061909a4c397c048e6def163fda5d227c75f176b
https://github.com/openshift/kube-rbac-proxy image-amd64 526498ab32996a0f67a96530ad7173f955e3fbe2
https://github.com/openshift/ovn-kubernetes image-amd64 9f68300ef68a4c77a61007208eb6bcbca50a9015
https://github.com/openshift/ovn-kubernetes image-amd64 5086614cde9fbec2cce4c8184ea407adaef5c2a3
https://github.com/openshift/kubernetes image-amd64 e18ecb4c7c8e2d8ca398f0ecdf76119d9f471cf3
https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-arm64 36c93092776f8d964b4d09fa4c4f299d1ab55a08
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-02-01-185117" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-02-02-171234"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-02-03-072713" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-02-04-012511"