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

Bump NGINX Plus to R28 in r-2.4 #3321

Merged
merged 2 commits into from Nov 30, 2022
Merged

Conversation

ciarams87
Copy link
Member

@ciarams87 ciarams87 commented Nov 30, 2022

Proposed changes

Bump NGINX Plus to R28.

This commit also bumps the NAP WAF and NAP DOS versions to 4.0 and 3.1, respectively. NAP WAF 4.0 removes support for Debian 10, so this commit also bumps the Debian version for these images to Debian 11. NGINX Plus versioned repos for NAP DOS images are no longer available, so this commit removes these entries in the Dockerfile.

Finally, this commit pins the UBI build to fix the NAP WAF UBI builds, and adds updates for CVEs.

Cherry-picked from #3320

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

@ciarams87 ciarams87 requested a review from a team as a code owner November 30, 2022 11:32
@github-actions github-actions bot added the documentation Pull requests/issues for documentation label Nov 30, 2022
@ciarams87 ciarams87 added the chore Pull requests for routine tasks label Nov 30, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #3321 (c08b233) into release-2.4 (c9ea1e5) will increase coverage by 0.14%.
The diff coverage is 61.94%.

@@               Coverage Diff               @@
##           release-2.4    #3321      +/-   ##
===============================================
+ Coverage        52.41%   52.56%   +0.14%     
===============================================
  Files               58       58              
  Lines            15997    16070      +73     
===============================================
+ Hits              8385     8447      +62     
- Misses            7336     7347      +11     
  Partials           276      276              
Impacted Files Coverage Δ
internal/configs/version1/config.go 0.00% <ø> (ø)
internal/k8s/task_queue.go 0.00% <0.00%> (ø)
internal/nginx/manager.go 0.00% <0.00%> (ø)
internal/nginx/utils.go 0.00% <0.00%> (ø)
internal/k8s/controller.go 10.95% <8.82%> (-0.05%) ⬇️
internal/k8s/status.go 33.27% <20.00%> (ø)
internal/configs/ingress.go 76.90% <100.00%> (+0.04%) ⬆️
...k8s/appprotectdos/app_protect_dos_configuration.go 94.56% <100.00%> (+0.31%) ⬆️
internal/k8s/handlers.go 6.83% <100.00%> (ø)
internal/k8s/validation.go 93.81% <100.00%> (+0.49%) ⬆️
... and 3 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@github-actions github-actions bot removed the chore Pull requests for routine tasks label Nov 30, 2022
@ciarams87 ciarams87 changed the title Bump NGINX Plus to R28 Bump NGINX Plus to R28 in r-2.4 Nov 30, 2022
@ciarams87 ciarams87 mentioned this pull request Nov 30, 2022
@ciarams87 ciarams87 merged commit f832c0e into release-2.4 Nov 30, 2022
@ciarams87 ciarams87 deleted the cherry-pick-nginx-plus-r28 branch November 30, 2022 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Pull requests/issues for documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants