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

Reject VS/VSR resources with enabled plus features for OSS #694

Merged
merged 1 commit into from
Sep 13, 2019

Conversation

bvighnesha
Copy link

@bvighnesha bvighnesha commented Sep 13, 2019

Proposed changes

Currently, the Ingress Controller for NGINX OSS allows fields in VS/VSR that are only supported in NGINX Plus. For example:

Upstream.HealthCheck
Upstream.SlowStart

If an OSS user starts using a Plus feature, we need to report quickly that the feature is not supported.

Requirements:

If an OSS user configures a health check in a VS/VSR upstream, the IC will reject the resource with a warning event that includes active health checks are only supported in NGINX Plus.

If an OSS user configures slow start for a VS/VSR upstream, the IC will reject the resource with a warning event that includes slow start is only supported in NGINX Plus.

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 master
  • I will ensure my PR is targeting the master branch and pulling from my branch from my own fork

@bvighnesha bvighnesha requested a review from Rulox September 13, 2019 10:59
Copy link
Contributor

@Rulox Rulox left a comment

Choose a reason for hiding this comment

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

lgtm I just suggest to change the error messages in the Tests to be more consistent with the other messages (also, it is not true that the input is invalid, I think we should remove the invalid). Suggested changes as inline suggestions.

Thanks! I am approving but please have a look at the comments.

pkg/apis/configuration/validation/validation_test.go Outdated Show resolved Hide resolved
pkg/apis/configuration/validation/validation_test.go Outdated Show resolved Hide resolved
@bvighnesha bvighnesha force-pushed the feature/reject_plus_resources_in_oss branch from 94c7acf to 348e784 Compare September 13, 2019 11:45
@bvighnesha bvighnesha merged commit 58c869c into master Sep 13, 2019
@Dean-Coakley Dean-Coakley deleted the feature/reject_plus_resources_in_oss branch September 13, 2019 13:15
@Dean-Coakley Dean-Coakley mentioned this pull request Oct 31, 2019
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants