Skip to content

Add missing OSS internal routes #3481

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

Merged
merged 4 commits into from
Jan 25, 2023
Merged

Conversation

chase-kiefer
Copy link
Contributor

Proposed changes

While enabling the OSS version of Kubernetes Ingress to integrate with NSM, the additional templates for internal routes were forgotten. This allows the OSS ingress templating to configure ingress/egress for NSM.

  • Sync N+ and OSS templates to have same functionality for NSM traffic

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

During testing a bug was found that prevented NSM to egress through
NIC OSS. The root cause of the bug was found to be a few missing
configuration blocks in the OSS NIC template files.

This adds in the server blocks necessary for internal routes to
function as expected.
@chase-kiefer chase-kiefer requested a review from a team as a code owner January 25, 2023 17:39
@chase-kiefer chase-kiefer changed the title Oss intenal routes OSS internal routes Jan 25, 2023
@codecov-commenter
Copy link

codecov-commenter commented Jan 25, 2023

Codecov Report

Merging #3481 (d5ea2a8) into main (05e1357) will increase coverage by 0.01%.
The diff coverage is n/a.

❗ Current head d5ea2a8 differs from pull request most recent head 37071f8. Consider uploading reports for the commit 37071f8 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##             main    #3481      +/-   ##
==========================================
+ Coverage   51.95%   51.97%   +0.01%     
==========================================
  Files          60       60              
  Lines       16797    16811      +14     
==========================================
+ Hits         8727     8737      +10     
- Misses       7775     7777       +2     
- Partials      295      297       +2     
Impacted Files Coverage Δ
internal/k8s/configuration.go 95.43% <0.00%> (-0.34%) ⬇️
pkg/apis/dos/validation/dos.go 94.54% <0.00%> (ø)
internal/configs/version2/http.go 0.00% <0.00%> (ø)
pkg/apis/configuration/validation/policy.go 91.16% <0.00%> (ø)
pkg/apis/configuration/validation/virtualserver.go 94.39% <0.00%> (+<0.01%) ⬆️
internal/configs/virtualserver.go 95.07% <0.00%> (+0.01%) ⬆️

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

Copy link

@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! I think we need a couple of changes

chase-kiefer and others added 2 commits January 25, 2023 12:36
add if not .DisableIPV6 check for listening on 443

Co-authored-by: Luca Comellini <luca.com@gmail.com>
Signed-off-by: Chase Kiefer <112438922+chase-kiefer@users.noreply.github.com>
add $proxyOrGRPC formatting from review feedback

Co-authored-by: Luca Comellini <luca.com@gmail.com>
Signed-off-by: Chase Kiefer <112438922+chase-kiefer@users.noreply.github.com>
@lucacome lucacome added the bug An issue reporting a potential bug label Jan 25, 2023
@lucacome lucacome changed the title OSS internal routes Add missing OSS internal routes Jan 25, 2023
@lucacome lucacome merged commit 21f5377 into nginx:main Jan 25, 2023
lucacome pushed a commit that referenced this pull request Jan 25, 2023
During testing a bug was found that prevented NSM to egress through
NIC OSS. The root cause of the bug was found to be a few missing
configuration blocks in the OSS NIC template files.

This adds in the server blocks necessary for internal routes to
function as expected.

(cherry picked from commit 21f5377)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug An issue reporting a potential bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants