Skip to content

Commit

Permalink
Merge branch 'tedi/dependencylist' into tedi/podmansock
Browse files Browse the repository at this point in the history
  • Loading branch information
tedim52 committed Nov 21, 2024
2 parents 2422cf2 + dcb43e1 commit d9e4235
Show file tree
Hide file tree
Showing 60 changed files with 1,826 additions and 1,006 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -765,9 +765,9 @@ jobs:
false
fi
- run:
name: "Verify Kurtosis cleaned up all its volumes (except for the log storage and github auth storage volumes)"
name: "Verify Kurtosis cleaned up all its volumes (except for the log storage, github auth storage, docker auth config volumes)"
command: |
if ! [ $(docker volume ls | grep -v kurtosis-logs-collector-vol | grep -v kurtosis-logs-db-vol | tail -n+2 | wc -l ) -eq 2 ]; then
if ! [ $(docker volume ls | grep -v kurtosis-logs-collector-vol | grep -v kurtosis-logs-db-vol | tail -n+2 | wc -l ) -eq 3 ]; then
docker volume ls
false
fi
Expand Down Expand Up @@ -1004,9 +1004,9 @@ jobs:
false
fi
- run:
name: "Verify Kurtosis cleaned up all its volumes (except for the log storage and github auth storage volumes)"
name: "Verify Kurtosis cleaned up all its volumes (except for the log storage, github auth storage, docker auth config volumes)"
command: |
if ! [ $(docker volume ls | grep -v kurtosis-logs-collector-vol | grep -v kurtosis-logs-db-vol | tail -n+2 | wc -l) -eq 2 ]; then
if ! [ $(docker volume ls | grep -v kurtosis-logs-collector-vol | grep -v kurtosis-logs-db-vol | tail -n+2 | wc -l) -eq 3 ]; then
docker volume ls
false
fi
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,11 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'kurtosis-tech/kurtosis'
steps:
- uses: google-github-actions/release-please-action@v3
- uses: googleapis/release-please-action@d1a8f221d7723166f48a584aebba00ef3f6febec
with:
# We use the RELEASER_TOKEN so that the GitHub Actions
# can run on the PR created
# https://github.com/kurtosis-tech/kurtosis/issues/688
token: "${{ secrets.RELEASER_TOKEN }}"
release-type: simple
package-name: kurtosis
bump-minor-pre-major: false
bump-patch-for-minor-pre-major: false
# Our CI, Docker Images, Kurtosis-SDK bumps all depend on
# non v tags
include-v-in-tag: false
config-file: release-please-config.json
manifest-file: .release-please-manifest.json
3 changes: 3 additions & 0 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
".": "1.4.1"
}
34 changes: 34 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,39 @@
# Changelog

## [1.4.1](https://github.com/kurtosis-tech/kurtosis/compare/1.4.0...v1.4.1) (2024-11-01)


### Bug Fixes

* add rafael as maintainer ([#2583](https://github.com/kurtosis-tech/kurtosis/issues/2583)) ([ab5eb9e](https://github.com/kurtosis-tech/kurtosis/commit/ab5eb9efdbccfae28ee56ee96350daef7412c6ae))
* docker auth panic ([b36ddc9](https://github.com/kurtosis-tech/kurtosis/commit/b36ddc9d6c3b2baa8fe03a3f27ec5f3cae68c043))

## [1.4.0](https://github.com/kurtosis-tech/kurtosis/compare/1.3.1...1.4.0) (2024-10-29)


### Features

* support auth from docker config ([#2560](https://github.com/kurtosis-tech/kurtosis/issues/2560)) ([dab4470](https://github.com/kurtosis-tech/kurtosis/commit/dab4470ec18f7324b22b780de8d923ceef965428))

## [1.3.1](https://github.com/kurtosis-tech/kurtosis/compare/1.3.0...1.3.1) (2024-10-15)


### Bug Fixes

* use docker client without timeout for copy files operation ([#2565](https://github.com/kurtosis-tech/kurtosis/issues/2565)) ([a48ed55](https://github.com/kurtosis-tech/kurtosis/commit/a48ed55069bf7dce77b322bc30c4070a2c85cd7d))

## [1.3.0](https://github.com/kurtosis-tech/kurtosis/compare/1.2.0...1.3.0) (2024-09-18)


### Features

* increase max upload size ([#2552](https://github.com/kurtosis-tech/kurtosis/issues/2552)) ([b6a0d91](https://github.com/kurtosis-tech/kurtosis/commit/b6a0d9176431e6ab70d6f0c4a7cc3c95a6cc5e30))


### Bug Fixes

* Fix typo in the port name format help ([#2550](https://github.com/kurtosis-tech/kurtosis/issues/2550)) ([256d71a](https://github.com/kurtosis-tech/kurtosis/commit/256d71a48b517500ff19df346208bd147666a55a))

## [1.2.0](https://github.com/kurtosis-tech/kurtosis/compare/1.1.0...1.2.0) (2024-08-29)


Expand Down
2 changes: 2 additions & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ This document lists the individuals who are responsible for maintaining and cont
- [Dan Park](https://github.com/chunha-park) - BD/Product Marketing @KurtosisTech
- [Barnabas Busa](https://github.com/barnabasbusa) - Dev Ops @Ethereum Foundation
- [Parithosh Jayanthi](https://github.com/parithosh) - Dev Ops @Ethereum Foundation
- [Rafael Matias](https://github.com/skylenet) - Dev Ops @Ethereum Foundation
- [John Hilliard](https://github.com/praetoriansentry) - Dev Tools @Polygon Labs
- [Léo Vincent](https://github.com/leovct) - Dev Tools @Polygon Labs
- [Kevin Today](https://github.com/mieubrisse) - Original Contributor

For any inquiries or questions regarding the project, please contact one of the core maintainers listed above.

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

12 changes: 5 additions & 7 deletions api/golang/core/lib/enclaves/enclave_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -531,25 +531,24 @@ func (enclaveCtx *EnclaveContext) GetStarlarkRun(ctx context.Context) (*kurtosis
return response, nil
}

func (enclaveCtx *EnclaveContext) GetStarlarkPackagePlanYaml(ctx context.Context, packageId string, serializedParams string, dependenciesOnly bool) (*kurtosis_core_rpc_api_bindings.PlanYaml, error) {
func (enclaveCtx *EnclaveContext) GetStarlarkPackagePlanYaml(ctx context.Context, packageId string, serializedParams string) (*kurtosis_core_rpc_api_bindings.PlanYaml, error) {
serializedParams, err := maybeParseYaml(serializedParams)
if err != nil {
return nil, stacktrace.Propagate(err, "An error occurred when parsing YAML args for package '%v'", serializedParams)
return nil, stacktrace.Propagate(err, "An error occurred when parsing YAML args for package '%s':\n%s", packageId, serializedParams)
}
response, err := enclaveCtx.client.GetStarlarkPackagePlanYaml(ctx, &kurtosis_core_rpc_api_bindings.StarlarkPackagePlanYamlArgs{
PackageId: packageId,
SerializedParams: &serializedParams,
RelativePathToMainFile: nil,
MainFunctionName: nil,
DependenciesOnly: &dependenciesOnly,
})
if err != nil {
return nil, stacktrace.Propagate(err, "An error occurred while getting the starlark package plan yaml run.")
return nil, stacktrace.Propagate(err, "An error occurred while getting the Starlark package plan yaml.")
}
return response, nil
}

func (enclaveCtx *EnclaveContext) GetStarlarkScriptPlanYaml(ctx context.Context, serializedScript string, serializedParams string, dependenciesOnly bool) (*kurtosis_core_rpc_api_bindings.PlanYaml, error) {
func (enclaveCtx *EnclaveContext) GetStarlarkScriptPlanYaml(ctx context.Context, serializedScript string, serializedParams string) (*kurtosis_core_rpc_api_bindings.PlanYaml, error) {
serializedParams, err := maybeParseYaml(serializedParams)
if err != nil {
return nil, stacktrace.Propagate(err, "An error occurred when parsing YAML args for package '%v'", serializedParams)
Expand All @@ -558,10 +557,9 @@ func (enclaveCtx *EnclaveContext) GetStarlarkScriptPlanYaml(ctx context.Context,
SerializedScript: serializedScript,
SerializedParams: &serializedParams,
MainFunctionName: nil,
DependenciesOnly: &dependenciesOnly,
})
if err != nil {
return nil, stacktrace.Propagate(err, "An error occurred while getting the last starlark script plan yaml run.")
return nil, stacktrace.Propagate(err, "An error occurred while getting the starlark script plan yaml.")
}
return response, nil
}
Expand Down
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 = "1.2.0"
KurtosisVersion = "1.4.1"
// !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
)
6 changes: 0 additions & 6 deletions api/protobuf/core/api_container_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -598,9 +598,6 @@ message StarlarkScriptPlanYamlArgs {

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

// Whether to return only the dependencies of the starlark script
optional bool dependencies_only = 6;
}

message StarlarkPackagePlanYamlArgs {
Expand All @@ -615,7 +612,4 @@ message StarlarkPackagePlanYamlArgs {

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

// Whether to return only the dependencies of the Starlark package
optional bool dependencies_only = 5;
}
2 changes: 1 addition & 1 deletion api/rust/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "kurtosis-sdk"
version = "1.2.0"
version = "1.4.1"
license = "BUSL-1.1"
description = "Rust SDK for Kurtosis"
edition = "2021"
Expand Down
6 changes: 0 additions & 6 deletions api/rust/src/api_container_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -709,9 +709,6 @@ pub struct StarlarkScriptPlanYamlArgs {
/// The name of the main function, the default value is "run"
#[prost(string, optional, tag = "5")]
pub main_function_name: ::core::option::Option<::prost::alloc::string::String>,
/// Whether to return only the dependencies of the starlark script
#[prost(bool, optional, tag = "6")]
pub dependencies_only: ::core::option::Option<bool>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
Expand All @@ -730,9 +727,6 @@ pub struct StarlarkPackagePlanYamlArgs {
/// The name of the main function, the default value is "run"
#[prost(string, optional, tag = "4")]
pub main_function_name: ::core::option::Option<::prost::alloc::string::String>,
/// Whether to return only the dependencies of the Starlark package
#[prost(bool, optional, tag = "5")]
pub dependencies_only: ::core::option::Option<bool>,
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
#[repr(i32)]
Expand Down
Loading

0 comments on commit d9e4235

Please sign in to comment.