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

add migration for cluster user labels #4744

Merged
merged 1 commit into from
Nov 26, 2019
Merged

add migration for cluster user labels #4744

merged 1 commit into from
Nov 26, 2019

Conversation

zreigz
Copy link
Contributor

@zreigz zreigz commented Nov 26, 2019

What this PR does / why we need it: add migration for cluster user labels. Some clusters still have not used user and user_RAW labels.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

add migration for cluster user labels

@kubermatic-bot kubermatic-bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Nov 26, 2019
@kubermatic-bot kubermatic-bot added dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. team/lifecycle labels Nov 26, 2019
@alvaroaleman
Copy link
Contributor

/lgtm
/approve
/cherrypick release/v2.12

@kubermatic-bot
Copy link
Contributor

@alvaroaleman: once the present PR merges, I will cherry-pick it on top of release/v2.12 in a new PR and assign it to you.

In response to this:

/lgtm
/approve
/cherrypick release/v2.12

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/test-infra repository.

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 26, 2019
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: df34aaeef258b02e27463c6a5d85142c0eaa252b

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, zreigz

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 26, 2019
@zreigz
Copy link
Contributor Author

zreigz commented Nov 26, 2019

/retest

2 similar comments
@zreigz
Copy link
Contributor Author

zreigz commented Nov 26, 2019

/retest

@zreigz
Copy link
Contributor Author

zreigz commented Nov 26, 2019

/retest

@kubermatic-triage-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs

Review the full test history

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

Also, here is a cat.
/meow

@kubermatic-bot
Copy link
Contributor

@kubermatic-triage-bot: cat image

In response to this:

/retest
This bot automatically retries jobs that failed/flaked on approved PRs

Review the full test history

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

Also, here is a cat.
/meow

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/test-infra repository.

@zreigz
Copy link
Contributor Author

zreigz commented Nov 26, 2019

/retest

@kubermatic-triage-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs

Review the full test history

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

Also, here is a cat.
/meow

@kubermatic-bot
Copy link
Contributor

@kubermatic-triage-bot: cat image

In response to this:

/retest
This bot automatically retries jobs that failed/flaked on approved PRs

Review the full test history

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

Also, here is a cat.
/meow

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/test-infra repository.

@kubermatic-bot kubermatic-bot merged commit c0e154c into kubermatic:master Nov 26, 2019
@kubermatic-bot kubermatic-bot added this to the v2.13 milestone Nov 26, 2019
@kubermatic-bot
Copy link
Contributor

@alvaroaleman: #4744 failed to apply on top of branch "release/v2.12":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	api/pkg/crd/migrations/migrations.go
M	api/pkg/provider/kubernetes/user.go
Falling back to patching base and 3-way merge...
Auto-merging api/pkg/provider/kubernetes/user.go
Auto-merging api/pkg/crd/migrations/migrations.go
CONFLICT (content): Merge conflict in api/pkg/crd/migrations/migrations.go
Patch failed at 0001 add migration for cluster user labels

In response to this:

/lgtm
/approve
/cherrypick release/v2.12

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants