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

Jump to bottom

Multus Upgarde 4.15->4.16 - dropping holder design #9924

Merged

ebenahar merged 12 commits into red-hat-storage:master from OdedViner:multus_upgrade_holder

Jul 10, 2024

Contributor

OdedViner commented Jun 10, 2024

No description provided.


          Multus Upgarde 4.15->4.16 - dropping holder design

db5d0f7

Signed-off-by: oviner <[email protected]>

OdedViner requested a review from a team as a code owner

June 10, 2024 09:35

openshift-ci bot added the do-not-merge/work-in-progress label

pull-request-size bot added the size/L label


          fix code

89b2d79

Signed-off-by: oviner <[email protected]>

OdedViner changed the title ~~WIP: Multus Upgarde 4.15->4.16 - dropping holder design~~ Multus Upgarde 4.15->4.16 - dropping holder design

openshift-ci bot removed the do-not-merge/work-in-progress label

OdedViner added 4 commits

June 19, 2024 19:08


          fix code

27c0abe

Signed-off-by: oviner <[email protected]>


          fix docsting

0eb9e69

Signed-off-by: oviner <[email protected]>

fix

a8a30ac

Signed-off-by: oviner <[email protected]>


          fix code

c517a61

Signed-off-by: oviner <[email protected]>

ocs-ci reviewed

View reviewed changes

ocs-ci left a comment

PR validation

Cluster Name:
Cluster Configuration: conf/deployment/baremetal/upi_1az_rhcos_multus_nvme_intel_3m_3w.yaml
PR Test Suite: deployment
PR Test Path: tests/
Additional Test Params:
OCP VERSION: 4.15
OCS VERSION: 4.15
tested against branch: master

ocs-ci reviewed

View reviewed changes

ocs-ci left a comment

PR validation

Cluster Name:
Cluster Configuration: conf/deployment/baremetal/upi_1az_rhcos_multus_nvme_intel_3m_3w.yaml conf/ocsci/upgrade.yamlupgrade
PR Test Suite: deployment
PR Test Path: tests/
Additional Test Params:
OCP VERSION: 4.15
OCS VERSION: 4.15
tested against branch: master

Job FAILED (installation failed, tests not executed).

ocs-ci reviewed

View reviewed changes

ocs-ci left a comment

PR validation

Cluster Name:
Cluster Configuration: conf/deployment/baremetal/upi_1az_rhcos_multus_nvme_intel_3m_3w.yaml conf/ocsci/upgrade.yaml
PR Test Suite: deployment
PR Test Path: tests/
Additional Test Params:
OCP VERSION: 4.15
OCS VERSION: 4.15
tested against branch: master

Job FAILED (installation failed, tests not executed).

ocs-ci reviewed

View reviewed changes

ocs-ci left a comment

PR validation

Cluster Name:
Cluster Configuration: conf/deployment/baremetal/upi_1az_rhcos_multus_nvme_intel_3m_3w.yaml conf/ocsci/upgrade.yaml
PR Test Suite: deployment
PR Test Path: tests/
Additional Test Params:
OCP VERSION: 4.15
OCS VERSION: 4.15
tested against branch: master

Job FAILED (installation failed, tests not executed).

ocs-ci reviewed

View reviewed changes

ocs-ci left a comment

PR validation

Cluster Name:
Cluster Configuration: conf/deployment/baremetal/upi_1az_rhcos_multus_nvme_intel_3m_3w.yaml
PR Test Suite: ocp_upgrade or ocs_upgrade
PR Test Path: tests/
Additional Test Params:
OCP VERSION: 4.15
OCS VERSION: 4.15
tested against branch: master

Job FAILED (installation failed, tests not executed).

ocs-ci reviewed

View reviewed changes

ocs-ci left a comment

PR validation

Cluster Name:
Cluster Configuration: conf/deployment/baremetal/upi_1az_rhcos_multus_nvme_intel_3m_3w.yaml
PR Test Suite: ocp_upgrade or ocs_upgrade
PR Test Path: tests/
Additional Test Params:
OCP VERSION: 4.15
OCS VERSION: 4.15
tested against branch: master

Job FAILED (installation failed, tests not executed).

ocs-ci reviewed

View reviewed changes

ocs-ci left a comment

PR validation

Cluster Name:
Cluster Configuration: conf/deployment/baremetal/upi_1az_rhcos_multus_nvme_intel_3m_3w.yaml
PR Test Suite: ocp_upgrade or ocs_upgrade
PR Test Path: tests/
Additional Test Params:
OCP VERSION: 4.15
OCS VERSION: 4.15
tested against branch: master

Job FAILED (installation failed, tests not executed).

ocs-ci reviewed

View reviewed changes

ocs-ci left a comment

PR validation

Cluster Name:
Cluster Configuration: conf/deployment/baremetal/upi_1az_rhcos_multus_nvme_intel_3m_3w.yaml
PR Test Suite: ocp_upgrade or ocs_upgrade
PR Test Path: tests/
Additional Test Params:
OCP VERSION: 4.15
OCS VERSION: 4.15
tested against branch: master

Job FAILED (installation failed, tests not executed).


          fix code

9fc20ae

Signed-off-by: oviner <[email protected]>

ocs-ci reviewed

View reviewed changes

ocs-ci left a comment

PR validation

Cluster Name:
Cluster Configuration: conf/deployment/baremetal/upi_1az_rhcos_multus_nvme_intel_3m_3w.yaml
PR Test Suite: ocp_upgrade or ocs_upgrade
PR Test Path: tests/
Additional Test Params:
OCP VERSION: 4.15
OCS VERSION: 4.15
tested against branch: master

Job FAILED (installation failed, tests not executed).

ocs-ci reviewed

View reviewed changes

ocs-ci left a comment

PR validation

Cluster Name:
Cluster Configuration: conf/deployment/baremetal/upi_1az_rhcos_multus_nvme_intel_3m_3w.yaml
PR Test Suite: ocp_upgrade or ocs_upgrade
PR Test Path: tests/
Additional Test Params:
OCP VERSION: 4.15
OCS VERSION: 4.15
tested against branch: master

petr-balogh reviewed

View reviewed changes

ocs_ci/ocs/ocs_upgrade.py Outdated

Comment on lines 789 to 795

+                          ocs_install_verification(
+                              timeout=600,
+                              skip_osd_distribution_check=True,
+                              ocs_registry_image=upgrade_ocs.ocs_registry_image,
+                              post_upgrade_verification=False,
+                              version_before_upgrade=upgrade_ocs.version_before_upgrade,
+                          )

Member

petr-balogh Jul 3, 2024

This can be deleted most likely as we run ocs_install_verification on line 796

Contributor Author

OdedViner Jul 3, 2024

done

ocs_ci/helpers/helpers.py Outdated

Comment on lines 4829 to 4847

+                  # nad_obj = OCP(
+                  #     kind=constants.NETWORK_ATTACHEMENT_DEFINITION,
+                  #     namespace="default",
+                  #     resource_name="public-net",
+                  # )
+                  # params = f'{{"spec": {{"config": "a"}}}}'
+                  # nad_obj.patch(params=params, format_type="merge")
+                  # nad_obj = get_network_attachment_definitions(nad_name=nad_name, namespace=namespace)
+                  # nad_config_str = nad_obj.data["spec"]["config"]
+                  # nad_config_dict = json.loads(nad_config_str)
+                  # nad_config_dict["ipam"]["routes"] = [{"dst": config.ENV_DATA["multus_destination_route"]}]
+                  # nad_config_dict_string = json.dumps(nad_config_dict)
+                  # params = f"""[{{ "op": "replace", "path": "/spec/config",
+                  #             "value": {str(nad_config_dict_string)}}}]"""
+                  # nad_obj.patch(
+                  #     resource_name=nad_name,
+                  #     params=params.strip("\n"),
+                  #     format_type="json",
+                  # )

Member

petr-balogh Jul 3, 2024

? Leftovers

Contributor Author

OdedViner Jul 3, 2024

removed


          fix code

18164dc

Signed-off-by: oviner <[email protected]>

petr-balogh previously approved these changes

View reviewed changes

openshift-ci bot assigned petr-balogh

openshift-ci bot added the lgtm label

AviadP previously approved these changes

View reviewed changes

openshift-ci bot assigned AviadP

ebenahar reviewed

View reviewed changes

ocs_ci/helpers/helpers.py

		schedule_nodes([worker_node_name])


		def configure_node_network_configuration_policy_on_all_worker_nodes():

Contributor

ebenahar Jul 7, 2024

is this applicable to compact mode clusters, where each node serves as both worker and master?

Contributor Author

OdedViner Jul 7, 2024

I dont know, we dont run multus on compact mode.

Contributor

ebenahar Jul 8, 2024

@OdedViner can you add a comment in the code saying this might require changes for compact mode?

ocs_ci/helpers/helpers.py Outdated

+                  """
+                  Verify csi holder pods do not exist
+                  Returns:

Contributor

ebenahar Jul 7, 2024

Raises

Contributor Author

OdedViner Jul 7, 2024

done

ocs_ci/ocs/ocs_upgrade.py Outdated

@@ @@ -782,6 +782,10 @@ def run_ocs_upgrade( @@
                       # in pending state
                       is_all_csvs_succeeded = check_all_csvs_are_succeeded(namespace=namespace)
                       assert is_all_csvs_succeeded, "Not all CSV's are in succeeded state"
+                      if config.ENV_DATA.get("is_multus_enabled"):

Contributor

ebenahar Jul 7, 2024

shouldn't we also check if the target cluster version is 4.16?

Contributor Author

OdedViner Jul 7, 2024

we are working with branches so we dont need to add condition for ODF version

Contributor

ebenahar Jul 8, 2024

but this will remain the same also in 4.17, where this change won't be required

Contributor Author

OdedViner Jul 8, 2024 •

edited

Loading

I added a configuration file. because we need to test it on ODF4.15->4.16 and on ODF4.16-4.17:

Test case 1:
Deploy OCP4.15+ODF4.15+Multus [cluster-net+public_net, cluster_net_only, public_net_only]
upgrade OCP4.15->16
upgrade ODF4.15->16 [holder pods exist but we don't delete them]
upgrade OCP4.16->17
upgrade ODF4.16-> 17
Run " forcefully disable holder pods"

Test case 2:
Deploy OCP4.15+ODF4.15+Multus [cluster-net+public_net, cluster_net_only, public_net_only]
upgrade OCP4.15->16
upgrade ODF4.15->16
Run " forcefully disable holder pods"
upgrade OCP4.16->17
upgrade ODF4.16-> 17 [holder pods do not exist]


          fix code

4cf0320

Signed-off-by: oviner <[email protected]>

OdedViner dismissed stale reviews from AviadP and petr-balogh via

4cf0320

July 7, 2024 14:16

openshift-ci bot removed the lgtm label

OdedViner added 2 commits

July 8, 2024 10:41


          added conf file

74dd454

Signed-off-by: oviner <[email protected]>


          fix code

Signed-off-by: oviner <[email protected]>

ebenahar previously approved these changes

View reviewed changes

openshift-ci bot assigned ebenahar

openshift-ci bot added the lgtm label

AviadP previously approved these changes

View reviewed changes

ocs-ci reviewed

View reviewed changes

ocs-ci left a comment

PR validation

Cluster Name:
Cluster Configuration: conf/deployment/baremetal/upi_1az_rhcos_multus_nvme_intel_3m_3w.yaml conf/ocsci/multus_delete_csi_holder_pods.yaml
PR Test Suite: ocp_upgrade or ocs_upgrade
PR Test Path: tests/
Additional Test Params:
OCP VERSION: 4.15
OCS VERSION: 4.15
tested against branch: master


          fix code

0abfcbf

Signed-off-by: oviner <[email protected]>

OdedViner dismissed stale reviews from AviadP and ebenahar via

0abfcbf

July 9, 2024 14:11

openshift-ci bot removed the lgtm label

ocs-ci reviewed

View reviewed changes

ocs-ci left a comment

PR validation

Cluster Name:
Cluster Configuration: conf/deployment/baremetal/upi_1az_rhcos_multus_nvme_intel_3m_3w.yaml conf/ocsci/multus_delete_csi_holder_pods.yaml
PR Test Suite: ocp_upgrade or ocs_upgrade
PR Test Path: tests/
Additional Test Params:
OCP VERSION: 4.15
OCS VERSION: 4.15
tested against branch: master

OdedViner added the Verified label

ebenahar approved these changes

View reviewed changes

openshift-ci bot added the lgtm label

AviadP approved these changes

View reviewed changes

openshift-ci bot commented Jul 10, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: AviadP, ebenahar, OdedViner

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

Needs approval from an approver in each of these files:

OWNERS

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

ebenahar merged commit 058e533 into red-hat-storage:master

6 of 7 checks passed

amr1ta pushed a commit to amr1ta/ocs-ci that referenced this pull request


          Multus Upgarde 4.15->4.16 - dropping holder design (red-hat-storage#9924

4ba0677

)


Signed-off-by: oviner <[email protected]>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm size/L Verified