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 Plus R33 support #2728

Closed
wants to merge 6 commits into from
Closed

Conversation

sjberman
Copy link
Contributor

@sjberman sjberman commented Oct 28, 2024

Adding support for NGINX Plus R33. The major change with this release is that NGINX Plus now requires a JWT in order to run. A user must create a Secret with this JWT and supply the secret name to NGF when installing. A user can also create client SSL and CA Secrets for NIM connections. All of these Secrets are mounted to the nginx container.

Because of the new usage reporting method, the old usage reporting method has been removed and CLI arguments have been altered. Since this release is a breaking change for N+ users, the choice was made to remove the unused usage reporting flags instead of deprecating them.

Updated documentation to describe this process, while also cleaning up the JWT docker registry process for N+.

Testing: Verified that usage reports are sent when everything is configured properly. Also verified that updates to the Secret are propagated.

Closes #2271
Closes #2709

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto main
  • I will ensure my PR is targeting the main branch and pulling from my branch from my own fork

Release notes

If this PR introduces a change that affects users and needs to be mentioned in the release notes,
please add a brief note that summarizes the change.

Dev note: This should require a full section at the top of the CHANGELOG for breaking changes. The docs link here is invalid until the release goes out.

NGINX Plus R33 support added. This release of NGINX Plus requires a valid JSON Web Token (JWT) in order to run. Users of NGINX Plus *must* have this JWT added to a Secret before installing NGINX Gateway Fabric v1.5.0. See the [NGINX Plus JWT](https://docs.nginx.com/nginx-gateway-fabric/installation/nginx-plus-jwt/) guide for information on setting this up.

@github-actions github-actions bot added documentation Improvements or additions to documentation change Pull requests that introduce a change tests Pull requests that update tests helm-chart Relates to helm chart labels Oct 28, 2024
Copy link

codecov bot commented Oct 28, 2024

Codecov Report

Attention: Patch coverage is 83.45865% with 66 lines in your changes missing coverage. Please review.

Project coverage is 89.86%. Comparing base (e632d0d) to head (4cf4159).

Files with missing lines Patch % Lines
cmd/gateway/commands.go 74.52% 24 Missing and 3 partials ⚠️
internal/mode/static/manager.go 74.44% 23 Missing ⚠️
internal/mode/static/handler.go 86.04% 4 Missing and 2 partials ⚠️
cmd/gateway/validation.go 91.42% 2 Missing and 1 partial ⚠️
internal/mode/static/nginx/config/main_config.go 95.58% 1 Missing and 2 partials ⚠️
internal/mode/static/nginx/file/folders.go 33.33% 1 Missing and 1 partial ⚠️
internal/mode/static/state/graph/graph.go 86.66% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2728      +/-   ##
==========================================
+ Coverage   89.40%   89.86%   +0.46%     
==========================================
  Files         110      107       -3     
  Lines       10913    10997      +84     
  Branches       50       50              
==========================================
+ Hits         9757     9883     +126     
+ Misses       1098     1054      -44     
- Partials       58       60       +2     

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

@sjberman
Copy link
Contributor Author

@ADubhlaoich this is a draft until r33 is out, but the docs are ready for review

cmd/gateway/commands.go Outdated Show resolved Hide resolved
cmd/gateway/commands_test.go Outdated Show resolved Hide resolved
internal/mode/static/config/config.go Outdated Show resolved Hide resolved
site/content/installation/installing-ngf/helm.md Outdated Show resolved Hide resolved
site/content/installation/nginx-plus-jwt.md Outdated Show resolved Hide resolved
@sjberman sjberman force-pushed the change/nplus-reporting branch 2 times, most recently from 6219f17 to 8f676d9 Compare November 6, 2024 18:04
cmd/gateway/commands.go Outdated Show resolved Hide resolved
internal/mode/static/handler.go Outdated Show resolved Hide resolved
internal/mode/static/handler.go Outdated Show resolved Hide resolved
internal/mode/static/handler.go Outdated Show resolved Hide resolved
internal/mode/static/nginx/config/main_config.go Outdated Show resolved Hide resolved
internal/mode/static/state/dataplane/types.go Show resolved Hide resolved
internal/mode/static/state/dataplane/types.go Outdated Show resolved Hide resolved
internal/mode/static/state/graph/graph.go Outdated Show resolved Hide resolved
@ADubhlaoich
Copy link
Contributor

At a quick review the documentation changes LGTM though I will give them a more thorough look again.

I'm trying to grok how error messages are written (and handled), as they are huge concern for R33.

tests/framework/ngf.go Dismissed Show dismissed Hide dismissed
internal/mode/static/handler.go Outdated Show resolved Hide resolved
internal/mode/static/handler.go Outdated Show resolved Hide resolved
internal/mode/static/handler.go Outdated Show resolved Hide resolved
Copy link
Contributor

@kate-osborn kate-osborn left a comment

Choose a reason for hiding this comment

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

🚀 🚀

Adding support for NGINX Plus R33. The major change with this release is that NGINX Plus now requires a JWT in order to run. A user must create a Secret with this JWT and supply the secret name to NGF when installing. A user can also create client SSL and CA Secrets for NIM connections. All of these Secrets are mounted to the nginx container.

Because of the new usage reporting method, the old usage reporting method has been removed and CLI arguments have been altered. Since this release is a breaking change for N+ users, the choice was made to remove the unused usage reporting flags instead of deprecating them.

Updated documentation to describe this process, while also cleaning up the JWT docker registry process for N+.
Copy link
Contributor

@salonichf5 salonichf5 left a comment

Choose a reason for hiding this comment

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

just a couple of small suggestions. overall, looks good

internal/mode/static/config/config.go Outdated Show resolved Hide resolved
internal/mode/static/handler.go Show resolved Hide resolved
internal/mode/static/handler.go Show resolved Hide resolved
cmd/gateway/commands_test.go Outdated Show resolved Hide resolved
cmd/gateway/commands_test.go Show resolved Hide resolved
@sjberman sjberman closed this Nov 8, 2024
@sjberman sjberman mentioned this pull request Nov 8, 2024
6 tasks
@sjberman sjberman deleted the change/nplus-reporting branch November 19, 2024 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
change Pull requests that introduce a change documentation Improvements or additions to documentation helm-chart Relates to helm chart release-notes tests Pull requests that update tests
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

R33 Support Docs: Improve N+ Images Docs
5 participants