opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-28 13:40:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Drop APIv2 CNI configuration

Browse Source 
**Depends on PR 23538**

CNI is no longer needed/supported.

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2024-08-08 10:29:44 -04:00
parent dd1d2c136f
commit a48cd241ad
2 changed files with 0 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/apiv2/python/rest_api/fixtures/podman.py
View File

@ -38,42 +38,6 @@ class Podman:
with open(os.environ["CONTAINERS_REGISTRIES_CONF"], "w") as w: with open(os.environ["CONTAINERS_REGISTRIES_CONF"], "w") as w:
p.write(w) p.write(w)
os.environ["CNI_CONFIG_PATH"] = os.path.join(self.anchor_directory, "cni", "net.d")
os.makedirs(os.environ["CNI_CONFIG_PATH"], exist_ok=True)
self.cmd.append("--network-config-dir=" + os.environ["CNI_CONFIG_PATH"])
cni_cfg = os.path.join(os.environ["CNI_CONFIG_PATH"], "87-podman-bridge.conflist")
# json decoded and encoded to ensure legal json
buf = json.loads(
"""
{
"cniVersion": "0.3.0",
"name": "podman",
"plugins": [{
"type": "bridge",
"bridge": "cni0",
"isGateway": true,
"ipMasq": true,
"ipam": {
"type": "host-local",
"subnet": "10.88.0.0/16",
"routes": [{
"dst": "0.0.0.0/0"
}]
}
},
{
"type": "portmap",
"capabilities": {
"portMappings": true
}
}
]
}
"""
)
with open(cni_cfg, "w") as w:
json.dump(buf, w)
def open(self, command, *args, **kwargs): def open(self, command, *args, **kwargs):
"""Podman initialized instance to run a given command """Podman initialized instance to run a given command

36
test/python/docker/__init__.py
View File

@ -68,42 +68,6 @@ location = "mirror.localhost:5000"
with open(os.environ["CONTAINERS_REGISTRIES_CONF"], "w") as file: with open(os.environ["CONTAINERS_REGISTRIES_CONF"], "w") as file:
file.write(conf) file.write(conf)
os.environ["CNI_CONFIG_PATH"] = os.path.join(self.anchor_directory, "cni", "net.d")
os.makedirs(os.environ["CNI_CONFIG_PATH"], exist_ok=True)
self.cmd.append("--network-config-dir=" + os.environ["CNI_CONFIG_PATH"])
cni_cfg = os.path.join(os.environ["CNI_CONFIG_PATH"], "87-podman-bridge.conflist")
# json decoded and encoded to ensure legal json
buf = json.loads(
"""
{
"cniVersion": "0.3.0",
"name": "default",
"plugins": [{
"type": "bridge",
"bridge": "cni0",
"isGateway": true,
"ipMasq": true,
"ipam": {
"type": "host-local",
"subnet": "10.88.0.0/16",
"routes": [{
"dst": "0.0.0.0/0"
}]
}
},
{
"type": "portmap",
"capabilities": {
"portMappings": true
}
}
]
}
"""
)
with open(cni_cfg, "w") as file:
json.dump(buf, file)
def open(self, command, *args, **kwargs): def open(self, command, *args, **kwargs):
"""Podman initialized instance to run a given command """Podman initialized instance to run a given command