Merge pull request #34430 from champtar/portmap

k8s-ci-robot · web-flow · commit 0f014c5b3f97 · 2022-12-19T20:33:43.000-08:00
Add externalSetMarkChain to portmap config
diff --git a/content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md b/content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md
@@ -109,7 +109,8 @@ If you want to enable `hostPort` support, you must specify `portMappings capabil
     },
     {
       "type": "portmap",
-      "capabilities": {"portMappings": true}
+      "capabilities": {"portMappings": true},
+      "externalSetMarkChain": "KUBE-MARK-MASQ"
     }
   ]
 }
diff --git a/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/troubleshooting-cni-plugin-related-errors.md b/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/troubleshooting-cni-plugin-related-errors.md
@@ -129,7 +129,8 @@ cat << EOF | tee /etc/cni/net.d/10-containerd-net.conflist
    },
    {
      "type": "portmap",
-     "capabilities": {"portMappings": true}
+     "capabilities": {"portMappings": true},
+     "externalSetMarkChain": "KUBE-MARK-MASQ"
    }
  ]
 }

Original file line number	Diff line number	Diff line change
@@ -109,7 +109,8 @@ If you want to enable `hostPort` support, you must specify `portMappings capabil
`109`	`109`	`},`
`110`	`110`	`{`
`111`	`111`	`"type": "portmap",`
`112`		`- "capabilities": {"portMappings": true}`
	`112`	`+ "capabilities": {"portMappings": true},`
	`113`	`+ "externalSetMarkChain": "KUBE-MARK-MASQ"`
`113`	`114`	`}`
`114`	`115`	`]`
`115`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,8 @@ cat << EOF \| tee /etc/cni/net.d/10-containerd-net.conflist`
`129`	`129`	`},`
`130`	`130`	`{`
`131`	`131`	`"type": "portmap",`
`132`		`- "capabilities": {"portMappings": true}`
	`132`	`+ "capabilities": {"portMappings": true},`
	`133`	`+ "externalSetMarkChain": "KUBE-MARK-MASQ"`
`133`	`134`	`}`
`134`	`135`	`]`
`135`	`136`	`}`