Skip to content

Commit

Permalink
Merge branch 'main' into lporoli/fix-replace
Browse files Browse the repository at this point in the history
  • Loading branch information
leoporoli committed Mar 14, 2024
2 parents a11b604 + 6646c20 commit 93c075f
Show file tree
Hide file tree
Showing 151 changed files with 7,211 additions and 1,502 deletions.
7 changes: 5 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
## Description:
## Description
<!-- Describe this change, how it works, and the motivation behind it. -->

## REMINDER: Tag Reviewers, so they get notified to review

## Is this change user facing?
YES/NO
<!-- If yes, please add the "user facing" label to the PR -->
<!-- If yes, don't forget to include docs changes where relevant -->

## References (if applicable):
## References (if applicable)
<!-- Add relevant Github Issues, Discord threads, or other helpful information. -->
<!-- You can auto-close issues by putting "Fixes #XXXX" here. -->
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Changelog

## [0.88.6](https://github.com/kurtosis-tech/kurtosis/compare/0.88.5...0.88.6) (2024-03-13)


### Features

* define `build_args` in `ImageBuildSpec` ([#2257](https://github.com/kurtosis-tech/kurtosis/issues/2257)) ([9812375](https://github.com/kurtosis-tech/kurtosis/commit/9812375f1258a2b15394b98a116741e3bfd366bd))
* generate plan yamls ([#2177](https://github.com/kurtosis-tech/kurtosis/issues/2177)) ([2292010](https://github.com/kurtosis-tech/kurtosis/commit/2292010f6a62cfd9aa1b9f0e6616ac02a315e941))
* port guessing based on port number for docker transpiler ([#2281](https://github.com/kurtosis-tech/kurtosis/issues/2281)) ([5c98ce2](https://github.com/kurtosis-tech/kurtosis/commit/5c98ce26778d07ea5194bb186b032955599e48f8))
* support package nodes in enclave builder ui ([#2283](https://github.com/kurtosis-tech/kurtosis/issues/2283)) ([7fa27ed](https://github.com/kurtosis-tech/kurtosis/commit/7fa27ed1b1ea56deff945a58f63ada5c5c1fe4e6))

## [0.88.5](https://github.com/kurtosis-tech/kurtosis/compare/0.88.4...0.88.5) (2024-03-12)


### Features

* add an add to GitHub button on an encalve ([#2256](https://github.com/kurtosis-tech/kurtosis/issues/2256)) ([96f6771](https://github.com/kurtosis-tech/kurtosis/commit/96f67712d83d9d89b1575b32f256522220a8ed94))


### Bug Fixes

* image download mode always applies to k8s as well ([#2271](https://github.com/kurtosis-tech/kurtosis/issues/2271)) ([2e90c67](https://github.com/kurtosis-tech/kurtosis/commit/2e90c672abe576c0ccfa385e95af59980678a395))

## [0.88.4](https://github.com/kurtosis-tech/kurtosis/compare/0.88.3...0.88.4) (2024-03-11)


Expand Down
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Business Source License 1.1
Parameters

Licensor: Kurtosis Technologies, Inc.
Licensed Work: Kurtosis 0.88.4
Licensed Work: Kurtosis 0.88.6
The Licensed Work is (c) 2024 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.
Expand All @@ -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: 2028-03-11
Change Date: 2028-03-13

Change License: Apache 2.0 (Apache License, Version 2.0)

Expand Down

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/golang/kurtosis_version/kurtosis_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.88.4"
KurtosisVersion = "0.88.6"
// !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
)
37 changes: 37 additions & 0 deletions api/protobuf/core/api_container_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ service ApiContainerService {

// Get last Starlark run
rpc GetStarlarkRun(google.protobuf.Empty) returns (GetStarlarkRunResponse) {};

// Gets yaml representing the plan the script will execute in an enclave
rpc GetStarlarkScriptPlanYaml(StarlarkScriptPlanYamlArgs) returns (PlanYaml) {};

// Gets yaml representing the plan the package will execute in an enclave
rpc GetStarlarkPackagePlanYaml(StarlarkPackagePlanYamlArgs) returns (PlanYaml) {};
}

// ==============================================================================================
Expand Down Expand Up @@ -564,3 +570,34 @@ message GetStarlarkRunResponse {

RestartPolicy restart_policy = 8;
}

// ==============================================================================================
// Get Starlark Plan Yaml
// ==============================================================================================

message PlanYaml {
string plan_yaml = 1;
}

message StarlarkScriptPlanYamlArgs {
string serialized_script = 1;

optional string serialized_params = 2;

// The name of the main function, the default value is "run"
optional string main_function_name = 5;
}

message StarlarkPackagePlanYamlArgs {
string package_id = 1;

// Serialized parameters data for the Starlark package main function
// This should be a valid JSON string
optional string serialized_params = 2;

// The relative main file filepath, the default value is the "main.star" file in the root of a package
optional string relative_path_to_main_file = 3;

// The name of the main function, the default value is "run"
optional string main_function_name = 4;
}
Loading

0 comments on commit 93c075f

Please sign in to comment.