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.

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

salt: Fix invalid custom object Listing in Salt #2593

Merged
merged 1 commit into from
Jun 4, 2020

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

Context:

Listing for custom object do not work in our Salt k8s module

Summary:

We do not need any special case to List custom objects as python
kubernetes output the right output (same as the one from "classic
objects")


Fixes: #2592

We do not need any special case to List custom objects as python
kubernetes output the right output (same as the one from "classic
objects")

Fixes: #2592
@TeddyAndrieux TeddyAndrieux requested a review from a team June 3, 2020 16:50
@bert-e
Copy link
Contributor

bert-e commented Jun 3, 2020

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 Jun 3, 2020

Branches have diverged

This pull request's source branch bugfix/GH-2592-fix-list-custom-object-salt has diverged from
development/2.6 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/2.6 into bugfix/GH-2592-fix-list-custom-object-salt
  • Rebase bugfix/GH-2592-fix-list-custom-object-salt onto origin/development/2.6

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

@TeddyAndrieux TeddyAndrieux changed the base branch from development/2.6 to development/2.0 June 3, 2020 16:50
@bert-e
Copy link
Contributor

bert-e commented Jun 3, 2020

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

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 Jun 3, 2020

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:

Copy link
Contributor

@Ebaneck Ebaneck left a comment

Choose a reason for hiding this comment

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

Tested and it works as expected!

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jun 3, 2020

Build failed

The build for commit did not succeed in branch w/2.4/bugfix/GH-2592-fix-list-custom-object-salt.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jun 3, 2020

Build failed

The build for commit did not succeed in branch w/2.1/bugfix/GH-2592-fix-list-custom-object-salt.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jun 4, 2020

Build failed

The build for commit did not succeed in branch w/2.3/bugfix/GH-2592-fix-list-custom-object-salt.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jun 4, 2020

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.0

  • ✔️ development/2.1

  • ✔️ development/2.2

  • ✔️ development/2.3

  • ✔️ development/2.4

  • ✔️ development/2.5

  • ✔️ development/2.6

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3

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 Jun 4, 2020

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

  • ✔️ development/2.0

  • ✔️ development/2.1

  • ✔️ development/2.2

  • ✔️ development/2.3

  • ✔️ development/2.4

  • ✔️ development/2.5

  • ✔️ development/2.6

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3

Please check the status of the associated issue GH-2592.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 1b010b1 into development/2.0 Jun 4, 2020
@bert-e bert-e deleted the bugfix/GH-2592-fix-list-custom-object-salt branch June 4, 2020 06:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Custom salt k8s module to List do not work with CustomObjects
3 participants