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

Add support for psp #4383

Merged
merged 1 commit into from
Aug 1, 2019

Conversation

otnielvh
Copy link

This PR adds the yaml file needed for running nginx when port security policy (PSP) is enabled on the Kubernetes cluster. Me and my colleagues struggled with it somewhat, and felt it would be nice to have it together with the rest of nginx.

@k8s-ci-robot
Copy link
Contributor

Welcome @otnielvh!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. 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/ingress-nginx 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 Jul 31, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @otnielvh. Thanks for your PR.

I'm waiting for a kubernetes 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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 31, 2019
@aledbf
Copy link
Member

aledbf commented Jul 31, 2019

@otnielvh thank you for your contribution. Please move the doc and yaml files to the example section.
The reason for this is related to the (subjective) definition of what should be defined in a PSP.

@aledbf
Copy link
Member

aledbf commented Jul 31, 2019

Also, it would be great if you can add an e2e test using PSP to avoid regressions in the future.

@otnielvh
Copy link
Author

@aledbf, thank you for your feedback. I moved the files into the example section, however I'm not sure how to address e2e testing. AFAIK enabling PSP requires changes in the cluster that are not supported via kubectl (I'm running in GKE and use gcloud). From a brief look the other tests don't require such fundamental changes. Could you please point me in the direction of how to write a test that changes the cluster not through kubectl or client api? If you can recall any examples that would be a great help. Thank you again for you time.

@aledbf
Copy link
Member

aledbf commented Jul 31, 2019

@otnielvh I forgot I already wrote one 🤦‍♂️ https://github.com/kubernetes/ingress-nginx/blob/master/test/e2e/settings/pod_security_policy.go
Please squash the commits

@aledbf
Copy link
Member

aledbf commented Jul 31, 2019

/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 Jul 31, 2019
@aledbf
Copy link
Member

aledbf commented Jul 31, 2019

Also, please add a link to this new example in this section https://github.com/kubernetes/ingress-nginx/blob/master/mkdocs.yml#L66

@codecov-io
Copy link

codecov-io commented Jul 31, 2019

Codecov Report

❗ No coverage uploaded for pull request base (master@c8a3710). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##             master   #4383   +/-   ##
========================================
  Coverage          ?   58.5%           
========================================
  Files             ?      87           
  Lines             ?    6528           
  Branches          ?       0           
========================================
  Hits              ?    3819           
  Misses            ?    2281           
  Partials          ?     428

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c8a3710...3b34d56. Read the comment docs.

Copy link

@diazjf diazjf left a comment

Choose a reason for hiding this comment

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

Looks good, I was also thinking, maybe it can be added to https://github.com/kubernetes/ingress-nginx/blob/master/docs/deploy/index.md for user's to view before deploying.

docs/examples/psp/README.md Show resolved Hide resolved
docs/examples/psp/README.md Show resolved Hide resolved
@otnielvh otnielvh force-pushed the otnielvh-nginx-with-psp branch from 9724275 to 3b34d56 Compare August 1, 2019 06:47
@otnielvh
Copy link
Author

otnielvh commented Aug 1, 2019

Squashed the commits and added the links mentioned. I still have two more points:

  1. @aledbf the link https://github.com/kubernetes/ingress-nginx/blob/master/mkdocs.yml#L66 points to third party addons section, I assume this is a typo and PSP should be in examples, I'm just want to double check.
  2. @diazjf, I started off by adding some documentation in the main docs, but then removed it because the first thing a user sees is some PSP stuff that is quite advanced and most people don't use. Where do you think would be a good place to link to the PSP documentation?

@otnielvh
Copy link
Author

otnielvh commented Aug 1, 2019

/retest

@otnielvh
Copy link
Author

otnielvh commented Aug 1, 2019

/test pull-ingress-nginx-test

@aledbf
Copy link
Member

aledbf commented Aug 1, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 1, 2019
@aledbf
Copy link
Member

aledbf commented Aug 1, 2019

@otnielvh thanks!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, otnielvh

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 Aug 1, 2019
@k8s-ci-robot k8s-ci-robot merged commit 929945e into kubernetes:master Aug 1, 2019
@otnielvh otnielvh deleted the otnielvh-nginx-with-psp branch August 1, 2019 13:30
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants