Skip to content

Commit ecbdefa

Browse files
authored
Merge branch 'main' into tedi/parallelexecution
2 parents 484ceef + 60c1776 commit ecbdefa

File tree

42 files changed

+599
-119
lines changed

Some content is hidden

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

42 files changed

+599
-119
lines changed

.circleci/config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ version: 2.1
146146

147147
orbs:
148148
npm-publisher: uraway/[email protected]
149-
kurtosis-docs-checker: kurtosis-tech/[email protected].9
149+
kurtosis-docs-checker: kurtosis-tech/[email protected].10
150150
slack: circleci/[email protected]
151151

152152
executors:
@@ -1384,6 +1384,9 @@ workflows:
13841384
},
13851385
{
13861386
"pattern": "http://localhost/.*"
1387+
},
1388+
{
1389+
"pattern": "https://react-hook-form.com/.*"
13871390
}
13881391
]
13891392
}

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.10.1"
2+
".": "1.11.0"
33
}

CHANGELOG.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,37 @@
11
# Changelog
22

3+
## [1.11.0](https://github.com/kurtosis-tech/kurtosis/compare/1.10.3...1.11.0) (2025-08-26)
4+
5+
6+
### Features
7+
8+
* add get cluster type ([#2792](https://github.com/kurtosis-tech/kurtosis/issues/2792)) ([3548179](https://github.com/kurtosis-tech/kurtosis/commit/3548179e33c5506c9c85cd32508b33eefd841fe9))
9+
* add k8s pod ip env var ([#2791](https://github.com/kurtosis-tech/kurtosis/issues/2791)) ([17e97d6](https://github.com/kurtosis-tech/kurtosis/commit/17e97d6c6aa34aba465321bbab4be83faf108f22))
10+
* tolerations and node selectors on tasks ([#2788](https://github.com/kurtosis-tech/kurtosis/issues/2788)) ([3b3c90c](https://github.com/kurtosis-tech/kurtosis/commit/3b3c90c065236977b903104a63cdc98b5dfaa7ca))
11+
12+
13+
### Bug Fixes
14+
15+
* **docs:** typo in CLI docs `--cli-level-log` -> `--cli-log-level` ([#2757](https://github.com/kurtosis-tech/kurtosis/issues/2757)) ([99ed25d](https://github.com/kurtosis-tech/kurtosis/commit/99ed25d1802e0da484572e127daaf76f20926207))
16+
* dont kill container ([#2780](https://github.com/kurtosis-tech/kurtosis/issues/2780)) ([d6df15b](https://github.com/kurtosis-tech/kurtosis/commit/d6df15b5b5a3b2537f8c066c92bc37fc8d2dcc2c))
17+
* in `GetFullServiceConfigStarlark` use `MinMillicpus` instead of `MaxMemory` ([#2760](https://github.com/kurtosis-tech/kurtosis/issues/2760)) ([f30f1f8](https://github.com/kurtosis-tech/kurtosis/commit/f30f1f868b68a19f47a17c7442246047cbbf96d3))
18+
* remove rate limited website ([#2796](https://github.com/kurtosis-tech/kurtosis/issues/2796)) ([d5cf14b](https://github.com/kurtosis-tech/kurtosis/commit/d5cf14b33d54c599a36428e86ae988fbee8883d5))
19+
20+
## [1.10.3](https://github.com/kurtosis-tech/kurtosis/compare/1.10.2...1.10.3) (2025-07-17)
21+
22+
23+
### Bug Fixes
24+
25+
* empty bridge network addr check ([#2770](https://github.com/kurtosis-tech/kurtosis/issues/2770)) ([4422ce8](https://github.com/kurtosis-tech/kurtosis/commit/4422ce8784c140d16c8642270700f5b222aabff4))
26+
* reduce logs agg container timeout ([#2777](https://github.com/kurtosis-tech/kurtosis/issues/2777)) ([1dc6ca4](https://github.com/kurtosis-tech/kurtosis/commit/1dc6ca424e810d4abe7b5507c32f3d0c7bd745e7))
27+
28+
## [1.10.2](https://github.com/kurtosis-tech/kurtosis/compare/1.10.1...1.10.2) (2025-07-08)
29+
30+
31+
### Bug Fixes
32+
33+
* docker auth bugs ([#2773](https://github.com/kurtosis-tech/kurtosis/issues/2773)) ([45ada05](https://github.com/kurtosis-tech/kurtosis/commit/45ada05521586ee6d2a1e3f48c1c3ae3a297c9e1))
34+
335
## [1.10.1](https://github.com/kurtosis-tech/kurtosis/compare/1.10.0...1.10.1) (2025-06-26)
436

537

api/golang/kurtosis_version/kurtosis_version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ const (
99
// !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
1010
// This is necessary so that Kurt Core consumers will know if they're compatible with the currently-running
1111
// API container
12-
KurtosisVersion = "1.10.1"
12+
KurtosisVersion = "1.11.0"
1313
// !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
1414
)

api/rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "kurtosis-sdk"
3-
version = "1.10.1"
3+
version = "1.11.0"
44
license = "BUSL-1.1"
55
description = "Rust SDK for Kurtosis"
66
edition = "2021"

api/typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "kurtosis-sdk",
33
"//": "NOTE: DO NOT UPDATE THIS VERSION MANUALLY - IT WILL BE UPDATED DURING THE RELEASE PROCESS!",
4-
"version": "1.10.1",
4+
"version": "1.11.0",
55
"main": "./build/index",
66
"description": "This repo contains a Typescript client for communicating with the Kurtosis Engine server, which is responsible for creating, managing and destroying Kurtosis Enclaves.",
77
"types": "./build/index",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
22
// This is necessary so that Kurt Core consumers (e.g. modules) will know if they're compatible with the currently-running
33
// API container
4-
export const KURTOSIS_VERSION: string = "1.10.1"
4+
export const KURTOSIS_VERSION: string = "1.11.0"
55
// !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!

cli/cli/commands/service/add/add.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ func run(
287287
serviceConfigJson.EnvVars,
288288
serviceConfigJson.MaxMillicpus,
289289
serviceConfigJson.MaxMemory,
290-
serviceConfigJson.MaxMemory,
290+
serviceConfigJson.MinMillicpus,
291291
serviceConfigJson.MinMemory,
292292
serviceConfigJson.User,
293293
serviceConfigJson.Tolerations,

cli/cli/helpers/output_printers/kurtosis_instruction_printer.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,9 @@ func formatInstructionToReadableString(instruction *kurtosis_core_rpc_api_bindin
222222
} else {
223223
serializedArg = arg.GetSerializedArgValue()
224224
}
225-
serializedInstructionComponents = append(serializedInstructionComponents, serializedArg)
225+
if serializedArg != "" {
226+
serializedInstructionComponents = append(serializedInstructionComponents, serializedArg)
227+
}
226228
}
227229
}
228230

container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/docker_kurtosis_backend_api_container_functions.go

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ func getApiContainerObjectFromContainerInfo(
477477
labels map[string]string,
478478
containerStatus types.ContainerStatus,
479479
allHostMachinePortBindings map[nat.Port]*nat.PortBinding,
480-
bridgeNetworkIpAddress string,
480+
bridgeNetworkIpAddrStr string,
481481
isProductionEnclave bool,
482482
) (*api_container.APIContainer, error) {
483483
enclaveId, found := labels[docker_label_key.EnclaveUUIDDockerLabelKey.GetString()]
@@ -497,9 +497,16 @@ func getApiContainerObjectFromContainerInfo(
497497
return nil, stacktrace.NewError("Couldn't parse private IP address string '%v' to an IP", privateIpAddrStr)
498498
}
499499

500-
bridgeNetworkIpAddressAddr := net.ParseIP(bridgeNetworkIpAddress)
501-
if privateIpAddr == nil {
502-
return nil, stacktrace.NewError("Couldn't parse bridge network IP address string '%v' to an IP", bridgeNetworkIpAddressAddr)
500+
var bridgeNetworkIpAddr net.IP
501+
502+
// Parse the bridge network IP address only if present (some APIContainers, e.g. stopped ones, may not be connected to the bridge network)
503+
if bridgeNetworkIpAddrStr != "" {
504+
bridgeNetworkIpAddr = net.ParseIP(bridgeNetworkIpAddrStr)
505+
if bridgeNetworkIpAddr == nil {
506+
return nil, stacktrace.NewError("Couldn't parse bridge network IP address string '%v' to an IP", bridgeNetworkIpAddrStr)
507+
}
508+
} else {
509+
logrus.Debugf("Received empty bridge network IP address for API container '%v' when attempting to convert to APIC info to object. This APIContainer is likely not connected to the bridge network.", containerId)
503510
}
504511

505512
privateGrpcPortSpec, err := getPrivateApiContainerPorts(labels)
@@ -537,7 +544,7 @@ func getApiContainerObjectFromContainerInfo(
537544
privateGrpcPortSpec,
538545
publicIpAddr,
539546
publicGrpcPortSpec,
540-
bridgeNetworkIpAddressAddr,
547+
bridgeNetworkIpAddr,
541548
isProductionEnclave,
542549
)
543550

0 commit comments

Comments
 (0)