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

Reorder HPA resource list to work with GitOps tooling #6505

Merged
merged 1 commit into from
Nov 24, 2020
Merged

Reorder HPA resource list to work with GitOps tooling #6505

merged 1 commit into from
Nov 24, 2020

Conversation

Voziv
Copy link
Contributor

@Voziv Voziv commented Nov 23, 2020

What this PR does / why we need it:

Using GitOps with ArgoCD currently causes infinite syncing when using both cpu and memory resource metrics for autoscaling.

Related: argoproj/argo-cd#1079
Related: kubernetes/kubernetes#74099

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Which issue/s this PR fixes

How Has This Been Tested?

Have had to make the same change in other places for the same reason. Kubernetes reorders the list order on the HPA to be Memory, then CPU.

This same change was applied to nginx-ingress in helm/charts#22626

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 23, 2020
@k8s-ci-robot
Copy link
Contributor

Welcome @Voziv!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 23, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @Voziv. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 23, 2020
@Voziv Voziv marked this pull request as ready for review November 23, 2020 20:17
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 23, 2020
@aledbf
Copy link
Member

aledbf commented Nov 24, 2020

@Voziv please update the changelog and list mentioned in the comment
https://github.com/kubernetes/ingress-nginx/blob/2d7b971358e9786cb8e6638749a7a5424b4da5e7/charts/ingress-nginx/Chart.yaml#L3-L4

Edit: also, please squash the commits

@aledbf
Copy link
Member

aledbf commented Nov 24, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 24, 2020
@Voziv
Copy link
Contributor Author

Voziv commented Nov 24, 2020

Currently just editing via the github interface, will clone and squash the commits tomorrow.

@aledbf I've updated the change log, however I'm not sure how to edit the artifacthub.io/changes that the comment is referring to.

@aledbf
Copy link
Member

aledbf commented Nov 24, 2020

Currently just editing via the github interface, will clone and squash the commits tomorrow.

@aledbf I've updated the change log, however I'm not sure how to edit the artifacthub.io/changes that the comment is referring to.

Just replace https://github.com/kubernetes/ingress-nginx/blob/master/charts/ingress-nginx/Chart.yaml#L23

@Voziv Voziv changed the title Re-order hpa resource list Reorder HPA resource list to work with GitOps tooling Nov 24, 2020
@Voziv
Copy link
Contributor Author

Voziv commented Nov 24, 2020

Oh that's embarassing, I was totally looking at the site instead of in the file itself.

Updated and rebased.

I've also tested the change on a dev cluster and argocd no longer goes into an infinite loop, hurray!

@aledbf
Copy link
Member

aledbf commented Nov 24, 2020

/approve
/lgtm

@aledbf
Copy link
Member

aledbf commented Nov 24, 2020

@Voziv thanks!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, Voziv

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

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 24, 2020
@k8s-ci-robot k8s-ci-robot merged commit 5a282c0 into kubernetes:master Nov 24, 2020
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants