Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,10 @@ sep:
# Helper to time a step: $(call timed,step_name,command)
define timed
@start=$$(date +%s); \
$(2); \
$(2); rc=$$?; \
elapsed=$$(( $$(date +%s) - $$start )); \
echo "⏱ $(1) completed in $${elapsed}s"
echo "⏱ $(1) completed in $${elapsed}s"; \
exit $$rc
endef

.PHONY: buf-dep
Expand Down
3 changes: 0 additions & 3 deletions buf.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,3 @@ deps:
- name: buf.build/googleapis/googleapis
commit: 62f35d8aed1149c291d606d958a7ce32
digest: b5:d66bf04adc77a0870bdc9328aaf887c7188a36fb02b83a480dc45ef9dc031b4d39fc6e9dc6435120ccf4fe5bfd5c6cb6592533c6c316595571f9a31420ab47fe
- name: buf.build/grpc-ecosystem/grpc-gateway
commit: 4836b6d552304e1bbe47e66a523f0daa
digest: b5:c3fefd4d3dfa9b0478bbb1a4ad87d7b38146e3ce6eff4214e32f2c5834c2e4afc3be218316f0fbd53e925a001c3ed1e2fc99fb76b3121ede642989f0d0d7c71c
1 change: 0 additions & 1 deletion buf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ modules:
deps:
- buf.build/googleapis/googleapis:62f35d8aed1149c291d606d958a7ce32
- buf.build/bufbuild/protovalidate:v0.14.1
- buf.build/grpc-ecosystem/grpc-gateway
lint:
except:
- PACKAGE_VERSION_SUFFIX
Expand Down
1 change: 0 additions & 1 deletion flyteidl2/cluster/service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ syntax = "proto3";
package flyteidl2.cluster;

import "flyteidl2/cluster/payload.proto";
import "google/api/annotations.proto";

option go_package = "github.com/flyteorg/flyte/v2/gen/go/flyteidl2/cluster";

Expand Down
32 changes: 16 additions & 16 deletions flyteidl2/settings/settings_definition.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
syntax = "proto3";

package flyteidl2.org;
package flyteidl2.settings;

import "buf/validate/validate.proto";
import "google/protobuf/descriptor.proto";
Expand Down Expand Up @@ -149,35 +149,35 @@ message QuantitySetting {

// RunSettings controls workflow execution behavior.
message RunSettings {
StringSetting default_queue = 1 [(flyteidl2.org.desc) = "Default queue for task runs"];
Int64Setting run_concurrency = 2 [(flyteidl2.org.desc) = "Maximum number of concurrent runs. 0 means unlimited."];
Int64Setting action_concurrency = 3 [(flyteidl2.org.desc) = "Maximum number of concurrent actions per run. 0 means unlimited."];
StringSetting default_queue = 1 [(flyteidl2.settings.desc) = "Default queue for task runs"];
Int64Setting run_concurrency = 2 [(flyteidl2.settings.desc) = "Maximum number of concurrent runs. 0 means unlimited."];
Int64Setting action_concurrency = 3 [(flyteidl2.settings.desc) = "Maximum number of concurrent actions per run. 0 means unlimited."];
}

// SecuritySettings controls security-related configuration.
message SecuritySettings {
StringSetting service_account = 1 [(flyteidl2.org.desc) = "Kubernetes service account for task pods"];
StringSetting service_account = 1 [(flyteidl2.settings.desc) = "Kubernetes service account for task pods"];
}

// StorageSettings controls data storage configuration.
message StorageSettings {
StringSetting raw_data_path = 1 [(flyteidl2.org.desc) = "Base path for raw data storage (e.g. s3://my-bucket/prefix)"];
StringSetting raw_data_path = 1 [(flyteidl2.settings.desc) = "Base path for raw data storage (e.g. s3://my-bucket/prefix)"];
}

// TaskResourceDefaults holds resource quantity settings for a single bound
// (min or max) across all supported resource dimensions.
message TaskResourceDefaults {
QuantitySetting cpu = 1 [(flyteidl2.org.desc) = "CPU resource quantity (e.g. \"500m\", \"2\")"];
QuantitySetting gpu = 2 [(flyteidl2.org.desc) = "GPU resource quantity (e.g. \"1\")"];
QuantitySetting memory = 3 [(flyteidl2.org.desc) = "Memory resource quantity (e.g. \"256Mi\", \"4Gi\")"];
QuantitySetting storage = 4 [(flyteidl2.org.desc) = "Ephemeral storage quantity (e.g. \"10Gi\")"];
QuantitySetting cpu = 1 [(flyteidl2.settings.desc) = "CPU resource quantity (e.g. \"500m\", \"2\")"];
QuantitySetting gpu = 2 [(flyteidl2.settings.desc) = "GPU resource quantity (e.g. \"1\")"];
QuantitySetting memory = 3 [(flyteidl2.settings.desc) = "Memory resource quantity (e.g. \"256Mi\", \"4Gi\")"];
QuantitySetting storage = 4 [(flyteidl2.settings.desc) = "Ephemeral storage quantity (e.g. \"10Gi\")"];
}

// TaskResourceSettings controls task resource configuration.
message TaskResourceSettings {
TaskResourceDefaults min = 1 [(flyteidl2.org.desc) = "Minimum resource requests applied to task pods"];
TaskResourceDefaults max = 2 [(flyteidl2.org.desc) = "Maximum resource limits applied to task pods"];
BoolSetting mirror_limits_request = 3 [(flyteidl2.org.desc) = "When true, resource limits mirror requests"];
TaskResourceDefaults min = 1 [(flyteidl2.settings.desc) = "Minimum resource requests applied to task pods"];
TaskResourceDefaults max = 2 [(flyteidl2.settings.desc) = "Maximum resource limits applied to task pods"];
BoolSetting mirror_limits_request = 3 [(flyteidl2.settings.desc) = "When true, resource limits mirror requests"];
}

// Settings holds all configurable settings for a scope.
Expand All @@ -186,7 +186,7 @@ message Settings {
SecuritySettings security = 2;
StorageSettings storage = 3;
TaskResourceSettings task_resource = 4;
StringListSetting labels = 5 [(flyteidl2.org.desc) = "Kubernetes labels applied to task pods. Additive across scopes."];
StringMapSetting annotations = 6 [(flyteidl2.org.desc) = "Kubernetes annotations applied to task pods. Child overrides parent on key conflict."];
StringMapSetting environment_variables = 7 [(flyteidl2.org.desc) = "Environment variables injected into task pods. Child overrides parent on key conflict."];
StringListSetting labels = 5 [(flyteidl2.settings.desc) = "Kubernetes labels applied to task pods. Additive across scopes."];
StringMapSetting annotations = 6 [(flyteidl2.settings.desc) = "Kubernetes annotations applied to task pods. Child overrides parent on key conflict."];
StringMapSetting environment_variables = 7 [(flyteidl2.settings.desc) = "Environment variables injected into task pods. Child overrides parent on key conflict."];
}
2 changes: 1 addition & 1 deletion flyteidl2/settings/settings_service.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
syntax = "proto3";

package flyteidl2.org;
package flyteidl2.settings;

import "buf/validate/validate.proto";
import "flyteidl2/settings/settings_definition.proto";
Expand Down
1 change: 0 additions & 1 deletion flyteidl2/workflow/queue_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package flyteidl2.workflow;

import "buf/validate/validate.proto";
import "flyteidl2/common/identifier.proto";
import "flyteidl2/task/common.proto";
import "flyteidl2/task/run.proto";
import "flyteidl2/workflow/run_definition.proto";

Expand Down
45 changes: 21 additions & 24 deletions gen/go/flyteidl2/cluster/service.pb.go

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

Loading
Loading