Skip to content
This repository has been archived by the owner on Apr 17, 2019. It is now read-only.

[nginx-ingress-controller] Avoid replacing nginx.conf file with invalid content #1772

Merged
merged 1 commit into from
Sep 29, 2016

Conversation

aledbf
Copy link
Contributor

@aledbf aledbf commented Sep 22, 2016

This change is Reviewable

@k8s-github-robot k8s-github-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 22, 2016
@@ -91,7 +91,9 @@ func (t *Template) Close() {

// Write populates a buffer using a template with NGINX configuration
// and the servers and upstreams created by Ingress rules
func (t *Template) Write(cfg config.Configuration, ingressCfg ingress.Configuration) ([]byte, error) {
func (t *Template) Write(cfg config.Configuration,

Choose a reason for hiding this comment

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

nit: please move cfg onto a line on its own

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@bprashanth
Copy link

lgtm just the nit

@bprashanth bprashanth added the lgtm Indicates that a PR is ready to be merged. label Sep 29, 2016
@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 6862c71 into kubernetes-retired:master Sep 29, 2016
@aledbf aledbf deleted the check-new-error branch September 29, 2016 04:05
aledbf pushed a commit to aledbf/contrib that referenced this pull request Nov 10, 2016
Automatic merge from submit-queue

[nginx-ingress-controller] Avoid replacing nginx.conf file with invalid content
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants