github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67916 from MrHohn/ip-masq-chain-name

Browse Source 
Automatic merge from submit-queue. 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>.

Bump ip-masq-agent to v2.1.1

**What this PR does / why we need it**:
- Update debian-iptables image for CVEs.
- Change chain name to IP-MASQ to be compatible with the pre-injected masquerade rules.

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

**Special notes for your reviewer**:
/assign @bowei 
cc @satyasm

**Release note**:

```release-note
Bump ip-masq-agent to v2.1.1
- Update debian-iptables image for CVEs.
- Change chain name to IP-MASQ to be compatible with the
pre-injected masquerade rules.
```
This commit is contained in:
Kubernetes Submit Queue 2018-08-27 20:11:33 -07:00 committed by GitHub
commit f825c2d0ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/ip-masq-agent/ip-masq-agent.yaml
View File

@ -29,7 +29,9 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: ip-masq-agent - name: ip-masq-agent
image: k8s.gcr.io/ip-masq-agent-amd64:v2.0.2 image: k8s.gcr.io/ip-masq-agent-amd64:v2.1.1
args:
- --masq-chain=IP-MASQ
resources: resources:
requests: requests:
cpu: 10m cpu: 10m