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

Merged
openshift-merge-bot[bot] merged 4 commits into
release-4.16from
rebase-release-4.16-4.16.0-0.nightly-2025-04-02-211503_amd64-2025-04-02_arm64-2025-04-03
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
openshift-merge-bot[bot] merged 4 commits into
release-4.16from
rebase-release-4.16-4.16.0-0.nightly-2025-04-02-211503_amd64-2025-04-02_arm64-2025-04-03

Conversation

@microshift-rebase-script

Copy link
Copy Markdown
Contributor

amd64: 4.16.0-0.nightly-2025-04-02-211503
arm64: 4.16.0-0.nightly-arm64-2025-04-03-113148
prow job: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/periodic-ci-openshift-microshift-release-4.16-rebase-on-nightlies/1909094067476631552

  • 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 OCPBUGS-32525: Check every MachineConfigPool for IPsec plugin existence cluster-network-operator#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
  • 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

/label tide/merge-method-squash
/label cherry-pick-approved
/label backport-risk-assessed
/label jira/valid-bug

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 7, 2025
@openshift-ci-robot

Copy link
Copy Markdown

@microshift-rebase-script[bot]: This pull request explicitly references no jira issue.

Details

In response to this:

amd64: 4.16.0-0.nightly-2025-04-02-211503
arm64: 4.16.0-0.nightly-arm64-2025-04-03-113148
prow job: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/periodic-ci-openshift-microshift-release-4.16-rebase-on-nightlies/1909094067476631552

  • 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 OCPBUGS-32525: Check every MachineConfigPool for IPsec plugin existence cluster-network-operator#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

  • 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

/label tide/merge-method-squash
/label cherry-pick-approved
/label backport-risk-assessed
/label jira/valid-bug

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Apr 7, 2025
@openshift-ci
openshift-ci Bot requested review from ggiguash and jerpeter1 April 7, 2025 04:24
@openshift-ci

openshift-ci Bot commented Apr 7, 2025

Copy link
Copy Markdown
Contributor

@microshift-rebase-script[bot]: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@pmtk

pmtk commented Apr 7, 2025

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 7, 2025
@openshift-ci

openshift-ci Bot commented Apr 7, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: microshift-rebase-script[bot], pmtk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 7, 2025
@openshift-merge-bot
openshift-merge-bot Bot merged commit 1669196 into release-4.16 Apr 7, 2025
@openshift-merge-bot
openshift-merge-bot Bot deleted the rebase-release-4.16-4.16.0-0.nightly-2025-04-02-211503_amd64-2025-04-02_arm64-2025-04-03 branch April 7, 2025 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants