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

Add support for CustomResourceDefinition apiextensions.k8s.io/v1 #2583

Merged
merged 2 commits into from
Jun 5, 2020
Merged

Add support for CustomResourceDefinition apiextensions.k8s.io/v1 #2583

merged 2 commits into from
Jun 5, 2020

Conversation

alexandre-allard
Copy link
Contributor

Component: salt

Context:

Summary:

Acceptance criteria:

@alexandre-allard alexandre-allard requested a review from a team as a code owner May 29, 2020 14:50
@bert-e
Copy link
Contributor

bert-e commented May 29, 2020

Hello alexandre-allard-scality,

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 May 29, 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
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

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 May 29, 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:

TeddyAndrieux
TeddyAndrieux previously approved these changes May 29, 2020
View reviewed changes
@alexandre-allard
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented May 29, 2020

Build failed

The build for commit did not succeed in branch improvement/support-apiextensions.k8s.io-v1-crd.

The following options are set: approve

alexandre-allard and others added 2 commits June 5, 2020 14:22
@alexandre-allard
salt: add support for apiextensions.k8s.io/v1 CustomResourceDefinition
998ed39
@NicolasT @alexandre-allard
images: install snapshot version of Python K8s client
6eed3c4 
The latest release doesn't contain fields for server-side apply
meta-information on CRDs, as supported in K8s 1.17 and generated by
`operator-sdk` 0.17.x. As such, installing a snapshot version for now.

See: kubernetes-client/python@c206745
(cherry picked from commit 02047bb)
@alexandre-allard alexandre-allard force-pushed the improvement/support-apiextensions.k8s.io-v1-crd branch from 9910ebb to 6eed3c4 Compare June 5, 2020 16:25
@bert-e
Copy link
Contributor

bert-e commented Jun 5, 2020

History mismatch

Merge commit #9910ebbf3724431dee6587820cac8202e5c6aede on the integration branch
w/2.6/improvement/support-apiextensions.k8s.io-v1-crd is merging a branch which is neither the current
branch improvement/support-apiextensions.k8s.io-v1-crd nor the development branch
development/2.6.

It is likely due to a rebase of the branch improvement/support-apiextensions.k8s.io-v1-crd 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

@alexandre-allard
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Jun 5, 2020

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 Jun 5, 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
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

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 Jun 5, 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:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jun 5, 2020

Build failed

The build for commit did not succeed in branch w/2.6/improvement/support-apiextensions.k8s.io-v1-crd.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jun 5, 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.5

  • ✔️ development/2.6

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

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 5, 2020

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

  • ✔️ development/2.5

  • ✔️ development/2.6

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

Please check the status of the associated issue None.

Goodbye alexandre-allard-scality.

@bert-e bert-e merged commit 6eed3c4 into development/2.5 Jun 5, 2020
@bert-e bert-e deleted the improvement/support-apiextensions.k8s.io-v1-crd branch June 5, 2020 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TeddyAndrieux TeddyAndrieux TeddyAndrieux approved these changes

@slaperche-scality slaperche-scality slaperche-scality left review comments

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

Successfully merging this pull request may close these issues.
5 participants
@alexandre-allard @bert-e @slaperche-scality @TeddyAndrieux @NicolasT