From efe1d44f502dfced8c3f70f293783a415b596426 Mon Sep 17 00:00:00 2001 From: kurtosisbot <89932784+kurtosisbot@users.noreply.github.com> Date: Tue, 14 Nov 2023 15:21:19 +0100 Subject: [PATCH 1/2] chore(main): release 0.85.21 (#1781) :robot: I have created a release *beep* *boop* --- ## [0.85.21](https://github.com/kurtosis-tech/kurtosis/compare/0.85.20...0.85.21) (2023-11-14) ### Features * show usage text when CLI cmd fails because of missing a required argument ([#1774](https://github.com/kurtosis-tech/kurtosis/issues/1774)) ([a7df8cf](https://github.com/kurtosis-tech/kurtosis/commit/a7df8cfff3bac270a9fb755ed71a55d1e72f3d5d)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: kurtosisbot --- CHANGELOG.md | 7 +++++++ LICENSE.md | 2 +- api/golang/kurtosis_version/kurtosis_version.go | 2 +- api/rust/Cargo.toml | 2 +- api/typescript/package.json | 2 +- api/typescript/src/kurtosis_version/kurtosis_version.ts | 2 +- version.txt | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b2c5ea210..145ce1c1cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.85.21](https://github.com/kurtosis-tech/kurtosis/compare/0.85.20...0.85.21) (2023-11-14) + + +### Features + +* show usage text when CLI cmd fails because of missing a required argument ([#1774](https://github.com/kurtosis-tech/kurtosis/issues/1774)) ([a7df8cf](https://github.com/kurtosis-tech/kurtosis/commit/a7df8cfff3bac270a9fb755ed71a55d1e72f3d5d)) + ## [0.85.20](https://github.com/kurtosis-tech/kurtosis/compare/0.85.19...0.85.20) (2023-11-14) diff --git a/LICENSE.md b/LICENSE.md index c73bd49a22..be9ec2ad89 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -3,7 +3,7 @@ Business Source License 1.1 Parameters Licensor: Kurtosis Technologies, Inc. -Licensed Work: Kurtosis 0.85.20 +Licensed Work: Kurtosis 0.85.21 The Licensed Work is (c) 2023 Kurtosis Technologies, Inc. Additional Use Grant: You may make use of the Licensed Work, provided that you may not use the Licensed Work for an Environment Orchestration Service. diff --git a/api/golang/kurtosis_version/kurtosis_version.go b/api/golang/kurtosis_version/kurtosis_version.go index a83ec27894..1fea07f8ca 100644 --- a/api/golang/kurtosis_version/kurtosis_version.go +++ b/api/golang/kurtosis_version/kurtosis_version.go @@ -9,6 +9,6 @@ const ( // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!! // This is necessary so that Kurt Core consumers will know if they're compatible with the currently-running // API container - KurtosisVersion = "0.85.20" + KurtosisVersion = "0.85.21" // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!! ) diff --git a/api/rust/Cargo.toml b/api/rust/Cargo.toml index cc9696e9a6..041cc5f8b2 100644 --- a/api/rust/Cargo.toml +++ b/api/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kurtosis-sdk" -version = "0.85.20" +version = "0.85.21" license = "BUSL-1.1" description = "Rust SDK for Kurtosis" edition = "2021" diff --git a/api/typescript/package.json b/api/typescript/package.json index 69760a544b..d6bfeb48df 100644 --- a/api/typescript/package.json +++ b/api/typescript/package.json @@ -1,7 +1,7 @@ { "name": "kurtosis-sdk", "//": "NOTE: DO NOT UPDATE THIS VERSION MANUALLY - IT WILL BE UPDATED DURING THE RELEASE PROCESS!", - "version": "0.85.20", + "version": "0.85.21", "main": "./build/index", "description": "This repo contains a Typescript client for communicating with the Kurtosis Engine server, which is responsible for creating, managing and destroying Kurtosis Enclaves.", "types": "./build/index", diff --git a/api/typescript/src/kurtosis_version/kurtosis_version.ts b/api/typescript/src/kurtosis_version/kurtosis_version.ts index 3632a97322..2c15bb4710 100644 --- a/api/typescript/src/kurtosis_version/kurtosis_version.ts +++ b/api/typescript/src/kurtosis_version/kurtosis_version.ts @@ -1,5 +1,5 @@ // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!! // This is necessary so that Kurt Core consumers (e.g. modules) will know if they're compatible with the currently-running // API container -export const KURTOSIS_VERSION: string = "0.85.20" +export const KURTOSIS_VERSION: string = "0.85.21" // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!! diff --git a/version.txt b/version.txt index 9d7027086f..fb76e44fca 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.85.20 +0.85.21 From 1eaf469ba0d8d1a742c8bdf544c42e4ff1b17b67 Mon Sep 17 00:00:00 2001 From: leoporoli Date: Wed, 15 Nov 2023 15:42:43 -0300 Subject: [PATCH 2/2] feat: configured CORS logs in the enclave manager server inside the Kurtosis engine (#1797) ## Description: configured CORS logs in the enclave manager server inside the Kurtosis engine ## Is this change user facing? NO ## References (if applicable): Related to [this ticket](https://github.com/kurtosis-tech/kurtosis/issues/1768), we need to see the logs --- .../docker_kurtosis_backend_api_container_functions.go | 6 ++++++ .../logs_collector_functions/create_logs_collector.go | 5 ++++- enclave-manager/server/server.go | 6 +++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/docker_kurtosis_backend_api_container_functions.go b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/docker_kurtosis_backend_api_container_functions.go index 24b22e8998..a44379b255 100644 --- a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/docker_kurtosis_backend_api_container_functions.go +++ b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/docker_kurtosis_backend_api_container_functions.go @@ -43,6 +43,8 @@ func (backend *DockerKurtosisBackend) CreateAPIContainer( ownIpAddressEnvVar string, customEnvVars map[string]string, ) (*api_container.APIContainer, error) { + logrus.Debugf("Creating the APIC for enclave '%v'", enclaveUuid) + // Verify no API container already exists in the enclave apiContainersInEnclaveFilters := &api_container.APIContainerFilters{ EnclaveIDs: map[enclave.EnclaveUUID]bool{ @@ -203,6 +205,7 @@ func (backend *DockerKurtosisBackend) CreateAPIContainer( return nil, stacktrace.Propagate(err, "An error occurred waiting for the API container's grpc port to become available") } + logrus.Debugf("Checking for the APIC availability in enclave '%v'...", enclaveUuid) if err := shared_helpers.WaitForPortAvailabilityUsingNetstat( ctx, backend.dockerManager, @@ -213,6 +216,7 @@ func (backend *DockerKurtosisBackend) CreateAPIContainer( ); err != nil { return nil, stacktrace.Propagate(err, "An error occurred waiting for the API container's grpc port to become available") } + logrus.Debugf("...APIC is available in enclave '%v'", enclaveUuid) bridgeNetworkIpAddress, err := backend.dockerManager.GetContainerIP(ctx, consts.NameOfNetworkToStartEngineAndLogServiceContainersIn, containerId) if err != nil { @@ -224,6 +228,8 @@ func (backend *DockerKurtosisBackend) CreateAPIContainer( return nil, stacktrace.Propagate(err, "An error occurred creating an API container object from container with ID '%v'", containerId) } + logrus.Debugf("APIC for enclave '%v' successfully created", enclaveUuid) + shouldKillContainer = false return result, nil } diff --git a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/logs_collector_functions/create_logs_collector.go b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/logs_collector_functions/create_logs_collector.go index 441c8d437a..fa88458a46 100644 --- a/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/logs_collector_functions/create_logs_collector.go +++ b/container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/logs_collector_functions/create_logs_collector.go @@ -37,7 +37,7 @@ func CreateLogsCollectorForEnclave( *logs_collector.LogsCollector, error, ) { - + logrus.Debugf("Creating logs collector for enclave '%v'", enclaveUuid) preExistingLogsCollectorContainers, err := getLogsCollectorForTheGivenEnclave(ctx, enclaveUuid, dockerManager) if err != nil { return nil, stacktrace.Propagate(err, "An error occurred getting logs collector containers for given enclave '%v'", enclaveUuid) @@ -118,9 +118,12 @@ func CreateLogsCollectorForEnclave( logsCollectorAvailabilityChecker := fluentbit.NewFluentbitAvailabilityChecker(logsCollectorObj.GetBridgeNetworkIpAddress(), logsCollectorObj.GetPrivateHttpPort().GetNumber()) + logrus.Debugf("Checking for logs collector availability in enclave '%v'...", enclaveUuid) if err = logsCollectorAvailabilityChecker.WaitForAvailability(); err != nil { return nil, stacktrace.Propagate(err, "An error occurred while waiting for the log container to become available") } + logrus.Debugf("...logs collector is available in enclave '%v'", enclaveUuid) + logrus.Debugf("Logs collector successfully created with container ID '%v' for enclave '%v'", containerId, enclaveUuid) shouldDisconnectLogsCollectorFromEnclaveNetwork = false shouldRemoveLogsCollectorContainerFunc = false diff --git a/enclave-manager/server/server.go b/enclave-manager/server/server.go index 42e4bd00c2..064ab9a957 100644 --- a/enclave-manager/server/server.go +++ b/enclave-manager/server/server.go @@ -520,7 +520,11 @@ func RunEnclaveManagerApiServer(enforceAuth bool) error { handler, apiPath, ) - if err := apiServer.RunServerUntilInterruptedWithCors(cors.AllowAll()); err != nil { + + emCors := cors.AllowAll() + emCors.Log = logrus.StandardLogger() + + if err := apiServer.RunServerUntilInterruptedWithCors(emCors); err != nil { logrus.Error("An error occurred running the server", err) } return nil