Skip to content

Remove deprecated HPAContainerMetrics feature gate from templates #5242

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

Merged
merged 1 commit into from
Nov 5, 2024

Conversation

nojnhuh
Copy link
Contributor

@nojnhuh nojnhuh commented Nov 5, 2024

What type of PR is this?
/kind failing-test

What this PR does / why we need it:

This PR fixes an error when running ci-version templates with bleeding-edge Kubernetes that includes this change to remove a feature gate that we reference in templates: kubernetes/kubernetes#126862

This is the error that pops up in the kube-controller-manager logs:

E1105 21:29:48.482259       1 run.go:72] "command failed" err="unrecognized feature gate: HPAContainerMetrics"

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 #

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 5, 2024
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 5, 2024
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 5, 2024

/cherry-pick release-1.16
/cherry-pick release-1.17

@k8s-infra-cherrypick-robot

@nojnhuh: once the present PR merges, I will cherry-pick it on top of release-1.16, release-1.17 in new PRs and assign them to you.

In response to this:

/cherry-pick release-1.16
/cherry-pick release-1.17

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.

Copy link

codecov bot commented Nov 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 52.77%. Comparing base (e2ad4e2) to head (fa612e8).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5242      +/-   ##
==========================================
- Coverage   52.78%   52.77%   -0.01%     
==========================================
  Files         270      270              
  Lines       29057    29057              
==========================================
- Hits        15337    15335       -2     
- Misses      12928    12930       +2     
  Partials      792      792              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/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 Nov 5, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 4cb2e9a98710c8d460925441882fdcc9c4d47795

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 5, 2024
@k8s-ci-robot k8s-ci-robot merged commit d1899f8 into kubernetes-sigs:main Nov 5, 2024
26 of 29 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Nov 5, 2024
@k8s-infra-cherrypick-robot

@nojnhuh: #5242 failed to apply on top of branch "release-1.16":

Applying: Remove deprecated HPAContainerMetrics feature gate from templates
Using index info to reconstruct a base tree...
A	templates/test/ci/cluster-template-prow-ci-version-dra.yaml
M	templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
M	templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
M	templates/test/ci/cluster-template-prow-ci-version.yaml
A	templates/test/ci/patches/dra-kubeadmcontrolplane.yaml
A	templates/test/dev/cluster-template-custom-builds-dra.yaml
M	templates/test/dev/cluster-template-custom-builds.yaml
Falling back to patching base and 3-way merge...
Auto-merging templates/test/dev/cluster-template-custom-builds.yaml
Auto-merging templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
CONFLICT (content): Merge conflict in templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
CONFLICT (modify/delete): templates/test/ci/patches/dra-kubeadmcontrolplane.yaml deleted in HEAD and modified in Remove deprecated HPAContainerMetrics feature gate from templates. Version Remove deprecated HPAContainerMetrics feature gate from templates of templates/test/ci/patches/dra-kubeadmcontrolplane.yaml left in tree.
Removing templates/test/ci/patches/controller-manager-featuregates.yaml
Auto-merging templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
CONFLICT (content): Merge conflict in templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
Auto-merging templates/test/ci/cluster-template-prow-ci-version.yaml
Auto-merging templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
Auto-merging templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Remove deprecated HPAContainerMetrics feature gate from templates

In response to this:

/cherry-pick release-1.16
/cherry-pick release-1.17

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.

@k8s-infra-cherrypick-robot

@nojnhuh: new pull request created: #5243

In response to this:

/cherry-pick release-1.16
/cherry-pick release-1.17

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.

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. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants