Skip to content

Commit b3ac1cd

Browse files
authored
Merge pull request #328 from KatharaFramework/develop
Kathará v3.7.8
2 parents 82a1057 + 9aa1d2c commit b3ac1cd

File tree

80 files changed

+1854
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1854
-311
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ body:
2222
attributes:
2323
label: Kathará Version
2424
description: "Please provide the Kathará version you are using (`kathara -v`)."
25-
placeholder: "3.7.7"
25+
placeholder: "3.7.8"
2626
validations:
2727
required: true
2828
- type: textarea

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ We release patches for security vulnerabilities only for the last version:
66

77
| Version | Supported Versions |
88
|---------|--------------------|
9-
| 3.7.7 | :white_check_mark: |
9+
| 3.7.8 | :white_check_mark: |
1010

1111
## Reporting a Vulnerability
1212

docs/kathara-lab.conf.5.ronn

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ If `arg` is an option name, then `device` will be launched with option `arg` set
7474
* `num_terms` (integer):
7575
Choose the number of terminals to open for this device.
7676

77+
* `ulimit` (string):
78+
Allows change of both soft and hard limits. The syntax is ULIMIT=SOFT:HARD.
79+
Use -1 for unlimited. If only a parameter is given e.g. ULIMIT=VALUE both soft and hard limit will have same value.
80+
For instance, with this command is possible to set memlock soft and hard limit to unlimited: `device[ulimit]="memlock=-1:-1`.
81+
82+
7783
## NETWORK SCENARIO META INFORMATION
7884

7985
It is also possible to provide descriptive information about a network scenario by using one of the following special assignments:

docs/kathara-linfo.1.ronn

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kathara-linfo(1) -- Show information about a Kathara network scenario
44

55
## SYNOPSIS
66

7-
`kathara linfo` [`-h`] [`-d` <DIRECTORY>] [`-w` \| `-c`] [`-n` <DEVICE_NAME>]
7+
`kathara linfo` [`-h`] [`-d` <DIRECTORY>] [`-w` \| `-c`] [`-n` <DEVICE_NAME> \| `-t`]
88

99

1010
## DESCRIPTION
@@ -43,6 +43,11 @@ The following information are displayed:
4343
* Number of devices that make up the network scenario
4444
* Number of networks that make up the network scenario
4545

46+
* `-t`, `--topology`:
47+
Display a mapping of devices attached to each collision domain.
48+
49+
Can be used in conjunction with `-w` to retrieve live information.
50+
4651
* `-n` <DEVICE_NAME>, `--name` <DEVICE_NAME>:
4752
Show only info about a specified device.
4853

docs/kathara-vstart.1.ronn

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ kathara-vstart(1) -- Start a new Kathara device
88
[`-h`] [`--noterminals` | `--terminals` | `--privileged` | `--num_terms` <NUM_TERMS>]
99
[`--eth` <N:CD[/MAC_ADDR]> [<N:CD[/MAC_ADDR]> ...]]
1010
[`-e` [<EXEC_COMMANDS> [<EXEC_COMMANDS> ...]]] [`--mem` <MEM>]
11-
[`--cpus` <CPUS>] [`-i` <IMAGE>] [`--no-hosthome` \| `--hosthome`]
11+
[`--cpus` <CPUS>] [`-i` <IMAGE>] [`--no-hosthome` \| `--hosthome`]
1212
[`--xterm` <XTERM>] [`--print`] [`--bridged`]
13-
[--port <[HOST\:]GUEST[/PROTOCOL]> [<[HOST\:]GUEST[/PROTOCOL]> ...]] [--env <ENV> [<ENV> ...]] [--sysctl <SYSCTL> [<SYSCTL> ...]]
14-
[`--shell` <SHELL>]
13+
[`--port` <[HOST\:]GUEST[/PROTOCOL]> [<[HOST\:]GUEST[/PROTOCOL]> ...]] [`--env` <ENV> [<ENV> ...]]
14+
[`--sysctl` <SYSCTL> [<SYSCTL> ...]] [`--ulimit` <KEY=SOFT[\:HARD]> [<KEY=SOFT[\:HARD]> ...]] [`--shell` <SHELL>]
1515

1616
## DESCRIPTION
1717

@@ -109,6 +109,12 @@ Notice: unless differently stated, command line arguments (DEVICE_NAME) and opti
109109
* `--env` <ENV> [<ENV> ...]:
110110
Set an environment variable for the device. The format is: ENV_NAME=ENV_VALUE.
111111

112+
* `--ulimit` <KEY=SOFT[\:HARD]> [<KEY=SOFT[\:HARD]> ...]:
113+
Set a ulimit for the device.
114+
115+
Allows change of both SOFT and HARD limits.
116+
Use -1 for unlimited. If only a parameter is given, i.e. ULIMIT=SOFT, both SOFT and HARD limit will have same value.
117+
112118
* `--num_terms` <NUM_TERMS>:
113119
Choose the number of terminals to open for the device.
114120

docs/kathara.conf.5.ronn

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,15 @@ Each Manager specifies additional parameters which are used only when the Manage
137137

138138
Default to `IfNotPresent`.
139139

140+
* `docker_config_json` (string):
141+
Base64-encoded `config.json` JSON that is used create a Kubernetes Secret of type `kubernetes.io/dockerconfigjson`.
142+
143+
From the `kathara settings` menu, the user provides a filesystem path where the file is located. Kathara automatically opens and parses the file and stores the base64-encoded string into this value.
144+
145+
Please refer to the [official Kubernetes page](https://kubernetes.io/docs/concepts/configuration/secret/#docker-config-secrets) for further details on Kubernetes Secrets.
146+
147+
Default to null.
148+
140149
## EXAMPLE
141150

142151
{

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "kathara"
3-
version = "3.7.7"
3+
version = "3.7.8"
44
description = "A lightweight container-based network emulation tool."
55
readme = "README.md"
66
requires-python = ">=3.9"

scripts/Linux-Deb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/make -f
22

3-
VERSION=3.7.7
3+
VERSION=3.7.8
44
DEBIAN_PACKAGE_VERSION=1
55
LAUNCHPAD_NAME=user
66
NO_BINARY_PACKAGES=pyroute2|pyuv|deepdiff

scripts/Linux-Deb/debian/changelog

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
kathara (__VERSION__-__DEBIAN_PACKAGE_VERSION____UBUNTU_VERSION__) __UBUNTU_VERSION__; urgency=low
22

3-
* Properly set driver options to disable/enable IPV6
4-
* Minor fixes
3+
* WARNING: "ltest" command is deprecated. It will be removed in the next release! Please use the "kathara-lab-checker" tool as its replacement with enhanced functionalities.
4+
* Add "--topology" argument to "kathara linfo" that displays a list of collision domains and the devices connected to each of them
5+
* "kathara linfo" now displays a column with the connected interfaces of each device
6+
* "kathara exec" now returns the exact exit code of the command
7+
* API Improvements in the "Lab" object
8+
* (Docker) Fix "rp_filter" sysctl assigment on Docker Engine >= v27.0.0
9+
* (Docker) Add the possibility to specify "ulimits" in network scenario metadata (thanks to g4br-i)
10+
* (Docker) Fix compatibility with docker-io version numbers
11+
* (Kubernetes) Add the support to private image registries through the "docker.json" file (thanks to Giovanni Barbiero)
12+
* Minor bug fixes
513

6-
-- Kathara Team <[email protected]> __DATE__
14+
-- Kathara Team <[email protected]> __DATE__

scripts/Linux-Pkg/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/make -f
22

3-
VERSION=3.7.7
3+
VERSION=3.7.8
44
PACKAGE_VERSION=1
55
AUR_NAME=user
66

0 commit comments

Comments
 (0)