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

feat: cleanup pod critical pod annotations feature #79554

Merged
merged 1 commit into from
Jul 12, 2019
Merged

feat: cleanup pod critical pod annotations feature #79554

merged 1 commit into from
Jul 12, 2019

Conversation

draveness
Copy link
Contributor

@draveness draveness commented Jun 29, 2019 •
edited by bsalamat
Loading

/kind cleanup
/priority important-soon
/assign @bsalamat
/sig scheduling
/sig node

What this PR does / why we need it:

Critical Pod Annotation is an experimental feature that lets Kubernetes control plane know about a pod being a critical pod by adding a specific annotation to the pod. This was added in 1.5 when K8s didn't have pod priority. Pod priority allows us to mark pods as critical with our first-class API. As a result, this feature was deprecated in 1.13. We can now remove the feature from our code base.

Which issue(s) this PR fixes:

Fixes #79548

Does this PR introduce a user-facing change?:

scheduler.alpha.kubernetes.io/critical-pod annotation is removed. Pod priority (spec.priorityClassName) should be used instead to mark pods as critical. Action required!

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. sig/node Categorizes an issue or PR as relevant to SIG Node. labels Jun 29, 2019
@draveness draveness force-pushed the feature/remove-critical-pod-annotation branch from 262419e to 8e06039 Compare June 29, 2019 03:10
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/kubelet area/test sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/gcp sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Jun 29, 2019
@draveness
Copy link
Contributor Author

/assign @derekwaynecarr @spiffxp

@draveness
Copy link
Contributor Author

/retest

@draveness draveness force-pushed the feature/remove-critical-pod-annotation branch 2 times, most recently from d70b7b9 to 202290d Compare June 29, 2019 11:49
mattjmcnaughton
mattjmcnaughton reviewed Jun 29, 2019
View reviewed changes
Copy link
Contributor

@mattjmcnaughton mattjmcnaughton left a comment

Choose a reason for hiding this comment

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

Two high level questions on the yaml from me - this code touches some parts I'm not super familiar with so going to leave the full review to someone else :)

cluster/addons/calico-policy-controller/calico-node-daemonset.yaml Outdated Show resolved Hide resolved
cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml Show resolved Hide resolved
@draveness
Copy link
Contributor Author

/retest

@draveness draveness force-pushed the feature/remove-critical-pod-annotation branch 2 times, most recently from 14d2e3c to 196f8ab Compare June 29, 2019 15:35
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 29, 2019
@draveness draveness force-pushed the feature/remove-critical-pod-annotation branch from 196f8ab to 8a5b10a Compare June 29, 2019 15:37
bsalamat
bsalamat reviewed Jul 8, 2019
View reviewed changes
Copy link
Member

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

Thanks, @draveness!

pkg/controller/daemon/daemon_controller_test.go
@@ -1820,7 +1820,6 @@ func TestInsufficientCapacityNodeDaemonLaunchesCriticalPod(t *testing.T) {
ds := newDaemonSet("critical")
ds.Spec.UpdateStrategy = *strategy
ds.Spec.Template.Spec = podSpec
setDaemonSetCritical(ds)
Copy link
Member

Choose a reason for hiding this comment

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

Yeah, I thought it was not necessary to check that non-critical daemonsets are not scheduled, but let's leave the check in.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 8, 2019
@draveness
Copy link
Contributor Author

Kindly ping @derekwaynecarr for approval.

@spiffxp
Copy link
Member

spiffxp commented Jul 10, 2019

/milestone v1.16

@k8s-ci-robot k8s-ci-robot added this to the v1.16 milestone Jul 10, 2019
@liggitt
Copy link
Member

liggitt commented Jul 10, 2019 •
edited
Loading

/approve

update the release note with the specific annotation that is no longer honored (so people can easily search their manifests) and the specific field (spec.priorityClassName) and priority class they should use instead

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bsalamat, draveness, liggitt, spiffxp

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 10, 2019
@draveness draveness force-pushed the feature/remove-critical-pod-annotation branch from 1312db8 to b6d41ee Compare July 11, 2019 00:54
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 11, 2019
@draveness
Copy link
Contributor Author

PR has been rebased, please take another look, @bsalamat @liggitt, thank you!

@bsalamat
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 12, 2019
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

1 similar comment
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit 642a06e into kubernetes:master Jul 12, 2019
@adelina-t adelina-t mentioned this pull request Jul 12, 2019
Closed
adelina-t added a commit to adelina-t/aks-engine that referenced this pull request Jul 15, 2019
@adelina-t
fix: Remove pod-critical annotations in 1.16 manifests.
25229aa 
Commit kubernetes/kubernetes#79554 in
kubernetes/kubernetes removed the ExperimentalCriticalPodAnnotation feature
in kubernetes 1.16.

This PR aligns aks-engine with those changes, removing the feature-gate from
kube-proxy daemonset and the pod-critical annotations from any manifest that
uses it.

Fixes: Azure#1617
@adelina-t adelina-t mentioned this pull request Jul 15, 2019
Merged
@yuchengwu yuchengwu mentioned this pull request Jul 16, 2019
Closed
@bsalamat
Copy link
Member

We have to revert this PR, as it caused a regression for static pods: #80203. After the static pod issue is addressed, we can resubmit this PR.

@draveness
Copy link
Contributor Author

draveness commented Jul 18, 2019 •
edited
Loading

We have to revert this PR, as it caused a regression for static pods: #80203. After the static pod issue is addressed, we can resubmit this PR.

I created #80277 to revert this PR and reopened the issue #79548

@draveness draveness mentioned this pull request Jul 19, 2019
Merged
openstack-mirroring pushed a commit to openstack/openstack-helm-infra that referenced this pull request Jun 7, 2023
@liupeng0518
replace scheduler.alpha.kubernetes.io/critical-pod with priorityClass…
0053fc5 
…Name

this feature was deprecated in 1.13. Now it`s not work.[1]

"scheduler.alpha.kubernetes.io/critical-pod annotation is removed. Pod priority (spec.priorityClassName) should be used instead to mark pods as critical. Action required!"[2]

[1]kubernetes/kubernetes#79548
[2]kubernetes/kubernetes#79554

Change-Id: I5913030634fe3f53b11ddb9bbe40d665f45a1254
openstack-mirroring pushed a commit to openstack/openstack that referenced this pull request Jun 7, 2023
@liupeng0518 @openstack-gerrit
Update git submodules
90301df 
* Update openstack-helm-infra from branch 'master'
  to 0053fc5737304e598dc2372413544a739c65e8b3
  - replace scheduler.alpha.kubernetes.io/critical-pod with priorityClassName
    
    this feature was deprecated in 1.13. Now it`s not work.[1]
    
    "scheduler.alpha.kubernetes.io/critical-pod annotation is removed. Pod priority (spec.priorityClassName) should be used instead to mark pods as critical. Action required!"[2]
    
    [1]kubernetes/kubernetes#79548
    [2]kubernetes/kubernetes#79554
    
    Change-Id: I5913030634fe3f53b11ddb9bbe40d665f45a1254
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spiffxp spiffxp spiffxp left review comments

@BenTheElder BenTheElder BenTheElder left review comments

@mattjmcnaughton mattjmcnaughton mattjmcnaughton left review comments

@bsalamat bsalamat bsalamat left review comments

@bowei bowei Awaiting requested review from bowei

Assignees

@spiffxp spiffxp

@derekwaynecarr derekwaynecarr

@bsalamat bsalamat

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. sig/testing Categorizes an issue or PR as relevant to SIG Testing. 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.

Remove Critical Pod Annotation
9 participants
@draveness @spiffxp @k8s-ci-robot @liggitt @bsalamat @fejta-bot @BenTheElder @mattjmcnaughton @derekwaynecarr