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

Include the serversnippet from the config map in server blocks #1523

Merged
merged 1 commit into from
Oct 12, 2017

Conversation

ctriv
Copy link

@ctriv ctriv commented Oct 12, 2017

…aliaes

What this PR does / why we need it:

The configmap server-snippet feature currently does not inject any directives into the server block.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

Special notes for your reviewer:

@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://github.com/kubernetes/kubernetes/wiki/CLA-FAQ to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
  • If you have done the above and are still having issues with the CLA being reported as unsigned, please email the CNCF helpdesk: [email protected]

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Oct 12, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 12, 2017
@coveralls
Copy link

Coverage Status

Coverage remained the same at 33.492% when pulling 0aae811 on liquidweb:master into bf26abf on kubernetes:master.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Oct 12, 2017
@aledbf
Copy link
Member

aledbf commented Oct 12, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 12, 2017
@aledbf
Copy link
Member

aledbf commented Oct 12, 2017

@ctriv thanks!

@aledbf aledbf merged commit 1257e06 into kubernetes:master Oct 12, 2017
@arunreddykaithe
Copy link

For my nginx-ingress conf. I only need server-snippet for default server {} module.
This should be optional, instead of hard-coding it to all server modules.

if you are passing only variables this makes sense. However, when a snippet with multiple lines of conditions is inserted. Having those conditions in multiple server modules is breaking stuff. And the only way content inside defaul server _( servername ;) is Server-snippet.

p.s : Having server-snippet option on default and all server modules - should have a flag/optional

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants