Skip to content

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2025-04-02-211503_amd64-2025-04-02_arm64-2025-04-03 #4776

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
Apr 7, 2025
Merged

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2025-04-02-211503_amd64-2025-04-02_arm64-2025-04-03 #4776

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
7a70db1
update last_rebase.sh
Apr 7, 2025
c210f48
update changelog
Apr 7, 2025
25c7ccb
update manifests
Apr 7, 2025
4eb59b8
update buildfiles
Apr 7, 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.16.0-0.nightly-arm64-2025-04-02-193148
OCP_VERSION := 4.16.0-0.nightly-arm64-2025-04-03-113148
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.16.0-0.nightly-2025-04-02-132013
OCP_VERSION := 4.16.0-0.nightly-2025-04-02-211503
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.16.0-0.nightly-arm64-2025-04-02-193148"
"base": "4.16.0-0.nightly-arm64-2025-04-03-113148"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7d3accde07f95ab940568a7f3d41c78fa9e8f3cc89227f3c559473cb5c0fb4b",
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.16.0-0.nightly-2025-04-02-132013"
"base": "4.16.0-0.nightly-2025-04-02-211503"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3fdcdce1e9a1cbac1b45c8d21f3b22e40543f25e478ac7f7488c3735a94cdd37",
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.16.0-0.nightly-arm64-2025-04-02-193148"
"base": "4.16.0-0.nightly-arm64-2025-04-03-113148"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22006574f2c859911a8c4ece7fa9820a1c8d6caa9b271b0235c9fc07a37d41ee",
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.16.0-0.nightly-2025-04-02-132013"
"base": "4.16.0-0.nightly-2025-04-02-211503"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28a856141fff472f141769afb27344c5834786d8967c588d0707daedcb323e27",
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.16.0-0.nightly-arm64-2025-04-02-193148"
"base": "4.16.0-0.nightly-arm64-2025-04-03-113148"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb077de59b79bb8291facf5da468e5b309ddf92bd3a051d6d905adaf76ed0578",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-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.16.0-0.nightly-2025-04-02-132013"
"base": "4.16.0-0.nightly-2025-04-02-211503"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c3d0b212909bc8049aa6fb9006c0990b664dd0ca5089da224e08ba909ce0a0b",
Expand Down
30 changes: 22 additions & 8 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
- machine-config-operator embedded-component b5dc445d6ee0d1fe2674a9cf9c01074716484bf2 to 8600a368d3b40d6e5bd7adfec1fb7a40cb6a217b
- 015aa755 2025-03-24T15:06:02+00:00 Fixing typos for MachineConfigNode
- 43480b17 2025-03-21T01:19:52+00:00 kubelet_config_controller: Update ObservedGeneration render_controller: Make function name AreMCGeneratingSubControllersCompletedForPool explicit apihelpers: match the KubeletConfig to the Pool using MachineConfigPoolSelector
- cluster-network-operator embedded-component 48848fe7e78418922f0cbb3b99d458cd484123c6 to 10162672f39b812dbfdbc3fa51f634c7851c1df1
- 49a9cac 2025-03-31T19:36:28+02:00 Check on ipsec.service instead of libreswan package on host
- b69f2b1 2025-03-31T19:36:28+02:00 Add version check for machine config operator
- 2952c4c 2025-03-31T19:36:28+02:00 Mount top level directory for IPsec host paths
- 6ca6f7e 2025-03-31T19:36:28+02:00 Move to use newer IPsec DaemonSets irrespective of MCP state
- af448a9 2025-03-31T19:36:16+02:00 Better handling of status manager machine config cache
- 31e5a84 2025-03-31T19:29:50+02:00 Use network config last seen annotation for machine config
- 6bb894d 2025-03-31T19:24:01+02:00 Report network status for machine config deletes
- f3e7d66 2025-03-31T19:24:01+02:00 Use source kind for machine config watcher
- 1557b46 2025-03-31T19:24:01+02:00 Revert "Update network operator status for IPsec"
- 72b1052 2025-03-31T19:24:01+02:00 Make machine config handling to be more generic
- b387cdb 2025-03-31T19:24:01+02:00 Report IPsec machine config progressing status
- 17c38e9 2025-03-31T19:24:01+02:00 Add machine config watcher for status manager
- da5ac11 2025-03-31T19:24:01+02:00 Keep rendering OVN IPsec when its daemonset not available
- 87539e2 2025-03-31T19:24:01+02:00 Remove 4.13 IPsec upgrade handling
- 2592e00 2025-03-31T19:24:01+02:00 Keep ovn ipsec enabled during the upgrade     The following change on the machine pool `status.MachineCount == status.UpdatedMachineCount && hasSourceInMachineConfigStatus(status, machineConfigs)` is introduced with PR https://github.com/openshift/cluster-network-operator/pull/2349 which ensures IPsec machine config is always installed on all the nodes in the cluster, So this is deleting the IPsec daemonset as per the CNO state machine for IPsec when the condition is not met. But this is also accidentally disabling IPsec in OVN which is not an expected behavior. This causes ovs-monitor-ipsec to refresh existing ipsec connections unnecessarily when IPsec pod comes up as it is not able to find remote_name from the tunnel. This may also trigger deleting IPsec connection entries from openshift.conf file if ovs-monitor-ipsec is not killed timely when ipsec daemonset is removed. So this commit enables ovn ipsec option as long as the API is set with Full mode.
- ea3b35d 2025-03-31T19:24:01+02:00 Restart IPsec service only when needed
- 30432f0 2025-03-31T19:24:01+02:00 Revert "Configure narrowing=yes for IPsec connections"
- be18899 2025-03-31T19:24:01+02:00 Cleanup ipsec state only when ipsec is not full mode

- ovn-kubernetes image-amd64 87e64b772528470577795c4f82a09e5cb253491a to 961bff913e2a04d640941f73d4632452adbaffaf
- fd9a8c0d 2025-03-20T15:13:03+01:00 Update OVN to FDP25.A.1 24.03.5-40.

- ovn-kubernetes image-arm64 87e64b772528470577795c4f82a09e5cb253491a to 961bff913e2a04d640941f73d4632452adbaffaf
- fd9a8c0d 2025-03-20T15:13:03+01:00 Update OVN to FDP25.A.1 24.03.5-40.
- machine-config-operator embedded-component 8600a368d3b40d6e5bd7adfec1fb7a40cb6a217b to 4e8c9e662a0f5e3a841533fc0ace5cb203c7ca19
- b09c4ace 2025-03-20T15:28:30+01:00 Add crio dependency for ipsec.service
- c31fd9c9 2025-03-20T15:28:19+01:00 Add ipsec connect wait service

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 @@ -4,14 +4,14 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 57f9674
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component f47238554feb2fa6dbce3333adc7e26ffe2d8424
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 0338b3be6912024d03def2c26f0fa10218fc2c25
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 630f63bc7a30d2662bbb5115233144079de6eef6
https://github.com/openshift/cluster-network-operator embedded-component 48848fe7e78418922f0cbb3b99d458cd484123c6
https://github.com/openshift/cluster-network-operator embedded-component 10162672f39b812dbfdbc3fa51f634c7851c1df1
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2ed3cf9965f8e6832cffde84f3de2fe210b79b49
https://github.com/openshift/cluster-policy-controller embedded-component eaea543f4c845a7b65705f12e162cc121bb12f88
https://github.com/openshift/csi-external-snapshotter embedded-component 5315d37a1e5415e8b6870f23e50238681979cc28
https://github.com/openshift/etcd embedded-component e7911c0d19925c0a67328052a8580a80fb40cb5b
https://github.com/openshift/kubernetes embedded-component 7cf4c058dab19556d71e98c02bed1798cb0a4a9c
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51
https://github.com/openshift/machine-config-operator embedded-component 8600a368d3b40d6e5bd7adfec1fb7a40cb6a217b
https://github.com/openshift/machine-config-operator embedded-component 4e8c9e662a0f5e3a841533fc0ace5cb203c7ca19
https://github.com/openshift/openshift-controller-manager embedded-component bcf6e58edbcc8e7ce6f7e4d0658635688e0fc114
https://github.com/openshift/operator-framework-olm embedded-component 48d68f52674ad5afb2d40d032abb0892a5dafee6
https://github.com/openshift/route-controller-manager embedded-component 3112b458983c6fca6f77d5a945fb0026186dace6
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.16.0-0.nightly-2025-04-02-132013" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2025-04-02-193148"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2025-04-02-211503" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2025-04-03-113148"