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

[1.5] Automated cherry pick of #4160: Prune job label for kubernetes 1.27,prefix with #4264

Conversation

liangyuanpeng
Copy link
Contributor

@liangyuanpeng liangyuanpeng commented Nov 17, 2023

Cherry pick of #4160 on release-1.5.
#4160: Prune job label for kubernetes 1.27,prefix with
For details on the cherry pick process, see the cherry pick requests page.

`karmada-controller-manager`: Pruned job labels `batch.kubernetes.io/controller-uid` and `batch.kubernetes.io/job-name` which were introduced by Kubernetes 1.27.

@karmada-bot karmada-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 17, 2023
Copy link
Member

@XiShanYongYe-Chang XiShanYongYe-Chang left a comment

Choose a reason for hiding this comment

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

It seems that we can not cherry-pick directly.

@RainbowMango
Copy link
Member

It seems that we can not cherry-pick directly.

Yes, since release-1.5 is referencing the Kubernetes v1.26, it can not refer constants introduced in Kubernetes v1.27.

I think we can hardcode the label names here.

Signed-off-by: Lan Liang <gcslyp@gmail.com>
Co-authored-by: Hongcai Ren <renhongcai@huawei.com>
@liangyuanpeng liangyuanpeng force-pushed the automated-cherry-pick-of-#4160-upstream-release-1.5 branch from ebf6dee to 44d59f8 Compare November 22, 2023 08:32
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (bc59377) 49.14% compared to head (44d59f8) 49.14%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@             Coverage Diff              @@
##           release-1.5    #4264   +/-   ##
============================================
  Coverage        49.14%   49.14%           
============================================
  Files              203      203           
  Lines            18530    18530           
============================================
  Hits              9106     9106           
  Misses            8926     8926           
  Partials           498      498           
Flag Coverage Δ
unittests 49.14% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@liangyuanpeng liangyuanpeng changed the title Automated cherry pick of #4160: Prune job label for kubernetes 1.27,prefix with [1.5] Automated cherry pick of #4160: Prune job label for kubernetes 1.27,prefix with Nov 22, 2023
Copy link
Member

@RainbowMango RainbowMango 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

@karmada-bot karmada-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 22, 2023
@karmada-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: RainbowMango

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

@karmada-bot karmada-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 22, 2023
@karmada-bot karmada-bot merged commit 0b7a313 into karmada-io:release-1.5 Nov 22, 2023
11 checks passed
@pulsarsigs-bot pulsarsigs-bot deleted the automated-cherry-pick-of-#4160-upstream-release-1.5 branch November 22, 2023 10:29
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. lgtm Indicates that a PR is ready to be merged. 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.

5 participants