Skip to content

Update N+ #4850

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Jan 2, 2024
Merged

Update N+ #4850

merged 4 commits into from
Jan 2, 2024

Conversation

@vepatel
Copy link
Contributor

@vepatel vepatel commented Jan 2, 2024 •
edited
Loading

Proposed changes

  • Update N+ version to R31

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

@vepatel vepatel requested a review from a team as a code owner January 2, 2024 11:12
@github-actions github-actions bot added the enhancement Pull requests for new features/feature enhancements label Jan 2, 2024
@vepatel vepatel linked an issue Jan 2, 2024 that may be closed by this pull request
Update the included version of NGINX PLUS #4765
Closed
@codecov
Copy link

codecov bot commented Jan 2, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (ac196d0) 52.10% compared to head (f99223a) 52.09%.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #4850      +/-   ##
==========================================
- Coverage   52.10%   52.09%   -0.02%     
==========================================
  Files          60       60              
  Lines       17376    17376              
==========================================
- Hits         9054     9052       -2     
  Misses       8008     8008              
- Partials      314      316       +2

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

@vepatel vepatel requested a review from a team as a code owner January 2, 2024 12:43
@github-actions github-actions bot added the documentation Pull requests/issues for documentation label Jan 2, 2024
@vepatel vepatel merged commit f65b4f7 into main Jan 2, 2024
@vepatel vepatel deleted the feat/update-nginx branch January 2, 2024 15:52
pdabelf5 pushed a commit that referenced this pull request Jan 9, 2024
@vepatel @pdabelf5
Update N+ to R31 (#4850)
c1432e6
pdabelf5 added a commit that referenced this pull request Jan 12, 2024
@pdabelf5 @haywoodsh
@lucacome @oseoin @vepatel @dependabot
Cherry pick 3.4.1 (#4886)
a376068 
* fix release script for helm (#4810)

Signed-off-by: Haywood Shannon <[email protected]>

* Test jobs further refactor (#4820)

* Fix AWS registry (#4825)

* Don't push Marketplace images (#4827)

* Add the ability to have Nginx version checks in templates (#4831)

Add the ability to add version dependent template elements

* Add trigger for GCP Marketplace repo (#4829)

* Add automatic push to GCP Marketplace (#4828)

* Update N+ to R31 (#4850)

* Bump the go group with 3 updates (#4846)

Bumps the go group with 3 updates: [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2), [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) and [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang).


Updates `github.com/aws/aws-sdk-go-v2/config` from 1.26.1 to 1.26.2
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@config/v1.26.1...config/v1.26.2)

Updates `github.com/go-chi/chi/v5` from 5.0.10 to 5.0.11
- [Release notes](https://github.com/go-chi/chi/releases)
- [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md)
- [Commits](go-chi/chi@v5.0.10...v5.0.11)

Updates `github.com/prometheus/client_golang` from 1.17.0 to 1.18.0
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.17.0...v1.18.0)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/go-chi/chi/v5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Report User Agent for Alpine and UBI (#4845)

* Bump the go group with 2 updates (#4873)

Bumps the go group with 2 updates: [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) and [github.com/aws/aws-sdk-go-v2/service/marketplacemetering](https://github.com/aws/aws-sdk-go-v2).


Updates `github.com/aws/aws-sdk-go-v2/config` from 1.26.2 to 1.26.3
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@config/v1.26.2...config/v1.26.3)

Updates `github.com/aws/aws-sdk-go-v2/service/marketplacemetering` from 1.19.5 to 1.19.6
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@service/mq/v1.19.5...service/efs/v1.19.6)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/aws/aws-sdk-go-v2/service/marketplacemetering
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Abel <[email protected]>

* Update UBI string for new images (#4893)

* Bump the go group with 1 update (#4905)

Bumps the go group with 1 update: [github.com/nginxinc/nginx-prometheus-exporter](https://github.com/nginxinc/nginx-prometheus-exporter).


Updates `github.com/nginxinc/nginx-prometheus-exporter` from 1.0.0 to 1.1.0
- [Release notes](https://github.com/nginxinc/nginx-prometheus-exporter/releases)
- [Changelog](https://github.com/nginxinc/nginx-prometheus-exporter/blob/main/CHANGELOG.md)
- [Commits](nginx/nginx-prometheus-exporter@v1.0.0...v1.1.0)

---
updated-dependencies:
- dependency-name: github.com/nginxinc/nginx-prometheus-exporter
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Abel <[email protected]>

* patch base images on container build (#4869)

---------

Signed-off-by: Haywood Shannon <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Haywood Shannon <[email protected]>
Co-authored-by: Luca Comellini <[email protected]>
Co-authored-by: oseoin <[email protected]>
Co-authored-by: Venktesh Shivam Patel <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pdabelf5 pdabelf5 pdabelf5 approved these changes

@shaun-nx shaun-nx Awaiting requested review from shaun-nx

+2 more reviewers

@oseoin oseoin oseoin approved these changes

@j1m-ryan j1m-ryan j1m-ryan approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

documentation Pull requests/issues for documentation enhancement Pull requests for new features/feature enhancements

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Update the included version of NGINX PLUS

5 participants

@vepatel @oseoin @j1m-ryan @pdabelf5