Skip to content

Commit df0ccd1

Browse files
authored
Merge pull request #30167 from dougbtv/fix-dhcp-shim
The DHCP shim configuration should include type: Raw
2 parents 4589abe + bfe74e2 commit df0ccd1

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

modules/nw-multus-ipam-object.adoc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,16 @@ spec:
128128
additionalNetworks:
129129
- name: dhcp-shim
130130
namespace: default
131+
type: Raw
131132
rawCNIConfig: |-
132-
{
133-
"name": "dhcp-shim",
134-
"cniVersion": "0.3.1",
135-
"type": "bridge",
136-
"ipam": {
137-
"type": "dhcp"
133+
{
134+
"name": "dhcp-shim",
135+
"cniVersion": "0.3.1",
136+
"type": "bridge",
137+
"ipam": {
138+
"type": "dhcp"
139+
}
138140
}
139-
}
140141
----
141142
====
142143

0 commit comments

Comments
 (0)