scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44921 from jacekn/registry-fix

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42432, 44628, 45101, 44921)

Use correct option name in the kubernetes-worker layer registry action

**What this PR does / why we need it**: It fixes #44920 

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

**Special notes for your reviewer**:

**Release note**:

```
Ensure kubernetes-worker juju layer registry action uses correct ingress controller option name
```
This commit is contained in:
Kubernetes Submit Queue
2017-04-28 08:41:39 -07:00
committed by GitHub
parent 774bb58e02 e02db69826
commit bec2c604ac
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/juju/layers/kubernetes-worker/actions/registry
View File

@@ -98,7 +98,7 @@ if create_response == 0:
if check_cm_response == 0: if check_cm_response == 0:
# There is an existing ConfigMap, patch it # There is an existing ConfigMap, patch it
patch = '{"data":{"max-body-size":"1024m"}}' patch = '{"data":{"body-size":"1024m"}}'
patch_cm_command = kubectl + ['patch', 'cm', cm_name, '-p', patch] patch_cm_command = kubectl + ['patch', 'cm', cm_name, '-p', patch]
patch_cm_response = call(patch_cm_command) patch_cm_response = call(patch_cm_command)