github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #57314 from juju-solutions/fix/lb-lint

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 56947, 56349, 57140, 53686, 57314). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix lint errors on Juju LB

**What this PR does / why we need it**: This lint fixes block the build of the juju charms.

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


**Special notes for your reviewer**:

**Release note**:

```NONE

```
This commit is contained in:
Kubernetes Submit Queue 2017-12-18 12:24:46 -08:00 committed by GitHub
commit 4956e65d59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py
View File

@ -37,24 +37,25 @@ from subprocess import CalledProcessError
apilb_nginx = """/var/log/nginx.*.log { apilb_nginx = """/var/log/nginx.*.log {
daily daily
missingok missingok
rotate 14 rotate 14
compress compress
delaycompress delaycompress
notifempty notifempty
create 0640 www-data adm create 0640 www-data adm
sharedscripts sharedscripts
prerotate prerotate
if [ -d /etc/logrotate.d/httpd-prerotate ]; then \\ if [ -d /etc/logrotate.d/httpd-prerotate ]; then \\
run-parts /etc/logrotate.d/httpd-prerotate; \\ run-parts /etc/logrotate.d/httpd-prerotate; \\
fi \\ fi \\
endscript endscript
postrotate postrotate
invoke-rc.d nginx rotate >/dev/null 2>&1 invoke-rc.d nginx rotate >/dev/null 2>&1
endscript endscript
}""" }"""
@when('certificates.available') @when('certificates.available')
def request_server_certificates(tls): def request_server_certificates(tls):
'''Send the data that is required to create a server certificate for '''Send the data that is required to create a server certificate for