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

salt: Do not consider all ISOs in /srv/scality as Solutions #3182

Merged
merged 1 commit into from
Mar 11, 2021
Merged

salt: Do not consider all ISOs in /srv/scality as Solutions #3182

merged 1 commit into from
Mar 11, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux commented Mar 9, 2021 •
edited
Loading

Component:

'salt', 'solutions'

Context:

#3128

Summary:

Add more check about MetalK8s solutions ISOs, the ISOs mounted in
/srv/scality also need to have a manifests.yaml with some expected
keys like a good kind and apiVersion, otherwise the mounted ISO is
ignored and consider as a non-metalk8s mountpoint

Fixes: #3128

@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner March 9, 2021 18:13
@bert-e
Copy link
Contributor

bert-e commented Mar 9, 2021

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Mar 9, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux TeddyAndrieux changed the base branch from development/2.9 to development/2.8 March 9, 2021 18:14
@bert-e
Copy link
Contributor

bert-e commented Mar 9, 2021

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Mar 9, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

gdemonet
gdemonet suggested changes Mar 10, 2021
View reviewed changes
salt/_modules/metalk8s_solutions.py Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
salt/_modules/metalk8s_solutions.py Outdated Show resolved Hide resolved
@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following reviewers are expecting changes from the author, or must review again:

@TeddyAndrieux TeddyAndrieux force-pushed the bugfix/do-not-fail-if-not-solution-iso-mounted branch from 2cf4e06 to 7d6b332 Compare March 10, 2021 14:06
@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2021

History mismatch

Merge commit #2cf4e065d3175564e27c2ab7d45fafd2c5184e04 on the integration branch
w/2.9/bugfix/do-not-fail-if-not-solution-iso-mounted is merging a branch which is neither the current
branch bugfix/do-not-fail-if-not-solution-iso-mounted nor the development branch
development/2.9.

It is likely due to a rebase of the branch bugfix/do-not-fail-if-not-solution-iso-mounted and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@TeddyAndrieux TeddyAndrieux force-pushed the bugfix/do-not-fail-if-not-solution-iso-mounted branch from 7d6b332 to 73dd33c Compare March 10, 2021 15:41
@TeddyAndrieux
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2021

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2021

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following reviewers are expecting changes from the author, or must review again:

gdemonet
gdemonet previously approved these changes Mar 10, 2021
View reviewed changes
tox.ini Outdated Show resolved Hide resolved
@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux
salt: Do not consider all ISOs in /srv/scality as Solutions
a0e3b60 
Add more check about MetalK8s solutions ISOs, the ISOs mounted in
`/srv/scality` also need to have a `manifests.yaml` with some expected
keys like a good `kind` and `apiVersion`, otherwise the mounted ISO is
ignored and consider as a non-metalk8s mountpoint.
NOTE: Also remove the `_is_solution_mount` as a function is not needed
to do this since we iter on the list anyway

Fixes: #3128
@TeddyAndrieux
Copy link
Collaborator Author

/approve

@TeddyAndrieux TeddyAndrieux force-pushed the bugfix/do-not-fail-if-not-solution-iso-mounted branch from 73dd33c to a0e3b60 Compare March 10, 2021 21:03
@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2021

History mismatch

Merge commit #73dd33c26392fc1a7d7521878d9c5dff28c09975 on the integration branch
w/2.9/bugfix/do-not-fail-if-not-solution-iso-mounted is merging a branch which is neither the current
branch bugfix/do-not-fail-if-not-solution-iso-mounted nor the development branch
development/2.9.

It is likely due to a rebase of the branch bugfix/do-not-fail-if-not-solution-iso-mounted and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

@TeddyAndrieux
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2021

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2021

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 11, 2021

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.8

  • ✔️ development/2.9

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 11, 2021

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.8

  • ✔️ development/2.9

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit a0e3b60 into development/2.8 Mar 11, 2021
@bert-e bert-e deleted the bugfix/do-not-fail-if-not-solution-iso-mounted branch March 11, 2021 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

MetalK8s considers all ISO mounts under /srv/scality to be 'solutions' and fails otherwise
3 participants
@TeddyAndrieux @bert-e @gdemonet