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

Remove elevated permissions from metrics-server #884

Merged
merged 2 commits into from
Nov 5, 2021
Merged

Remove elevated permissions from metrics-server #884

merged 2 commits into from
Nov 5, 2021

Conversation

shuaich
Copy link
Contributor

@shuaich shuaich commented Nov 5, 2021

Description

A non-privileged port 10250 is used as targetPort, which enables the
removal of capability cap_net_bind_service, please refer to
kubernetes/kubernetes#105957

Testing

  • Manual Testing
    Create a k8s cluster using kubetest2 with gce as provider and deploy metrics-server with the update image. Manually query metrics.k8s.io API.
kubectl get --raw /apis/metrics.k8s.io/v1beta1/nodes
kubectl get --raw /apis/metrics.k8s.io/v1beta1/nodes/${worker_node}
kubectl get --raw /apis/metrics.k8s.io/v1beta1/pods
kubectl get --raw /apis/metrics.k8s.io/v1beta1/namespaces/kube-system/pods/${system_pod}
kubectl get --raw /apis/metrics.k8s.io/v1beta1/namespaces/default/pods/${user_pod}
  • Unit Testing & e2e Testing
make test-unit
make test-version
make test-e2e

What this PR does / why we need it:
This PR rolls back capability cap_net_bind_service.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
No

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 5, 2021
@k8s-ci-robot
Copy link
Contributor

Welcome @shuaich!

It looks like this is your first PR to kubernetes-sigs/metrics-server 🎉. 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-sigs/metrics-server 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 5, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @shuaich. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 5, 2021
@shuaich
Copy link
Contributor Author

shuaich commented Nov 5, 2021

/cc @serathius

@serathius
Copy link
Contributor

Can you also update port number to non privileged in https://github.com/kubernetes-sigs/metrics-server/blob/master/manifests/base/deployment.yaml#L35

@shuaich
Copy link
Contributor Author

shuaich commented Nov 5, 2021

Updated the secure-port and containerPort to use 10250.

@serathius
Copy link
Contributor

/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 5, 2021
@serathius
Copy link
Contributor

Please update port in https://github.com/kubernetes-sigs/metrics-server/blob/master/test/e2e_test.go#L228

Removing cap also means we can remove buildx in https://github.com/kubernetes-sigs/metrics-server/blob/master/Makefile#L48
The docker pull is also not needed.

For this MS distribution we might want to other port number than Kubelet port. Could you change it to 4443, which is more natural.

A non-privileged port 10250 is used as targetPort, which enables the
removal of capability cap_net_bind_service, please refer to
kubernetes/kubernetes#105957
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 5, 2021
@serathius
Copy link
Contributor

/lgtm

@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, 2021
@serathius
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: serathius, shuaich

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, 2021
@k8s-ci-robot k8s-ci-robot merged commit 7e34a60 into kubernetes-sigs:master Nov 5, 2021
@shuaich
Copy link
Contributor Author

shuaich commented Nov 9, 2021

/cherrypick release-0.5

k8s-ci-robot added a commit that referenced this pull request Nov 10, 2021
Cherrypick pull request #884 from shuaich/remove_elevated_permission to release-0.5
k8s-ci-robot added a commit that referenced this pull request Nov 15, 2021
Cherypick pull request #884 from shuaich/remove_elevated_permission to release-0.4
@serathius serathius mentioned this pull request Nov 16, 2021
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