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

Merge https://github.com/kubernetes/autoscaler:master (e179f01) into master #320

Open
wants to merge 659 commits into
base: master
Choose a base branch
from

Conversation

cloud-team-rebase-bot[bot]
Copy link

No description provided.

@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 10, 2024
Copy link

openshift-ci bot commented Oct 10, 2024

Hi @cloud-team-rebase-bot[bot]. Thanks for your PR.

I'm waiting for a openshift 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-sigs/prow repository.

@openshift-ci openshift-ci bot requested review from frobware and JoelSpeed October 10, 2024 13:39
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (e193af0) into master Merge https://github.com/kubernetes/autoscaler:master (085a2e6) into master Oct 14, 2024
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (085a2e6) into master Merge https://github.com/kubernetes/autoscaler:master (64a6432) into master Oct 17, 2024
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (64a6432) into master Merge https://github.com/kubernetes/autoscaler:master (0009760) into master Oct 21, 2024
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 23, 2024
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (0009760) into master Merge https://github.com/kubernetes/autoscaler:master (e90519a) into master Oct 24, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 24, 2024
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (e90519a) into master Merge https://github.com/kubernetes/autoscaler:master (6a02299) into master Oct 28, 2024
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (6a02299) into master Merge https://github.com/kubernetes/autoscaler:master (a6a77b3) into master Oct 31, 2024
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (a6a77b3) into master Merge https://github.com/kubernetes/autoscaler:master (8d90fc4) into master Nov 4, 2024
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (8d90fc4) into master Merge https://github.com/kubernetes/autoscaler:master (0e85453) into master Nov 7, 2024
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (0e85453) into master Merge https://github.com/kubernetes/autoscaler:master (ddd3da4) into master Nov 11, 2024
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (ddd3da4) into master Merge https://github.com/kubernetes/autoscaler:master (59aefbc) into master Nov 14, 2024
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (59aefbc) into master Merge https://github.com/kubernetes/autoscaler:master (b01bff1) into master Nov 18, 2024
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (b01bff1) into master Merge https://github.com/kubernetes/autoscaler:master (4c37ff3) into master Nov 21, 2024
raywainman and others added 24 commits January 16, 2025 18:20
…h-no-vmss

fix: don't crash when vmss not present or has no nodes
…cs-annotation

Add metrics-server annotation for kwok-provider managed nodes
…build-tags-hygiene

add test-build-tags make target
Document VPA behavior for sidecar containers and how to change it
Bumps golang from 1.23.4 to 1.23.5.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…vertical-pod-autoscaler/pkg/updater/golang-1.23.5

Bump golang from 1.23.4 to 1.23.5 in /vertical-pod-autoscaler/pkg/updater
…master

Update default VPA version to 1.2.2 in main branch
This change carries files and modifications that are used by OpenShift
release infrastructure and related files.

* spec file
* dockerfiles
  * vertical-pod-autoscaler/Dockerfile.rhel
  * vertical-pod-autoscaler/Dockerfile.openshift
  * images/cluster-autoscaler/Dockerfile
  * images/cluster-autoscaler/Dockerfile.rhel
* hack scripts (ci and build related)
* Makefile
* JUnit tools
* update gitignore
* update/remove OWNERS files
* ci-operator config yaml
* add vendor folders for cluster-autoscaler and balancer
* add Snyk file to exclude vendor directories and problematic cloud
  providers on scan

# Conflicts:
#	addon-resizer/OWNERS
#	charts/OWNERS
…otation

The delete annotation upstream has a different format, but is now
inferred dynamically from the API group. If we update this in MAO to use
the new format, we can drop this old key
This change re-adds the machine api support for labels and taints on
node groups. The code was removed upstream as it is openshift specific,
see this pull request[0].

It also adds in the functionality of the upstream override annotation
for labels and taints[1] to support
https://issues.redhat.com/browse/MIXEDARCH-259

[0]: kubernetes#5249
[1]: kubernetes#5382
the upstream annotations for the scale from zero capacity resources is
slighty different than the openshift implementation. the largest
difference is the addition of a gpu type annotation. openshift does not
yet utilize this annotation and thus this patch should be carried until
the machineset controllers for the various providers on openshift have
been modified to use the new annotations.

another important change is the modification of the memory annotation.
previously in openshift we expected this value to be a count of memory
in Mebibytes. the conversion function and tests have been modified to
allow continued openshift operation.

this change can be dropped when the annotations in openshift have been
updated, the progress for this effort can be followed at
https://issues.redhat.com/browse/OCPCLOUD-944
…ider

This change corrects the behavior for parsing taints from the
unstructured scalable resource. This is required on OpenShift as our
implementation is slightly different from the upstream.
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/kubernetes/autoscaler:master (ea52310) into master Merge https://github.com/kubernetes/autoscaler:master (e179f01) into master Jan 20, 2025
@JoelSpeed
Copy link

/ok-to-test

@openshift-ci openshift-ci bot 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 Jan 20, 2025
Copy link

openshift-ci bot commented Jan 20, 2025

@cloud-team-rebase-bot[bot]: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/git-history 3eebebe link false /test git-history
ci/prow/images 3eebebe link true /test images
ci/prow/e2e-aws-periodic-pre 3eebebe link false /test e2e-aws-periodic-pre
ci/prow/unit 3eebebe link true /test unit
ci/prow/govet 3eebebe link true /test govet
ci/prow/e2e-hypershift 3eebebe link true /test e2e-hypershift
ci/prow/e2e-aws 3eebebe link true /test e2e-aws
ci/prow/e2e-azure-operator 3eebebe link false /test e2e-azure-operator
ci/prow/e2e-gcp-operator 3eebebe link false /test e2e-gcp-operator
ci/prow/okd-scos-e2e-aws-ovn 3eebebe link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-aws-operator 3eebebe link true /test e2e-aws-operator
ci/prow/e2e-azure-periodic-pre 3eebebe link false /test e2e-azure-periodic-pre

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.