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

NGINX: Add NJS. #12345

Merged
merged 1 commit into from
Dec 15, 2024
Merged

NGINX: Add NJS. #12345

merged 1 commit into from
Dec 15, 2024

Conversation

anurag-rajawat
Copy link
Contributor

@anurag-rajawat anurag-rajawat commented Nov 11, 2024

What this PR does / why we need it:

This PR is the continuation of #11248.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • CVE Report (Scanner found CVE and adding report)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Which issue/s this PR fixes

How Has This Been Tested?

I verified my changes by:

  • Deploying the ingress controller by following official doc
  • Using the image built with these changes.

Here is a screenshots that show it has nginx-njs module:
Screenshot 2024-11-11 at 15 03 02

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added unit and/or e2e tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/docs needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Nov 11, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @anurag-rajawat!

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 needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority labels Nov 11, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @anurag-rajawat. 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-sigs/prow repository.

Copy link

netlify bot commented Nov 11, 2024

Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit d318f27
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/675eb3397fce8b0008f5441b

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 11, 2024
@strongjz
Copy link
Member

Great start. Can you add an e2e test that exercises using the njs model?

@strongjz
Copy link
Member

Great start. Can you add an e2e test that exercises using the njs model?

This may have to wait till we release a new nignx base image. We do rebuild the controller in all e2e but not the nginx base.

@strongjz
Copy link
Member

/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 11, 2024
@strongjz
Copy link
Member

/kind feature
/priority backlog

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority labels Nov 11, 2024
@strongjz
Copy link
Member

We do build the nginx image, so we can add some e2e test for njs.
https://github.com/kubernetes/ingress-nginx/actions/runs/11776116543/job/32797881046#step:9:1

Copy link
Member

@Gacko Gacko left a comment

Choose a reason for hiding this comment

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

I'm not even sure if we should still add this on Ingress NGINX. @strongjz

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 11, 2024
@anurag-rajawat
Copy link
Contributor Author

Hey @strongjz, should we proceed with further changes?

@strongjz
Copy link
Member

Hey @strongjz, should we proceed with further changes?

Let's chat after our maintainers talk tomorrow. We've got plans for things going forward.

@strongjz
Copy link
Member

Also need to rebase to get the go lint ci 0207d18

@Gacko
Copy link
Member

Gacko commented Dec 11, 2024

NGINX build is working again. We're now releasing v1.12 and then coming back here.

@longwuyuan
Copy link
Contributor

This is a duplicate of https://github.com/kubernetes/ingress-nginx/pull/12447/files so need to close this

@Gacko
Copy link
Member

Gacko commented Dec 12, 2024

No, it isn't. The other PR is newer and based on this PR.

@longwuyuan
Copy link
Contributor

Can we track the change proposed in the other one instead of this one ?

@Gacko
Copy link
Member

Gacko commented Dec 12, 2024

No, I'd like to keep this one as it's really only introducing NJS and this should complete the tests on its own.

@longwuyuan
Copy link
Contributor

ok, then that implies a comment on the other one to remove the duplicacy

@Gacko
Copy link
Member

Gacko commented Dec 12, 2024

The other one needs to be based on this here so it can already be tested. The moment we merge this one, @elizabeth-dev will rebase their PR.

@longwuyuan
Copy link
Contributor

The other one needs to be based on this here so it can already be tested. The moment we merge this one, @elizabeth-dev will rebase their PR.

👍 left a note there

@elizabeth-dev
Copy link
Member

elizabeth-dev commented Dec 12, 2024

yes, my PR(s) already start from this PR's branch, so it'll be an easy rebase when this is merged

Signed-off-by: Anurag Rajawat <[email protected]>
Copy link
Contributor

@rikatz rikatz left a comment

Choose a reason for hiding this comment

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

/lgtm

Let's gooo! :)

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 15, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anurag-rajawat, rikatz

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 Dec 15, 2024
@rikatz
Copy link
Contributor

rikatz commented Dec 15, 2024

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 15, 2024
@k8s-ci-robot k8s-ci-robot merged commit 14cef62 into kubernetes:main Dec 15, 2024
44 checks passed
@anurag-rajawat anurag-rajawat deleted the feat-njs branch December 15, 2024 13:27
@Gacko
Copy link
Member

Gacko commented Jan 8, 2025

/cherry-pick main

@k8s-infra-cherrypick-robot
Copy link
Contributor

@Gacko: I cannot cherry-pick the present PR on top of its base branch (main).

In response to this:

/cherry-pick main

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. area/docs cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. 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. priority/backlog Higher priority than priority/awaiting-more-evidence. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants