Skip to content
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

[release-4.15] OCPBUGS-34927: Correct out-of-bounds check #172

Merged
merged 1 commit into from
Jun 13, 2024
Merged

[release-4.15] OCPBUGS-34927: Correct out-of-bounds check #172

merged 1 commit into from
Jun 13, 2024

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #170

/assign stephenfin

/cherrypick release-4.14

@stephenfin
OCPBUGS-34870: Correct out-of-bounds check
99244f0 
Ensure that we have the same number or fewer compute AZs than volume
AZs. Also better handle mismatches between the two .

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Suggested-by: Daniel Kobras
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jun 5, 2024
Merged
@openshift-ci openshift-ci bot requested review from mandre and mdbooth June 5, 2024 09:04
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-34870 has been cloned as Jira Issue OCPBUGS-34927. Will retitle bug to link to clone.
/retitle [release-4.15] OCPBUGS-34927: Correct out-of-bounds check

In response to this:

This is an automated cherry-pick of #170

/assign stephenfin

/cherrypick release-4.14

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 changed the title [release-4.15] OCPBUGS-34870: Correct out-of-bounds check [release-4.15] OCPBUGS-34927: Correct out-of-bounds check Jun 5, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 5, 2024
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-34927, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"
  • expected dependent Jira Issue OCPBUGS-34870 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead
  • expected dependent Jira Issue OCPBUGS-34870 to target a version in 4.16.0, but it targets "4.17.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is an automated cherry-pick of #170

/assign stephenfin

/cherrypick release-4.14

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.

@stephenfin
Copy link
Contributor

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@stephenfin: This pull request references Jira Issue OCPBUGS-34927, which is invalid:

  • expected dependent Jira Issue OCPBUGS-34882 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@mandre
Copy link
Member

mandre commented Jun 11, 2024

/retest

1 similar comment
@mandre
Copy link
Member

mandre commented Jun 12, 2024

/retest

@mandre
Copy link
Member

mandre commented Jun 13, 2024

Unrelated failure. Let's try again.
/test e2e-openstack-csi

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jun 13, 2024

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

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.

@mandre
Copy link
Member

mandre commented Jun 13, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 13, 2024
@openshift-ci-robot
Copy link
Contributor

@mandre: This pull request references Jira Issue OCPBUGS-34927, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-34882 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-34882 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (itbrown@redhat.com), skipping review request.

In response to this:

/jira refresh

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.

mandre
mandre reviewed Jun 13, 2024
View reviewed changes
Copy link
Member

@mandre mandre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 13, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 13, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jun 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mandre, openshift-cherrypick-robot

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

The pull request process is described here

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 Jun 13, 2024
@rlobillo
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 13, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 5b47d5d into openshift:release-4.15 Jun 13, 2024
6 checks passed
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-34927: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-34927 has been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #170

/assign stephenfin

/cherrypick release-4.14

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-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jun 13, 2024
Merged
@openshift-cherrypick-robot
Copy link
Author

@openshift-cherrypick-robot: new pull request created: #173

In response to this:

This is an automated cherry-pick of #170

/assign stephenfin

/cherrypick release-4.14

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.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-openstack-cinder-csi-driver-operator-container-v4.15.0-202406131036.p0.g5b47d5d.assembly.stream.el8 for distgit ose-openstack-cinder-csi-driver-operator.
All builds following this will include this PR.

@rlobillo
Copy link

/ocpbugs cc-qa

@rlobillo
Copy link

/label qe-approved

Pre-verified on top of RHOS-17.1-RHEL-9-20240516.n.1 in 2 different scenarios:

Scenario 1: compute AZs == volume AZs: enable_topology: "true"

(shiftstack) [stack@undercloud-0 ~]$ openstack availability zone list --compute && openstack availability zone list --volume                                                                                                                 
+-----------+-------------+
| Zone Name | Zone Status |
+-----------+-------------+
| nova      | available   |
+-----------+-------------+
+-----------+-------------+
| Zone Name | Zone Status |
+-----------+-------------+
| nova      | available   |
+-----------+-------------+
(shiftstack) [stack@undercloud-0 ~]$ oc get cm/cloud-conf -o yaml                                                                                                                                                                            
apiVersion: v1
data:
  cloud.conf: |+
    [Global]
    region      = regionOne
    ca-file     = /etc/kubernetes/static-pod-resources/configmaps/cloud-config/ca-bundle.pem
    use-clouds  = true
    clouds-file = /etc/kubernetes/secret/clouds.yaml
    cloud       = openstack

    [LoadBalancer]
    floating-network-id = 663be8b6-09db-4be4-bb33-7fc87c0ec51a

  enable_topology: "true"
kind: ConfigMap
metadata:
  creationTimestamp: "2024-06-13T12:44:44Z"
  name: cloud-conf
  namespace: openshift-cluster-csi-drivers
  resourceVersion: "7503"
  uid: 725e3c41-1a69-4055-86c0-13a98b389a50
(shiftstack) [stack@undercloud-0 ~]$ oc get pods                                                                                                                                                                                             
NAME                                                      READY   STATUS    RESTARTS   AGE
manila-csi-driver-operator-958dc4774-c4mpc                1/1     Running   0          27m
openstack-cinder-csi-driver-controller-559d5dd789-89pnv   10/10   Running   0          26m
openstack-cinder-csi-driver-controller-559d5dd789-kwcg8   10/10   Running   0          27m
openstack-cinder-csi-driver-node-6jc2x                    3/3     Running   0          27m
openstack-cinder-csi-driver-node-b8krw                    3/3     Running   0          14m
openstack-cinder-csi-driver-node-frtln                    3/3     Running   0          14m
openstack-cinder-csi-driver-node-sjhrg                    3/3     Running   0          27m
openstack-cinder-csi-driver-node-svqvm                    3/3     Running   0          27m
openstack-cinder-csi-driver-node-vwpn5                    3/3     Running   0          14m
openstack-cinder-csi-driver-operator-6769785dd9-b2h6r     1/1     Running   0          28m

(shiftstack) [stack@undercloud-0 ~]$ oc get co/storage
NAME      VERSION                                                   AVAILABLE   PROGRESSING   DEGRADED   SINCE   MESSAGE
storage   4.15.0-0.ci.test-2024-06-13-101606-ci-ln-lbxb4pk-latest   True        False         False      3h17m

Scenario 2: len(compute AZs) > len(volume AZ)s: enable_topology: "false":

(shiftstack) [stack@undercloud-0 ~]openstack availability zone list --compute && openstack availability zone list --volume           
+-----------+-------------+
| Zone Name | Zone Status |
+-----------+-------------+
| AZ-0      | available   |
| nova      | available   |
| z-nova    | available   |
+-----------+-------------+
+-----------+-------------+
| Zone Name | Zone Status |
+-----------+-------------+
| nova      | available   |
| AZ-0      | available   |
+-----------+-------------+

$ oc get cm/cloud-conf -o yaml         
apiVersion: v1
data:
  cloud.conf: |+
    [Global]
    region      = regionOne
    ca-file     = /etc/kubernetes/static-pod-resources/configmaps/cloud-config/ca-bundle.pem
    use-clouds  = true
    clouds-file = /etc/kubernetes/secret/clouds.yaml
    cloud       = openstack

    [LoadBalancer]
    floating-network-id = c25b675c-90ad-4362-bc15-7b7a925a7ed9

  enable_topology: "false"
kind: ConfigMap
metadata:
  creationTimestamp: "2024-06-13T15:48:07Z"
  name: cloud-conf
  namespace: openshift-cluster-csi-drivers
  resourceVersion: "7807"
  uid: 52aa6424-9283-443c-8669-5b02cb7d7758

(shiftstack) [stack@undercloud-0 ~]$ oc get co/storage
NAME      VERSION                                                   AVAILABLE   PROGRESSING   DEGRADED   SINCE   MESSAGE
storage   4.15.0-0.ci.test-2024-06-13-101606-ci-ln-lbxb4pk-latest   True        False         False      12m     
(shiftstack) [stack@undercloud-0 ~]$ oc get pods
NAME                                                     READY   STATUS    RESTARTS   AGE
manila-csi-driver-operator-958dc4774-zs6dj               1/1     Running   0          13m
openstack-cinder-csi-driver-controller-9fcf9565b-gdfs5   10/10   Running   0          12m
openstack-cinder-csi-driver-controller-9fcf9565b-nfn5g   10/10   Running   0          13m
openstack-cinder-csi-driver-node-896zv                   3/3     Running   0          2m24s
openstack-cinder-csi-driver-node-dxzzs                   3/3     Running   0          2m57s
openstack-cinder-csi-driver-node-g2qnj                   3/3     Running   0          12m
openstack-cinder-csi-driver-node-jdwj7                   3/3     Running   0          2m56s
openstack-cinder-csi-driver-node-jfmpw                   3/3     Running   0          12m
openstack-cinder-csi-driver-node-rsdjd                   3/3     Running   0          12m
openstack-cinder-csi-driver-operator-6769785dd9-clm4s    1/1     Running   0          13m

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jun 13, 2024
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-34927 is in an unrecognized state (ON_QA) and will not be moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #170

/assign stephenfin

/cherrypick release-4.14

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-merge-robot
Copy link
Contributor

Fix included in accepted release 4.15.0-0.nightly-2024-06-13-115627

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

@mandre mandre mandre left review comments

@mdbooth mdbooth Awaiting requested review from mdbooth

Assignees

@mandre mandre

@stephenfin stephenfin

@eurijon eurijon

@itzikb-redhat itzikb-redhat

@rlobillo rlobillo

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. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@openshift-cherrypick-robot @openshift-ci-robot @stephenfin @mandre @rlobillo @openshift-bot @openshift-merge-robot @eurijon @itzikb-redhat