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

Automated cherry pick of #89963: Drop round-trip annotations in HPA conversion #89968

Merged
merged 2 commits into from
Apr 14, 2020
Merged

Automated cherry pick of #89963: Drop round-trip annotations in HPA conversion #89968

merged 2 commits into from
Apr 14, 2020

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Apr 8, 2020 •
edited
Loading

Cherry pick of #89963 on release-1.16.

#89963: Drop round-trip annotations in HPA conversion

For details on the cherry pick process, see the cherry pick requests page.

Fixes conversion error for HorizontalPodAutoscaler objects with invalid annotations

@k8s-ci-robot k8s-ci-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Apr 8, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.16 milestone Apr 8, 2020
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 8, 2020
@k8s-ci-robot k8s-ci-robot requested review from mml and piosz April 8, 2020 18:46
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 8, 2020
@liggitt liggitt force-pushed the automated-cherry-pick-of-#89967-upstream-release-1.16 branch from acbae1f to 2a62b9e Compare April 8, 2020 18:49
@liggitt liggitt mentioned this pull request Apr 8, 2020
Merged
@liggitt liggitt changed the title Automated cherry pick of #89967: Drop round-trip annotations in HPA conversion Automated cherry pick of #89963: Drop round-trip annotations in HPA conversion Apr 8, 2020
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 8, 2020
@liggitt
Copy link
Member Author

liggitt commented Apr 8, 2020

/sig autoscaling
/priority critical-urgent
/kind bug

@k8s-ci-robot k8s-ci-robot added sig/autoscaling Categorizes an issue or PR as relevant to SIG Autoscaling. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. kind/bug Categorizes issue or PR as related to a bug. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Apr 8, 2020
@liggitt
Copy link
Member Author

liggitt commented Apr 8, 2020

xref #88738

@liggitt liggitt mentioned this pull request Apr 8, 2020
Closed
@smarterclayton
Copy link
Contributor

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 14, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, smarterclayton

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

@tpepper tpepper added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 14, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Apr 14, 2020
@k8s-ci-robot k8s-ci-robot merged commit 25599b5 into kubernetes:release-1.16 Apr 14, 2020
@liggitt liggitt deleted the automated-cherry-pick-of-#89967-upstream-release-1.16 branch April 18, 2020 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DirectXMan12 DirectXMan12 Awaiting requested review from DirectXMan12

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

@mml mml Awaiting requested review from mml

@piosz piosz Awaiting requested review from piosz

Assignees

@smarterclayton smarterclayton

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/autoscaling Categorizes an issue or PR as relevant to SIG Autoscaling. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.16
Development

Successfully merging this pull request may close these issues.
5 participants
@liggitt @smarterclayton @k8s-ci-robot @tpepper @hakuna-matatah