Merge branch 'main' into tedi/image-build-spec

kurtosis-tech · Dec 19, 2023 · 825ba6f · 825ba6f
2 parents e672007 + f8bca35
commit 825ba6f
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.85.51](https://github.com/kurtosis-tech/kurtosis/compare/0.85.50...0.85.51) (2023-12-19)
+
+
+### Features
+
+* catalog show run count ([#1975](https://github.com/kurtosis-tech/kurtosis/issues/1975)) ([5f29a12](https://github.com/kurtosis-tech/kurtosis/commit/5f29a12a891a18ddf8a0f48ed806acb125008fc2))
+* update api path and keep alive ([#1976](https://github.com/kurtosis-tech/kurtosis/issues/1976)) ([e026109](https://github.com/kurtosis-tech/kurtosis/commit/e0261098ae7870caa7804a120e7ee408d053854f))
+
+
+### Bug Fixes
+
+* fix nil pointer error when getting reverse proxy from the cluster ([#1980](https://github.com/kurtosis-tech/kurtosis/issues/1980)) ([f20c290](https://github.com/kurtosis-tech/kurtosis/commit/f20c290143e801d3f48fe8f29ea6399ed50ecb48))
+
 ## [0.85.50](https://github.com/kurtosis-tech/kurtosis/compare/0.85.49...0.85.50) (2023-12-18)
 
 

diff --git 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.50
+Licensed Work:        Kurtosis 0.85.51
 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.
@@ -12,7 +12,7 @@ you may not use the Licensed Work for an Environment Orchestration Service.
                       allows third parties (other than your employees and
                       contractors) to create distributed system environments.
 
-Change Date:          2027-12-18
+Change Date:          2027-12-19
 
 Change License:       Apache 2.0 (Apache License, Version 2.0)
 

diff --git 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.50"
+	KurtosisVersion = "0.85.51"
 	// !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
 )
diff --git a/api/rust/Cargo.toml b/api/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kurtosis-sdk"
-version = "0.85.50"
+version = "0.85.51"
 license = "BUSL-1.1"
 description = "Rust SDK for Kurtosis"
 edition = "2021"

diff --git 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.50",
+    "version": "0.85.51",
     "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
@@ -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.50"
+export const KURTOSIS_VERSION: string = "0.85.51"
 // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
diff --git a/...e-lib/lib/backend_impls/docker/docker_kurtosis_backend/backend_creator/backend_creator.go b/...e-lib/lib/backend_impls/docker/docker_kurtosis_backend/backend_creator/backend_creator.go
@@ -240,13 +240,17 @@ func getDockerKurtosisBackend(
 			return nil, stacktrace.Propagate(err, "An error occurred while getting the logs collector object for enclave '%v'; This is a bug in Kurtosis", enclaveUuid)
 		}
 
-		reverseProxy, err := reverse_proxy_functions.GetReverseProxy(ctx, dockerManager)
+		maybeReverseProxy, err := reverse_proxy_functions.GetReverseProxy(ctx, dockerManager)
 		if err != nil {
 			return nil, stacktrace.Propagate(err, "An error occurred while getting the reverse proxy, This is a bug in Kurtosis")
 		}
-		reverseProxyEnclaveNetworkIpAddress, found := reverseProxy.GetEnclaveNetworksIpAddress()[network.GetId()]
+		if maybeReverseProxy == nil {
+			return nil, stacktrace.Propagate(err, "The reverse proxy is not running, This is a bug in Kurtosis")
+		}
+
+		reverseProxyEnclaveNetworkIpAddress, found := maybeReverseProxy.GetEnclaveNetworksIpAddress()[network.GetId()]
 		if !found {
-			return nil, stacktrace.NewError("An error occured while getting the reverse proxy enclave network IP address for enclave '%v', This is a bug in Kurtosis", enclaveUuid)
+			return nil, stacktrace.NewError("An error occurred while getting the reverse proxy enclave network IP address for enclave '%v', This is a bug in Kurtosis", enclaveUuid)
 		}
 
 		alreadyTakenIps := map[string]bool{

diff --git a/enclave-manager/web/lerna.json b/enclave-manager/web/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.85.50",
+  "version": "0.85.51",
   "npmClient": "yarn",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": false,

diff --git a/enclave-manager/web/packages/app/package.json b/enclave-manager/web/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kurtosis/emui-app",
-  "version": "0.85.50",
+  "version": "0.85.51",
   "private": true,
   "homepage": ".",
   "dependencies": {
@@ -9,7 +9,7 @@
     "html-react-parser": "^4.2.2",
     "js-cookie": "^3.0.5",
     "kurtosis-cloud-indexer-sdk": "^0.0.2",
-    "kurtosis-ui-components": "0.85.50",
+    "kurtosis-ui-components": "0.85.51",
     "react-error-boundary": "^4.0.11",
     "react-hook-form": "^7.47.0",
     "yaml": "^2.3.4"

diff --git a/enclave-manager/web/packages/components/package.json b/enclave-manager/web/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kurtosis-ui-components",
-  "version": "0.85.50",
+  "version": "0.85.51",
   "private": false,
   "main": "build/index",
   "description": "This repo contains components used by Kurtosis UI applications.",

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.85.50
+0.85.51