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

NSM OSS integration #3376

Merged
merged 5 commits into from
Dec 21, 2022
Merged

NSM OSS integration #3376

merged 5 commits into from
Dec 21, 2022

Conversation

chase-kiefer
Copy link
Contributor

Proposed changes

Currently, OSS NIC does not integrate with NGINX Service Mesh. Before it can we must disable the NGINX+ version check preventing OSS NIC from operating with Service Mesh.

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

Checking for N+ was limiting the integration of NGINX Ingress Controller and NGINX Service Mesh.
Using values-nsm was overriding unnecessary values and limiting the NIC and NSM integration.
@chase-kiefer chase-kiefer requested a review from a team as a code owner December 16, 2022 20:48
@github-actions github-actions bot added documentation Pull requests/issues for documentation helm_chart Pull requests that update the Helm Chart labels Dec 16, 2022
Copy link
Member

@lucacome lucacome left a comment

Choose a reason for hiding this comment

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

Thanks @chase-kiefer !

@lucacome lucacome requested a review from shaun-nx December 19, 2022 20:59
@lucacome lucacome self-assigned this Dec 19, 2022
@lucacome lucacome added this to the v3.0.0 milestone Dec 19, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #3376 (56c6428) into main (21786ae) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #3376      +/-   ##
==========================================
- Coverage   51.56%   51.55%   -0.02%     
==========================================
  Files          60       60              
  Lines       16678    16675       -3     
==========================================
- Hits         8600     8596       -4     
+ Misses       7788     7787       -1     
- Partials      290      292       +2     
Impacted Files Coverage Δ
cmd/nginx-ingress/flags.go 30.28% <ø> (+0.43%) ⬆️
internal/k8s/configuration.go 95.39% <0.00%> (-0.37%) ⬇️

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

@lucacome lucacome merged commit 59aa498 into nginx:main Dec 21, 2022
@chase-kiefer chase-kiefer deleted the nsm-oss-integration branch December 21, 2022 15:38
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 helm_chart Pull requests that update the Helm Chart
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants