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

Support python-kubernetes client v11 #2554

Merged
merged 2 commits into from
May 17, 2020

Conversation

gdemonet
Copy link
Contributor

Component: salt, kubernetes

Context:

python2-kubernetes has been updated from v10 to v11 in epel - our Salt states/modules are now broken and no pre-merge will pass until we support it

Summary:

Cherry-picked commits from @Ebaneck's PR: #2449

Acceptance criteria:

Both pre-merge and post-merge should work

Ebaneck added 2 commits May 16, 2020 20:31
The `swagger_types` attributes have been renamed to `openapi_types`
and since we now package kubernetes client v11, let us make these changes
were applicable
…tes.client.api`

Running a salt state like:
```
$ salt-run state.sls metalk8s.addons.dex.deployed.service-configuration saltenv=metalk8s-2.5.1-dev
```
Returns the following warnings, so let us fix these warnings.

[WARNING ] /usr/lib/python2.7/site-packages/kubernetes/client/apis/__init__.py:12: DeprecationWarning: The package kubernetes.client.apis is renamed and deprecated, use
kubernetes.client.api instead (please note that the trailing s was removed).
  DeprecationWarning
@gdemonet gdemonet added kind:bug Something isn't working topic:deployment Bugs in or enhancements to deployment stages complexity:easy Something that requires less than a day to fix release:blocker An issue that blocks a release until resolved priority:urgent Any issue we should jump in as soon as possible labels May 16, 2020
@gdemonet gdemonet added this to the MetalK8s 2.4.4 milestone May 16, 2020
@gdemonet gdemonet requested a review from a team May 16, 2020 18:38
@bert-e
Copy link
Contributor

bert-e commented May 16, 2020

Hello gdemonet,

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

@NicolasT
Copy link
Contributor

This is also 02047bb, part of #2544

@gdemonet
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented May 16, 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

@gdemonet
Copy link
Contributor Author

This is also 02047bb, part of #2544

This commit updates to 12.0.0a1, not sure we want to include this in 2.0 :/ just handling the EPEL package upgrade for this PR.

@gdemonet
Copy link
Contributor Author

(upgrade from previous patch release passed, but can't run all post-merge because buildprev doesn't benefit from the changes in this PR)

@bert-e
Copy link
Contributor

bert-e commented May 17, 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 May 17, 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 None.

Goodbye gdemonet.

@bert-e bert-e merged commit d200ee2 into development/2.0 May 17, 2020
@bert-e bert-e deleted the bugfix/salt-master-k8s-client-11 branch May 17, 2020 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
complexity:easy Something that requires less than a day to fix kind:bug Something isn't working priority:urgent Any issue we should jump in as soon as possible release:blocker An issue that blocks a release until resolved topic:deployment Bugs in or enhancements to deployment stages
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants