From 07fbf97d13119816591a23b452e35f68a28eadd2 Mon Sep 17 00:00:00 2001 From: Guozhen La Date: Thu, 27 Jul 2023 17:11:10 -0400 Subject: [PATCH 1/9] init Signed-off-by: Guozhen La --- protos/flyteidl/plugins/ray.proto | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/protos/flyteidl/plugins/ray.proto b/protos/flyteidl/plugins/ray.proto index a0a06b4e9..412ab2bd6 100644 --- a/protos/flyteidl/plugins/ray.proto +++ b/protos/flyteidl/plugins/ray.proto @@ -1,5 +1,7 @@ syntax = "proto3"; +import "flyteidl/core/tasks.proto"; + package flyteidl.plugins; option go_package = "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins"; @@ -19,6 +21,8 @@ message RayCluster { HeadGroupSpec head_group_spec = 1; // WorkerGroupSpecs are the specs for the worker pods repeated WorkerGroupSpec worker_group_spec = 2; + // Namespace under which to create the RayCluster + string namespace = 3; } // HeadGroupSpec are the spec for the head pod @@ -26,6 +30,8 @@ message HeadGroupSpec { // Optional. RayStartParams are the params of the start command: address, object-store-memory. // Refer to https://docs.ray.io/en/latest/ray-core/package-ref.html#ray-start map ray_start_params = 1; + // Resource specification for ray head pod + Resource resources = 6; } // WorkerGroupSpec are the specs for the worker pods @@ -41,4 +47,6 @@ message WorkerGroupSpec { // Optional. RayStartParams are the params of the start command: address, object-store-memory. // Refer to https://docs.ray.io/en/latest/ray-core/package-ref.html#ray-start map ray_start_params = 5; + // Resource specification for ray worker pods + Resource resources = 6; } From bae1d8b92f6d9c4a42ba46acca24d232e312fdfd Mon Sep 17 00:00:00 2001 From: Guozhen La Date: Fri, 4 Aug 2023 15:52:24 -0400 Subject: [PATCH 2/9] add map for addl configs Signed-off-by: Guozhen La --- protos/flyteidl/plugins/ray.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protos/flyteidl/plugins/ray.proto b/protos/flyteidl/plugins/ray.proto index 412ab2bd6..9add70694 100644 --- a/protos/flyteidl/plugins/ray.proto +++ b/protos/flyteidl/plugins/ray.proto @@ -21,8 +21,8 @@ message RayCluster { HeadGroupSpec head_group_spec = 1; // WorkerGroupSpecs are the specs for the worker pods repeated WorkerGroupSpec worker_group_spec = 2; - // Namespace under which to create the RayCluster - string namespace = 3; + // Additional parameter overrides for ray cluster config + map ray_cluster_params = 3; } // HeadGroupSpec are the spec for the head pod From dd6a9bc87c10ac176a805bae70a6ddf5d223f230 Mon Sep 17 00:00:00 2001 From: Guozhen La Date: Fri, 4 Aug 2023 16:31:55 -0400 Subject: [PATCH 3/9] typo Signed-off-by: Guozhen La --- protos/flyteidl/plugins/ray.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protos/flyteidl/plugins/ray.proto b/protos/flyteidl/plugins/ray.proto index 9add70694..e3d872344 100644 --- a/protos/flyteidl/plugins/ray.proto +++ b/protos/flyteidl/plugins/ray.proto @@ -31,7 +31,7 @@ message HeadGroupSpec { // Refer to https://docs.ray.io/en/latest/ray-core/package-ref.html#ray-start map ray_start_params = 1; // Resource specification for ray head pod - Resource resources = 6; + Resources resources = 6; } // WorkerGroupSpec are the specs for the worker pods @@ -48,5 +48,5 @@ message WorkerGroupSpec { // Refer to https://docs.ray.io/en/latest/ray-core/package-ref.html#ray-start map ray_start_params = 5; // Resource specification for ray worker pods - Resource resources = 6; + Resources resources = 6; } From 5561ee9d444277dc68dbbfc68d30ad3f9c438be4 Mon Sep 17 00:00:00 2001 From: Guozhen La Date: Tue, 8 Aug 2023 13:23:18 -0400 Subject: [PATCH 4/9] fix import Signed-off-by: Guozhen La --- protos/flyteidl/plugins/ray.proto | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/protos/flyteidl/plugins/ray.proto b/protos/flyteidl/plugins/ray.proto index e3d872344..383a615e1 100644 --- a/protos/flyteidl/plugins/ray.proto +++ b/protos/flyteidl/plugins/ray.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -import "flyteidl/core/tasks.proto"; - package flyteidl.plugins; option go_package = "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins"; +import "flyteidl/core/tasks.proto"; + // RayJobSpec defines the desired state of RayJob message RayJob { // RayClusterSpec is the cluster template to run the job @@ -31,7 +31,7 @@ message HeadGroupSpec { // Refer to https://docs.ray.io/en/latest/ray-core/package-ref.html#ray-start map ray_start_params = 1; // Resource specification for ray head pod - Resources resources = 6; + core.Resources resources = 6; } // WorkerGroupSpec are the specs for the worker pods @@ -48,5 +48,5 @@ message WorkerGroupSpec { // Refer to https://docs.ray.io/en/latest/ray-core/package-ref.html#ray-start map ray_start_params = 5; // Resource specification for ray worker pods - Resources resources = 6; + core.Resources resources = 6; } From 8af47ad555cd379fd53ab34f31273e85cffe14a4 Mon Sep 17 00:00:00 2001 From: Guozhen La Date: Tue, 8 Aug 2023 14:43:08 -0400 Subject: [PATCH 5/9] make generate Signed-off-by: Guozhen La --- boilerplate/flyte/golang_support_tools/go.mod | 15 +- boilerplate/flyte/golang_support_tools/go.sum | 52 +- gen/pb-cpp/flyteidl/plugins/ray.pb.cc | 480 ++++++++- gen/pb-cpp/flyteidl/plugins/ray.pb.h | 185 +++- gen/pb-go/flyteidl/plugins/ray.pb.go | 111 ++- gen/pb-go/flyteidl/plugins/ray.pb.validate.go | 22 + gen/pb-java/flyteidl/plugins/Ray.java | 942 +++++++++++++++++- gen/pb_python/flyteidl/plugins/ray_pb2.py | 31 +- gen/pb_python/flyteidl/plugins/ray_pb2.pyi | 26 +- gen/pb_rust/flyteidl.plugins.rs | 9 + 10 files changed, 1702 insertions(+), 171 deletions(-) diff --git a/boilerplate/flyte/golang_support_tools/go.mod b/boilerplate/flyte/golang_support_tools/go.mod index dbf94f411..d60582796 100644 --- a/boilerplate/flyte/golang_support_tools/go.mod +++ b/boilerplate/flyte/golang_support_tools/go.mod @@ -1,6 +1,6 @@ module github.com/flyteorg/boilerplate -go 1.17 +go 1.19 require ( github.com/EngHabu/mockery v0.0.0-20220405200825-3f76291311cf @@ -163,16 +163,15 @@ require ( github.com/ultraware/whitespace v0.0.4 // indirect github.com/uudashr/gocognit v1.0.1 // indirect go.opencensus.io v0.22.6 // indirect - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect + golang.org/x/crypto v0.11.0 // indirect golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect - golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect - golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/net v0.12.0 // indirect golang.org/x/oauth2 v0.0.0-20210126194326-f9ce19ea3013 // indirect - golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect - golang.org/x/text v0.3.7 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect - golang.org/x/tools v0.1.10 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + golang.org/x/tools v0.11.1 // indirect google.golang.org/api v0.38.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506 // indirect diff --git a/boilerplate/flyte/golang_support_tools/go.sum b/boilerplate/flyte/golang_support_tools/go.sum index 02895fb57..c9b663bf4 100644 --- a/boilerplate/flyte/golang_support_tools/go.sum +++ b/boilerplate/flyte/golang_support_tools/go.sum @@ -51,27 +51,19 @@ github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 h1:Px2UA+2RvSSvv+RvJ github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= github.com/Azure/go-autorest/autorest v0.11.17 h1:2zCdHwNgRH+St1J+ZMf66xI8aLr/5KMy+wWLH97zwYM= github.com/Azure/go-autorest/autorest v0.11.17/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/adal v0.9.10 h1:r6fZHMaHD8B6LDCn0o5vyBFHIHrM6Ywwx7mb49lPItI= github.com/Azure/go-autorest/autorest/adal v0.9.10/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= -github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= -github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= -github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= github.com/Azure/go-autorest/logger v0.2.0 h1:e4RVHVZKC5p6UANLJHkM4OfR1UKZPj8Wt8Pcx+3oqrE= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= @@ -123,12 +115,10 @@ github.com/ashanbrown/forbidigo v1.1.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBF github.com/ashanbrown/makezero v0.0.0-20201205152432-7b7cdbb3025a h1:/U9tbJzDRof4fOR51vwzWdIBsIH6R2yU0KG1MBRM2Js= github.com/ashanbrown/makezero v0.0.0-20201205152432-7b7cdbb3025a/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.23.4/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.37.1 h1:BTHmuN+gzhxkvU9sac2tZvaY0gV9ihbHw+KxZOecYvY= github.com/aws/aws-sdk-go v1.37.1/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1/go.mod h1:jvdWlw8vowVGnZqSDC7yhPd7AifQeQbRDkZcQXV2nRg= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -149,7 +139,6 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/charithe/durationcheck v0.0.6 h1:Tsy7EppNow2pDC0jN7Hsmcb6mHd71ZbI1vFissRBtc0= github.com/charithe/durationcheck v0.0.6/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 h1:SKI1/fuSdodxmNNyVBR8d7X/HuLnRpvvFO0AgyQk764= -github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -259,7 +248,6 @@ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8= github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= github.com/go-toolsmith/astcopy v1.0.0 h1:OMgl1b1MEpjFQ1m5ztEO06rz5CUd3oBv9RF7+DyvdG8= @@ -374,7 +362,6 @@ github.com/google/pprof v0.0.0-20200905233945-acf8798be1f7/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/readahead v0.0.0-20161222183148-eaceba169032/go.mod h1:qYysrqQXuV4tzsizt4oOQ6mrBZQ0xnQXP3ylXX8Jk5Y= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -431,7 +418,6 @@ github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= @@ -584,7 +570,6 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nbutton23/zxcvbn-go v0.0.0-20201221231540-e56b841a3c88 h1:o+O3Cd1HO9CTgxE3/C8p5I5Y4C0yYWbF8d4IkfOLtcQ= github.com/nbutton23/zxcvbn-go v0.0.0-20201221231540-e56b841a3c88/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= -github.com/ncw/swift v1.0.49/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/ncw/swift v1.0.53 h1:luHjjTNtekIEvHg5KdAFIBaH7bWfNkefwFnpDffSIks= github.com/ncw/swift v1.0.53/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -642,7 +627,6 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/sftp v1.10.0/go.mod h1:NxmoDg/QLVWluQDUYG7XBZTLUpKeFa8e3aMf1BfjyHk= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -650,7 +634,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/polyfloyd/go-errorlint v0.0.0-20201127212506-19bd8db6546f h1:xAw10KgJqG5NJDfmRqJ05Z0IFblKumjtMeyiOLxj3+4= github.com/polyfloyd/go-errorlint v0.0.0-20201127212506-19bd8db6546f/go.mod h1:wi9BfjxjF/bwiZ701TzmfKu6UKC357IOAtNr0Td0Lvw= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/pquerna/ffjson v0.0.0-20190813045741-dac163c6c0a9/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= @@ -719,7 +702,6 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.0 h1:nfhvjKcUMhBMVqbKHJlk5RPrrfYr/NMo3692g0dwfWU= github.com/sirupsen/logrus v1.8.0/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fyz7ENv1A= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= @@ -742,7 +724,6 @@ github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -807,7 +788,6 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= @@ -841,9 +821,8 @@ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -877,9 +856,8 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -925,11 +903,10 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -951,7 +928,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1010,10 +987,8 @@ golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1022,8 +997,9 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1125,8 +1101,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.11.1 h1:ojD5zOW8+7dOGzdnNgersm8aPfcDjhMp12UfG93NIMc= +golang.org/x/tools v0.11.1/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1255,7 +1231,6 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/kothar/go-backblaze.v0 v0.0.0-20190520213052-702d4e7eb465/go.mod h1:zJ2QpyDCYo1KvLXlmdnFlQAyF/Qfth0fB8239Qg7BIE= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= @@ -1283,7 +1258,6 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.1.2 h1:SMdYLJl312RXuxXziCCHhRsp/tvct9cGKey0yv95tZM= honnef.co/go/tools v0.1.2/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= k8s.io/api v0.0.0-20210217171935-8e2decd92398/go.mod h1:60tmSUpHxGPFerNHbo/ayI2lKxvtrhbxFyXuEIWJd78= -k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8= k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe/go.mod h1:Z7ps/g0rjlTeMstYrMOUttJfT2Gg34DEaG/f2PYLCWY= k8s.io/apimachinery v0.20.2 h1:hFx6Sbt1oG0n6DZ+g4bFt5f6BoMkOjKWsQFu077M3Vg= k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= diff --git a/gen/pb-cpp/flyteidl/plugins/ray.pb.cc b/gen/pb-cpp/flyteidl/plugins/ray.pb.cc index cc1f331eb..78fb4fc7d 100644 --- a/gen/pb-cpp/flyteidl/plugins/ray.pb.cc +++ b/gen/pb-cpp/flyteidl/plugins/ray.pb.cc @@ -16,17 +16,23 @@ // @@protoc_insertion_point(includes) #include +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ftasks_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_Resources_flyteidl_2fcore_2ftasks_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_HeadGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_RayCluster_RayClusterParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_WorkerGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<3> scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto; namespace flyteidl { namespace plugins { class RayJobDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _RayJob_default_instance_; +class RayCluster_RayClusterParamsEntry_DoNotUseDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _RayCluster_RayClusterParamsEntry_DoNotUse_default_instance_; class RayClusterDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; @@ -64,6 +70,19 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_RayJob_flyteidl_2fplugins_2fra {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsRayJob_flyteidl_2fplugins_2fray_2eproto}, { &scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto.base,}}; +static void InitDefaultsRayCluster_RayClusterParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::plugins::_RayCluster_RayClusterParamsEntry_DoNotUse_default_instance_; + new (ptr) ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse(); + } + ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<0> scc_info_RayCluster_RayClusterParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsRayCluster_RayClusterParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto}, {}}; + static void InitDefaultsRayCluster_flyteidl_2fplugins_2fray_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -75,10 +94,11 @@ static void InitDefaultsRayCluster_flyteidl_2fplugins_2fray_2eproto() { ::flyteidl::plugins::RayCluster::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<2> scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsRayCluster_flyteidl_2fplugins_2fray_2eproto}, { +::google::protobuf::internal::SCCInfo<3> scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsRayCluster_flyteidl_2fplugins_2fray_2eproto}, { &scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto.base, - &scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto.base,}}; + &scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto.base, + &scc_info_RayCluster_RayClusterParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base,}}; static void InitDefaultsHeadGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -104,9 +124,10 @@ static void InitDefaultsHeadGroupSpec_flyteidl_2fplugins_2fray_2eproto() { ::flyteidl::plugins::HeadGroupSpec::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<1> scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsHeadGroupSpec_flyteidl_2fplugins_2fray_2eproto}, { - &scc_info_HeadGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base,}}; +::google::protobuf::internal::SCCInfo<2> scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsHeadGroupSpec_flyteidl_2fplugins_2fray_2eproto}, { + &scc_info_HeadGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base, + &scc_info_Resources_flyteidl_2fcore_2ftasks_2eproto.base,}}; static void InitDefaultsWorkerGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -132,12 +153,14 @@ static void InitDefaultsWorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto() { ::flyteidl::plugins::WorkerGroupSpec::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<1> scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsWorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto}, { - &scc_info_WorkerGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base,}}; +::google::protobuf::internal::SCCInfo<2> scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsWorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto}, { + &scc_info_WorkerGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base, + &scc_info_Resources_flyteidl_2fcore_2ftasks_2eproto.base,}}; void InitDefaults_flyteidl_2fplugins_2fray_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_RayJob_flyteidl_2fplugins_2fray_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_RayCluster_RayClusterParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_HeadGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto.base); @@ -145,7 +168,7 @@ void InitDefaults_flyteidl_2fplugins_2fray_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto.base); } -::google::protobuf::Metadata file_level_metadata_flyteidl_2fplugins_2fray_2eproto[6]; +::google::protobuf::Metadata file_level_metadata_flyteidl_2fplugins_2fray_2eproto[7]; constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_flyteidl_2fplugins_2fray_2eproto = nullptr; constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fplugins_2fray_2eproto = nullptr; @@ -157,6 +180,15 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fplugins_2fray_2eproto::o ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayJob, ray_cluster_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayJob, runtime_env_), + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse, _has_bits_), + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse, key_), + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse, value_), + 0, + 1, ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, _internal_metadata_), ~0u, // no _extensions_ @@ -164,6 +196,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fplugins_2fray_2eproto::o ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, head_group_spec_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, worker_group_spec_), + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, ray_cluster_params_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse, _has_bits_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse, _internal_metadata_), ~0u, // no _extensions_ @@ -179,6 +212,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fplugins_2fray_2eproto::o ~0u, // no _oneof_case_ ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::HeadGroupSpec, ray_start_params_), + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::HeadGroupSpec, resources_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse, _has_bits_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse, _internal_metadata_), ~0u, // no _extensions_ @@ -198,18 +232,21 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fplugins_2fray_2eproto::o PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::WorkerGroupSpec, min_replicas_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::WorkerGroupSpec, max_replicas_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::WorkerGroupSpec, ray_start_params_), + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::WorkerGroupSpec, resources_), }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::flyteidl::plugins::RayJob)}, - { 7, -1, sizeof(::flyteidl::plugins::RayCluster)}, - { 14, 21, sizeof(::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse)}, - { 23, -1, sizeof(::flyteidl::plugins::HeadGroupSpec)}, - { 29, 36, sizeof(::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse)}, - { 38, -1, sizeof(::flyteidl::plugins::WorkerGroupSpec)}, + { 7, 14, sizeof(::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse)}, + { 16, -1, sizeof(::flyteidl::plugins::RayCluster)}, + { 24, 31, sizeof(::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse)}, + { 33, -1, sizeof(::flyteidl::plugins::HeadGroupSpec)}, + { 40, 47, sizeof(::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse)}, + { 49, -1, sizeof(::flyteidl::plugins::WorkerGroupSpec)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::flyteidl::plugins::_RayJob_default_instance_), + reinterpret_cast(&::flyteidl::plugins::_RayCluster_RayClusterParamsEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::plugins::_RayCluster_default_instance_), reinterpret_cast(&::flyteidl::plugins::_HeadGroupSpec_RayStartParamsEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::plugins::_HeadGroupSpec_default_instance_), @@ -220,40 +257,48 @@ static ::google::protobuf::Message const * const file_default_instances[] = { ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto = { {}, AddDescriptors_flyteidl_2fplugins_2fray_2eproto, "flyteidl/plugins/ray.proto", schemas, file_default_instances, TableStruct_flyteidl_2fplugins_2fray_2eproto::offsets, - file_level_metadata_flyteidl_2fplugins_2fray_2eproto, 6, file_level_enum_descriptors_flyteidl_2fplugins_2fray_2eproto, file_level_service_descriptors_flyteidl_2fplugins_2fray_2eproto, + file_level_metadata_flyteidl_2fplugins_2fray_2eproto, 7, file_level_enum_descriptors_flyteidl_2fplugins_2fray_2eproto, file_level_service_descriptors_flyteidl_2fplugins_2fray_2eproto, }; const char descriptor_table_protodef_flyteidl_2fplugins_2fray_2eproto[] = "\n\032flyteidl/plugins/ray.proto\022\020flyteidl.p" - "lugins\"P\n\006RayJob\0221\n\013ray_cluster\030\001 \001(\0132\034." - "flyteidl.plugins.RayCluster\022\023\n\013runtime_e" - "nv\030\002 \001(\t\"\204\001\n\nRayCluster\0228\n\017head_group_sp" - "ec\030\001 \001(\0132\037.flyteidl.plugins.HeadGroupSpe" - "c\022<\n\021worker_group_spec\030\002 \003(\0132!.flyteidl." - "plugins.WorkerGroupSpec\"\225\001\n\rHeadGroupSpe" - "c\022M\n\020ray_start_params\030\001 \003(\01323.flyteidl.p" - "lugins.HeadGroupSpec.RayStartParamsEntry" - "\0325\n\023RayStartParamsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" - "value\030\002 \001(\t:\0028\001\"\353\001\n\017WorkerGroupSpec\022\022\n\ng" - "roup_name\030\001 \001(\t\022\020\n\010replicas\030\002 \001(\005\022\024\n\014min" - "_replicas\030\003 \001(\005\022\024\n\014max_replicas\030\004 \001(\005\022O\n" - "\020ray_start_params\030\005 \003(\01325.flyteidl.plugi" - "ns.WorkerGroupSpec.RayStartParamsEntry\0325" - "\n\023RayStartParamsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" - "lue\030\002 \001(\t:\0028\001B9Z7github.com/flyteorg/fly" - "teidl/gen/pb-go/flyteidl/pluginsb\006proto3" + "lugins\032\031flyteidl/core/tasks.proto\"P\n\006Ray" + "Job\0221\n\013ray_cluster\030\001 \001(\0132\034.flyteidl.plug" + "ins.RayCluster\022\023\n\013runtime_env\030\002 \001(\t\"\215\002\n\n" + "RayCluster\0228\n\017head_group_spec\030\001 \001(\0132\037.fl" + "yteidl.plugins.HeadGroupSpec\022<\n\021worker_g" + "roup_spec\030\002 \003(\0132!.flyteidl.plugins.Worke" + "rGroupSpec\022N\n\022ray_cluster_params\030\003 \003(\01322" + ".flyteidl.plugins.RayCluster.RayClusterP" + "aramsEntry\0327\n\025RayClusterParamsEntry\022\013\n\003k" + "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\302\001\n\rHeadGrou" + "pSpec\022M\n\020ray_start_params\030\001 \003(\01323.flytei" + "dl.plugins.HeadGroupSpec.RayStartParamsE" + "ntry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.core." + "Resources\0325\n\023RayStartParamsEntry\022\013\n\003key\030" + "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\230\002\n\017WorkerGroup" + "Spec\022\022\n\ngroup_name\030\001 \001(\t\022\020\n\010replicas\030\002 \001" + "(\005\022\024\n\014min_replicas\030\003 \001(\005\022\024\n\014max_replicas" + "\030\004 \001(\005\022O\n\020ray_start_params\030\005 \003(\01325.flyte" + "idl.plugins.WorkerGroupSpec.RayStartPara" + "msEntry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.co" + "re.Resources\0325\n\023RayStartParamsEntry\022\013\n\003k" + "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B9Z7github.co" + "m/flyteorg/flyteidl/gen/pb-go/flyteidl/p" + "luginsb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fplugins_2fray_2eproto = { false, InitDefaults_flyteidl_2fplugins_2fray_2eproto, descriptor_table_protodef_flyteidl_2fplugins_2fray_2eproto, - "flyteidl/plugins/ray.proto", &assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto, 720, + "flyteidl/plugins/ray.proto", &assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto, 974, }; void AddDescriptors_flyteidl_2fplugins_2fray_2eproto() { static constexpr ::google::protobuf::internal::InitFunc deps[1] = { + ::AddDescriptors_flyteidl_2fcore_2ftasks_2eproto, }; - ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fplugins_2fray_2eproto, deps, 0); + ::google::protobuf::internal::AddDescriptors(&descriptor_table_flyteidl_2fplugins_2fray_2eproto, deps, 1); } // Force running AddDescriptors() at dynamic initialization time. @@ -625,6 +670,47 @@ ::google::protobuf::Metadata RayJob::GetMetadata() const { } +// =================================================================== + +RayCluster_RayClusterParamsEntry_DoNotUse::RayCluster_RayClusterParamsEntry_DoNotUse() {} +RayCluster_RayClusterParamsEntry_DoNotUse::RayCluster_RayClusterParamsEntry_DoNotUse(::google::protobuf::Arena* arena) + : SuperType(arena) {} +void RayCluster_RayClusterParamsEntry_DoNotUse::MergeFrom(const RayCluster_RayClusterParamsEntry_DoNotUse& other) { + MergeFromInternal(other); +} +::google::protobuf::Metadata RayCluster_RayClusterParamsEntry_DoNotUse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto); + return ::file_level_metadata_flyteidl_2fplugins_2fray_2eproto[1]; +} +void RayCluster_RayClusterParamsEntry_DoNotUse::MergeFrom( + const ::google::protobuf::Message& other) { + ::google::protobuf::Message::MergeFrom(other); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool RayCluster_RayClusterParamsEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { + using MF = ::google::protobuf::internal::MapField< + RayCluster_RayClusterParamsEntry_DoNotUse, EntryKeyType, EntryValueType, + kEntryKeyFieldType, kEntryValueFieldType, + kEntryDefaultEnumValue>; + auto mf = static_cast(object); + Parser> parser(mf); +#define DO_(x) if (!(x)) return false + DO_(parser.ParseMap(begin, end)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.plugins.RayCluster.RayClusterParamsEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.plugins.RayCluster.RayClusterParamsEntry.value")); +#undef DO_ + return true; +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + + // =================================================================== void RayCluster::InitAsDefaultInstance() { @@ -643,6 +729,7 @@ RayCluster::HasBitSetters::head_group_spec(const RayCluster* msg) { #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int RayCluster::kHeadGroupSpecFieldNumber; const int RayCluster::kWorkerGroupSpecFieldNumber; +const int RayCluster::kRayClusterParamsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 RayCluster::RayCluster() @@ -655,6 +742,7 @@ RayCluster::RayCluster(const RayCluster& from) _internal_metadata_(nullptr), worker_group_spec_(from.worker_group_spec_) { _internal_metadata_.MergeFrom(from._internal_metadata_); + ray_cluster_params_.MergeFrom(from.ray_cluster_params_); if (from.has_head_group_spec()) { head_group_spec_ = new ::flyteidl::plugins::HeadGroupSpec(*from.head_group_spec_); } else { @@ -694,6 +782,7 @@ void RayCluster::Clear() { (void) cached_has_bits; worker_group_spec_.Clear(); + ray_cluster_params_.Clear(); if (GetArenaNoVirtual() == nullptr && head_group_spec_ != nullptr) { delete head_group_spec_; } @@ -743,6 +832,25 @@ const char* RayCluster::_InternalParse(const char* begin, const char* end, void* } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 18 && (ptr += 1)); break; } + // map ray_cluster_params = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; + auto parse_map = ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse::_ParseMap; + ctx->extra_parse_data().payload.clear(); + ctx->extra_parse_data().parse_map = parse_map; + object = &msg->ray_cluster_params_; + if (size > end - ptr) goto len_delim_till_end; + auto newend = ptr + size; + GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); + ptr = newend; + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 26 && (ptr += 1)); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -795,6 +903,32 @@ bool RayCluster::MergePartialFromCodedStream( break; } + // map ray_cluster_params = 3; + case 3: { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { + RayCluster_RayClusterParamsEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< + RayCluster_RayClusterParamsEntry_DoNotUse, + ::std::string, ::std::string, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + 0 >, + ::google::protobuf::Map< ::std::string, ::std::string > > parser(&ray_cluster_params_); + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, &parser)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.plugins.RayCluster.RayClusterParamsEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.plugins.RayCluster.RayClusterParamsEntry.value")); + } else { + goto handle_unusual; + } + break; + } + default: { handle_unusual: if (tag == 0) { @@ -837,6 +971,55 @@ void RayCluster::SerializeWithCachedSizes( output); } + // map ray_cluster_params = 3; + if (!this->ray_cluster_params().empty()) { + typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer + ConstPtr; + typedef ConstPtr SortItem; + typedef ::google::protobuf::internal::CompareByDerefFirst Less; + struct Utf8Check { + static void Check(ConstPtr p) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->first.data(), static_cast(p->first.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.plugins.RayCluster.RayClusterParamsEntry.key"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->second.data(), static_cast(p->second.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.plugins.RayCluster.RayClusterParamsEntry.value"); + } + }; + + if (output->IsSerializationDeterministic() && + this->ray_cluster_params().size() > 1) { + ::std::unique_ptr items( + new SortItem[this->ray_cluster_params().size()]); + typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; + size_type n = 0; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->ray_cluster_params().begin(); + it != this->ray_cluster_params().end(); ++it, ++n) { + items[static_cast(n)] = SortItem(&*it); + } + ::std::sort(&items[0], &items[static_cast(n)], Less()); + ::std::unique_ptr entry; + for (size_type i = 0; i < n; i++) { + entry.reset(ray_cluster_params_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(3, *entry, output); + Utf8Check::Check(&(*items[static_cast(i)])); + } + } else { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->ray_cluster_params().begin(); + it != this->ray_cluster_params().end(); ++it) { + entry.reset(ray_cluster_params_.NewEntryWrapper(it->first, it->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(3, *entry, output); + Utf8Check::Check(&(*it)); + } + } + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -865,6 +1048,55 @@ ::google::protobuf::uint8* RayCluster::InternalSerializeWithCachedSizesToArray( 2, this->worker_group_spec(static_cast(i)), target); } + // map ray_cluster_params = 3; + if (!this->ray_cluster_params().empty()) { + typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer + ConstPtr; + typedef ConstPtr SortItem; + typedef ::google::protobuf::internal::CompareByDerefFirst Less; + struct Utf8Check { + static void Check(ConstPtr p) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->first.data(), static_cast(p->first.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.plugins.RayCluster.RayClusterParamsEntry.key"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->second.data(), static_cast(p->second.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.plugins.RayCluster.RayClusterParamsEntry.value"); + } + }; + + if (false && + this->ray_cluster_params().size() > 1) { + ::std::unique_ptr items( + new SortItem[this->ray_cluster_params().size()]); + typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; + size_type n = 0; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->ray_cluster_params().begin(); + it != this->ray_cluster_params().end(); ++it, ++n) { + items[static_cast(n)] = SortItem(&*it); + } + ::std::sort(&items[0], &items[static_cast(n)], Less()); + ::std::unique_ptr entry; + for (size_type i = 0; i < n; i++) { + entry.reset(ray_cluster_params_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(3, *entry, target); + Utf8Check::Check(&(*items[static_cast(i)])); + } + } else { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->ray_cluster_params().begin(); + it != this->ray_cluster_params().end(); ++it) { + entry.reset(ray_cluster_params_.NewEntryWrapper(it->first, it->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(3, *entry, target); + Utf8Check::Check(&(*it)); + } + } + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -897,6 +1129,20 @@ size_t RayCluster::ByteSizeLong() const { } } + // map ray_cluster_params = 3; + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->ray_cluster_params_size()); + { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->ray_cluster_params().begin(); + it != this->ray_cluster_params().end(); ++it) { + entry.reset(ray_cluster_params_.NewEntryWrapper(it->first, it->second)); + total_size += ::google::protobuf::internal::WireFormatLite:: + MessageSizeNoVirtual(*entry); + } + } + // .flyteidl.plugins.HeadGroupSpec head_group_spec = 1; if (this->has_head_group_spec()) { total_size += 1 + @@ -932,6 +1178,7 @@ void RayCluster::MergeFrom(const RayCluster& from) { (void) cached_has_bits; worker_group_spec_.MergeFrom(from.worker_group_spec_); + ray_cluster_params_.MergeFrom(from.ray_cluster_params_); if (from.has_head_group_spec()) { mutable_head_group_spec()->::flyteidl::plugins::HeadGroupSpec::MergeFrom(from.head_group_spec()); } @@ -963,6 +1210,7 @@ void RayCluster::InternalSwap(RayCluster* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); CastToBase(&worker_group_spec_)->InternalSwap(CastToBase(&other->worker_group_spec_)); + ray_cluster_params_.Swap(&other->ray_cluster_params_); swap(head_group_spec_, other->head_group_spec_); } @@ -982,7 +1230,7 @@ void HeadGroupSpec_RayStartParamsEntry_DoNotUse::MergeFrom(const HeadGroupSpec_R } ::google::protobuf::Metadata HeadGroupSpec_RayStartParamsEntry_DoNotUse::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto); - return ::file_level_metadata_flyteidl_2fplugins_2fray_2eproto[2]; + return ::file_level_metadata_flyteidl_2fplugins_2fray_2eproto[3]; } void HeadGroupSpec_RayStartParamsEntry_DoNotUse::MergeFrom( const ::google::protobuf::Message& other) { @@ -1016,13 +1264,27 @@ bool HeadGroupSpec_RayStartParamsEntry_DoNotUse::_ParseMap(const char* begin, co // =================================================================== void HeadGroupSpec::InitAsDefaultInstance() { + ::flyteidl::plugins::_HeadGroupSpec_default_instance_._instance.get_mutable()->resources_ = const_cast< ::flyteidl::core::Resources*>( + ::flyteidl::core::Resources::internal_default_instance()); } class HeadGroupSpec::HasBitSetters { public: + static const ::flyteidl::core::Resources& resources(const HeadGroupSpec* msg); }; +const ::flyteidl::core::Resources& +HeadGroupSpec::HasBitSetters::resources(const HeadGroupSpec* msg) { + return *msg->resources_; +} +void HeadGroupSpec::clear_resources() { + if (GetArenaNoVirtual() == nullptr && resources_ != nullptr) { + delete resources_; + } + resources_ = nullptr; +} #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int HeadGroupSpec::kRayStartParamsFieldNumber; +const int HeadGroupSpec::kResourcesFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 HeadGroupSpec::HeadGroupSpec() @@ -1035,12 +1297,18 @@ HeadGroupSpec::HeadGroupSpec(const HeadGroupSpec& from) _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); ray_start_params_.MergeFrom(from.ray_start_params_); + if (from.has_resources()) { + resources_ = new ::flyteidl::core::Resources(*from.resources_); + } else { + resources_ = nullptr; + } // @@protoc_insertion_point(copy_constructor:flyteidl.plugins.HeadGroupSpec) } void HeadGroupSpec::SharedCtor() { ::google::protobuf::internal::InitSCC( &scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto.base); + resources_ = nullptr; } HeadGroupSpec::~HeadGroupSpec() { @@ -1049,6 +1317,7 @@ HeadGroupSpec::~HeadGroupSpec() { } void HeadGroupSpec::SharedDtor() { + if (this != internal_default_instance()) delete resources_; } void HeadGroupSpec::SetCachedSize(int size) const { @@ -1067,6 +1336,10 @@ void HeadGroupSpec::Clear() { (void) cached_has_bits; ray_start_params_.Clear(); + if (GetArenaNoVirtual() == nullptr && resources_ != nullptr) { + delete resources_; + } + resources_ = nullptr; _internal_metadata_.Clear(); } @@ -1102,6 +1375,19 @@ const char* HeadGroupSpec::_InternalParse(const char* begin, const char* end, vo } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1)); break; } + // .flyteidl.core.Resources resources = 6; + case 6: { + if (static_cast<::google::protobuf::uint8>(tag) != 50) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::Resources::_InternalParse; + object = msg->mutable_resources(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -1158,6 +1444,17 @@ bool HeadGroupSpec::MergePartialFromCodedStream( break; } + // .flyteidl.core.Resources resources = 6; + case 6: { + if (static_cast< ::google::protobuf::uint8>(tag) == (50 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_resources())); + } else { + goto handle_unusual; + } + break; + } + default: { handle_unusual: if (tag == 0) { @@ -1234,6 +1531,12 @@ void HeadGroupSpec::SerializeWithCachedSizes( } } + // .flyteidl.core.Resources resources = 6; + if (this->has_resources()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 6, HasBitSetters::resources(this), output); + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -1296,6 +1599,13 @@ ::google::protobuf::uint8* HeadGroupSpec::InternalSerializeWithCachedSizesToArra } } + // .flyteidl.core.Resources resources = 6; + if (this->has_resources()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 6, HasBitSetters::resources(this), target); + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -1331,6 +1641,13 @@ size_t HeadGroupSpec::ByteSizeLong() const { } } + // .flyteidl.core.Resources resources = 6; + if (this->has_resources()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *resources_); + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); SetCachedSize(cached_size); return total_size; @@ -1359,6 +1676,9 @@ void HeadGroupSpec::MergeFrom(const HeadGroupSpec& from) { (void) cached_has_bits; ray_start_params_.MergeFrom(from.ray_start_params_); + if (from.has_resources()) { + mutable_resources()->::flyteidl::core::Resources::MergeFrom(from.resources()); + } } void HeadGroupSpec::CopyFrom(const ::google::protobuf::Message& from) { @@ -1387,6 +1707,7 @@ void HeadGroupSpec::InternalSwap(HeadGroupSpec* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); ray_start_params_.Swap(&other->ray_start_params_); + swap(resources_, other->resources_); } ::google::protobuf::Metadata HeadGroupSpec::GetMetadata() const { @@ -1405,7 +1726,7 @@ void WorkerGroupSpec_RayStartParamsEntry_DoNotUse::MergeFrom(const WorkerGroupSp } ::google::protobuf::Metadata WorkerGroupSpec_RayStartParamsEntry_DoNotUse::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto); - return ::file_level_metadata_flyteidl_2fplugins_2fray_2eproto[4]; + return ::file_level_metadata_flyteidl_2fplugins_2fray_2eproto[5]; } void WorkerGroupSpec_RayStartParamsEntry_DoNotUse::MergeFrom( const ::google::protobuf::Message& other) { @@ -1439,17 +1760,31 @@ bool WorkerGroupSpec_RayStartParamsEntry_DoNotUse::_ParseMap(const char* begin, // =================================================================== void WorkerGroupSpec::InitAsDefaultInstance() { + ::flyteidl::plugins::_WorkerGroupSpec_default_instance_._instance.get_mutable()->resources_ = const_cast< ::flyteidl::core::Resources*>( + ::flyteidl::core::Resources::internal_default_instance()); } class WorkerGroupSpec::HasBitSetters { public: + static const ::flyteidl::core::Resources& resources(const WorkerGroupSpec* msg); }; +const ::flyteidl::core::Resources& +WorkerGroupSpec::HasBitSetters::resources(const WorkerGroupSpec* msg) { + return *msg->resources_; +} +void WorkerGroupSpec::clear_resources() { + if (GetArenaNoVirtual() == nullptr && resources_ != nullptr) { + delete resources_; + } + resources_ = nullptr; +} #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int WorkerGroupSpec::kGroupNameFieldNumber; const int WorkerGroupSpec::kReplicasFieldNumber; const int WorkerGroupSpec::kMinReplicasFieldNumber; const int WorkerGroupSpec::kMaxReplicasFieldNumber; const int WorkerGroupSpec::kRayStartParamsFieldNumber; +const int WorkerGroupSpec::kResourcesFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 WorkerGroupSpec::WorkerGroupSpec() @@ -1466,6 +1801,11 @@ WorkerGroupSpec::WorkerGroupSpec(const WorkerGroupSpec& from) if (from.group_name().size() > 0) { group_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.group_name_); } + if (from.has_resources()) { + resources_ = new ::flyteidl::core::Resources(*from.resources_); + } else { + resources_ = nullptr; + } ::memcpy(&replicas_, &from.replicas_, static_cast(reinterpret_cast(&max_replicas_) - reinterpret_cast(&replicas_)) + sizeof(max_replicas_)); @@ -1476,9 +1816,9 @@ void WorkerGroupSpec::SharedCtor() { ::google::protobuf::internal::InitSCC( &scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto.base); group_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(&replicas_, 0, static_cast( + ::memset(&resources_, 0, static_cast( reinterpret_cast(&max_replicas_) - - reinterpret_cast(&replicas_)) + sizeof(max_replicas_)); + reinterpret_cast(&resources_)) + sizeof(max_replicas_)); } WorkerGroupSpec::~WorkerGroupSpec() { @@ -1488,6 +1828,7 @@ WorkerGroupSpec::~WorkerGroupSpec() { void WorkerGroupSpec::SharedDtor() { group_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (this != internal_default_instance()) delete resources_; } void WorkerGroupSpec::SetCachedSize(int size) const { @@ -1507,6 +1848,10 @@ void WorkerGroupSpec::Clear() { ray_start_params_.Clear(); group_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (GetArenaNoVirtual() == nullptr && resources_ != nullptr) { + delete resources_; + } + resources_ = nullptr; ::memset(&replicas_, 0, static_cast( reinterpret_cast(&max_replicas_) - reinterpret_cast(&replicas_)) + sizeof(max_replicas_)); @@ -1582,6 +1927,19 @@ const char* WorkerGroupSpec::_InternalParse(const char* begin, const char* end, } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 42 && (ptr += 1)); break; } + // .flyteidl.core.Resources resources = 6; + case 6: { + if (static_cast<::google::protobuf::uint8>(tag) != 50) goto handle_unusual; + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::flyteidl::core::Resources::_InternalParse; + object = msg->mutable_resources(); + if (size > end - ptr) goto len_delim_till_end; + ptr += size; + GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange( + {parser_till_end, object}, ptr - size, ptr)); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -1696,6 +2054,17 @@ bool WorkerGroupSpec::MergePartialFromCodedStream( break; } + // .flyteidl.core.Resources resources = 6; + case 6: { + if (static_cast< ::google::protobuf::uint8>(tag) == (50 & 0xFF)) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( + input, mutable_resources())); + } else { + goto handle_unusual; + } + break; + } + default: { handle_unusual: if (tag == 0) { @@ -1797,6 +2166,12 @@ void WorkerGroupSpec::SerializeWithCachedSizes( } } + // .flyteidl.core.Resources resources = 6; + if (this->has_resources()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 6, HasBitSetters::resources(this), output); + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -1885,6 +2260,13 @@ ::google::protobuf::uint8* WorkerGroupSpec::InternalSerializeWithCachedSizesToAr } } + // .flyteidl.core.Resources resources = 6; + if (this->has_resources()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageToArray( + 6, HasBitSetters::resources(this), target); + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -1927,6 +2309,13 @@ size_t WorkerGroupSpec::ByteSizeLong() const { this->group_name()); } + // .flyteidl.core.Resources resources = 6; + if (this->has_resources()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSize( + *resources_); + } + // int32 replicas = 2; if (this->replicas() != 0) { total_size += 1 + @@ -1980,6 +2369,9 @@ void WorkerGroupSpec::MergeFrom(const WorkerGroupSpec& from) { group_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.group_name_); } + if (from.has_resources()) { + mutable_resources()->::flyteidl::core::Resources::MergeFrom(from.resources()); + } if (from.replicas() != 0) { set_replicas(from.replicas()); } @@ -2019,6 +2411,7 @@ void WorkerGroupSpec::InternalSwap(WorkerGroupSpec* other) { ray_start_params_.Swap(&other->ray_start_params_); group_name_.Swap(&other->group_name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); + swap(resources_, other->resources_); swap(replicas_, other->replicas_); swap(min_replicas_, other->min_replicas_); swap(max_replicas_, other->max_replicas_); @@ -2038,6 +2431,9 @@ namespace protobuf { template<> PROTOBUF_NOINLINE ::flyteidl::plugins::RayJob* Arena::CreateMaybeMessage< ::flyteidl::plugins::RayJob >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::plugins::RayJob >(arena); } +template<> PROTOBUF_NOINLINE ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse >(arena); +} template<> PROTOBUF_NOINLINE ::flyteidl::plugins::RayCluster* Arena::CreateMaybeMessage< ::flyteidl::plugins::RayCluster >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::plugins::RayCluster >(arena); } diff --git a/gen/pb-cpp/flyteidl/plugins/ray.pb.h b/gen/pb-cpp/flyteidl/plugins/ray.pb.h index 5de7bb122..bcc1b2bb8 100644 --- a/gen/pb-cpp/flyteidl/plugins/ray.pb.h +++ b/gen/pb-cpp/flyteidl/plugins/ray.pb.h @@ -34,6 +34,7 @@ #include #include #include +#include "flyteidl/core/tasks.pb.h" // @@protoc_insertion_point(includes) #include #define PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto @@ -44,7 +45,7 @@ struct TableStruct_flyteidl_2fplugins_2fray_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[6] + static const ::google::protobuf::internal::ParseTable schema[7] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; @@ -62,6 +63,9 @@ extern HeadGroupSpec_RayStartParamsEntry_DoNotUseDefaultTypeInternal _HeadGroupS class RayCluster; class RayClusterDefaultTypeInternal; extern RayClusterDefaultTypeInternal _RayCluster_default_instance_; +class RayCluster_RayClusterParamsEntry_DoNotUse; +class RayCluster_RayClusterParamsEntry_DoNotUseDefaultTypeInternal; +extern RayCluster_RayClusterParamsEntry_DoNotUseDefaultTypeInternal _RayCluster_RayClusterParamsEntry_DoNotUse_default_instance_; class RayJob; class RayJobDefaultTypeInternal; extern RayJobDefaultTypeInternal _RayJob_default_instance_; @@ -78,6 +82,7 @@ namespace protobuf { template<> ::flyteidl::plugins::HeadGroupSpec* Arena::CreateMaybeMessage<::flyteidl::plugins::HeadGroupSpec>(Arena*); template<> ::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse>(Arena*); template<> ::flyteidl::plugins::RayCluster* Arena::CreateMaybeMessage<::flyteidl::plugins::RayCluster>(Arena*); +template<> ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse>(Arena*); template<> ::flyteidl::plugins::RayJob* Arena::CreateMaybeMessage<::flyteidl::plugins::RayJob>(Arena*); template<> ::flyteidl::plugins::WorkerGroupSpec* Arena::CreateMaybeMessage<::flyteidl::plugins::WorkerGroupSpec>(Arena*); template<> ::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse>(Arena*); @@ -218,6 +223,30 @@ class RayJob final : }; // ------------------------------------------------------------------- +class RayCluster_RayClusterParamsEntry_DoNotUse : public ::google::protobuf::internal::MapEntry { +public: +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +static bool _ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + typedef ::google::protobuf::internal::MapEntry SuperType; + RayCluster_RayClusterParamsEntry_DoNotUse(); + RayCluster_RayClusterParamsEntry_DoNotUse(::google::protobuf::Arena* arena); + void MergeFrom(const RayCluster_RayClusterParamsEntry_DoNotUse& other); + static const RayCluster_RayClusterParamsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_RayCluster_RayClusterParamsEntry_DoNotUse_default_instance_); } + void MergeFrom(const ::google::protobuf::Message& other) final; + ::google::protobuf::Metadata GetMetadata() const; +}; + +// ------------------------------------------------------------------- + class RayCluster final : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.plugins.RayCluster) */ { public: @@ -256,7 +285,7 @@ class RayCluster final : &_RayCluster_default_instance_); } static constexpr int kIndexInFileMessages = - 1; + 2; void Swap(RayCluster* other); friend void swap(RayCluster& a, RayCluster& b) { @@ -311,6 +340,7 @@ class RayCluster final : // nested types ---------------------------------------------------- + // accessors ------------------------------------------------------- // repeated .flyteidl.plugins.WorkerGroupSpec worker_group_spec = 2; @@ -325,6 +355,15 @@ class RayCluster final : const ::google::protobuf::RepeatedPtrField< ::flyteidl::plugins::WorkerGroupSpec >& worker_group_spec() const; + // map ray_cluster_params = 3; + int ray_cluster_params_size() const; + void clear_ray_cluster_params(); + static const int kRayClusterParamsFieldNumber = 3; + const ::google::protobuf::Map< ::std::string, ::std::string >& + ray_cluster_params() const; + ::google::protobuf::Map< ::std::string, ::std::string >* + mutable_ray_cluster_params(); + // .flyteidl.plugins.HeadGroupSpec head_group_spec = 1; bool has_head_group_spec() const; void clear_head_group_spec(); @@ -340,6 +379,12 @@ class RayCluster final : ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::google::protobuf::RepeatedPtrField< ::flyteidl::plugins::WorkerGroupSpec > worker_group_spec_; + ::google::protobuf::internal::MapField< + RayCluster_RayClusterParamsEntry_DoNotUse, + ::std::string, ::std::string, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + 0 > ray_cluster_params_; ::flyteidl::plugins::HeadGroupSpec* head_group_spec_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fplugins_2fray_2eproto; @@ -408,7 +453,7 @@ class HeadGroupSpec final : &_HeadGroupSpec_default_instance_); } static constexpr int kIndexInFileMessages = - 3; + 4; void Swap(HeadGroupSpec* other); friend void swap(HeadGroupSpec& a, HeadGroupSpec& b) { @@ -475,6 +520,15 @@ class HeadGroupSpec final : ::google::protobuf::Map< ::std::string, ::std::string >* mutable_ray_start_params(); + // .flyteidl.core.Resources resources = 6; + bool has_resources() const; + void clear_resources(); + static const int kResourcesFieldNumber = 6; + const ::flyteidl::core::Resources& resources() const; + ::flyteidl::core::Resources* release_resources(); + ::flyteidl::core::Resources* mutable_resources(); + void set_allocated_resources(::flyteidl::core::Resources* resources); + // @@protoc_insertion_point(class_scope:flyteidl.plugins.HeadGroupSpec) private: class HasBitSetters; @@ -486,6 +540,7 @@ class HeadGroupSpec final : ::google::protobuf::internal::WireFormatLite::TYPE_STRING, ::google::protobuf::internal::WireFormatLite::TYPE_STRING, 0 > ray_start_params_; + ::flyteidl::core::Resources* resources_; mutable ::google::protobuf::internal::CachedSize _cached_size_; friend struct ::TableStruct_flyteidl_2fplugins_2fray_2eproto; }; @@ -553,7 +608,7 @@ class WorkerGroupSpec final : &_WorkerGroupSpec_default_instance_); } static constexpr int kIndexInFileMessages = - 5; + 6; void Swap(WorkerGroupSpec* other); friend void swap(WorkerGroupSpec& a, WorkerGroupSpec& b) { @@ -634,6 +689,15 @@ class WorkerGroupSpec final : ::std::string* release_group_name(); void set_allocated_group_name(::std::string* group_name); + // .flyteidl.core.Resources resources = 6; + bool has_resources() const; + void clear_resources(); + static const int kResourcesFieldNumber = 6; + const ::flyteidl::core::Resources& resources() const; + ::flyteidl::core::Resources* release_resources(); + ::flyteidl::core::Resources* mutable_resources(); + void set_allocated_resources(::flyteidl::core::Resources* resources); + // int32 replicas = 2; void clear_replicas(); static const int kReplicasFieldNumber = 2; @@ -664,6 +728,7 @@ class WorkerGroupSpec final : ::google::protobuf::internal::WireFormatLite::TYPE_STRING, 0 > ray_start_params_; ::google::protobuf::internal::ArenaStringPtr group_name_; + ::flyteidl::core::Resources* resources_; ::google::protobuf::int32 replicas_; ::google::protobuf::int32 min_replicas_; ::google::protobuf::int32 max_replicas_; @@ -787,6 +852,8 @@ inline void RayJob::set_allocated_runtime_env(::std::string* runtime_env) { // ------------------------------------------------------------------- +// ------------------------------------------------------------------- + // RayCluster // .flyteidl.plugins.HeadGroupSpec head_group_spec = 1; @@ -870,6 +937,24 @@ RayCluster::worker_group_spec() const { return worker_group_spec_; } +// map ray_cluster_params = 3; +inline int RayCluster::ray_cluster_params_size() const { + return ray_cluster_params_.size(); +} +inline void RayCluster::clear_ray_cluster_params() { + ray_cluster_params_.Clear(); +} +inline const ::google::protobuf::Map< ::std::string, ::std::string >& +RayCluster::ray_cluster_params() const { + // @@protoc_insertion_point(field_map:flyteidl.plugins.RayCluster.ray_cluster_params) + return ray_cluster_params_.GetMap(); +} +inline ::google::protobuf::Map< ::std::string, ::std::string >* +RayCluster::mutable_ray_cluster_params() { + // @@protoc_insertion_point(field_mutable_map:flyteidl.plugins.RayCluster.ray_cluster_params) + return ray_cluster_params_.MutableMap(); +} + // ------------------------------------------------------------------- // ------------------------------------------------------------------- @@ -894,6 +979,51 @@ HeadGroupSpec::mutable_ray_start_params() { return ray_start_params_.MutableMap(); } +// .flyteidl.core.Resources resources = 6; +inline bool HeadGroupSpec::has_resources() const { + return this != internal_default_instance() && resources_ != nullptr; +} +inline const ::flyteidl::core::Resources& HeadGroupSpec::resources() const { + const ::flyteidl::core::Resources* p = resources_; + // @@protoc_insertion_point(field_get:flyteidl.plugins.HeadGroupSpec.resources) + return p != nullptr ? *p : *reinterpret_cast( + &::flyteidl::core::_Resources_default_instance_); +} +inline ::flyteidl::core::Resources* HeadGroupSpec::release_resources() { + // @@protoc_insertion_point(field_release:flyteidl.plugins.HeadGroupSpec.resources) + + ::flyteidl::core::Resources* temp = resources_; + resources_ = nullptr; + return temp; +} +inline ::flyteidl::core::Resources* HeadGroupSpec::mutable_resources() { + + if (resources_ == nullptr) { + auto* p = CreateMaybeMessage<::flyteidl::core::Resources>(GetArenaNoVirtual()); + resources_ = p; + } + // @@protoc_insertion_point(field_mutable:flyteidl.plugins.HeadGroupSpec.resources) + return resources_; +} +inline void HeadGroupSpec::set_allocated_resources(::flyteidl::core::Resources* resources) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete reinterpret_cast< ::google::protobuf::MessageLite*>(resources_); + } + if (resources) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + resources = ::google::protobuf::internal::GetOwnedMessage( + message_arena, resources, submessage_arena); + } + + } else { + + } + resources_ = resources; + // @@protoc_insertion_point(field_set_allocated:flyteidl.plugins.HeadGroupSpec.resources) +} + // ------------------------------------------------------------------- // ------------------------------------------------------------------- @@ -1013,6 +1143,51 @@ WorkerGroupSpec::mutable_ray_start_params() { return ray_start_params_.MutableMap(); } +// .flyteidl.core.Resources resources = 6; +inline bool WorkerGroupSpec::has_resources() const { + return this != internal_default_instance() && resources_ != nullptr; +} +inline const ::flyteidl::core::Resources& WorkerGroupSpec::resources() const { + const ::flyteidl::core::Resources* p = resources_; + // @@protoc_insertion_point(field_get:flyteidl.plugins.WorkerGroupSpec.resources) + return p != nullptr ? *p : *reinterpret_cast( + &::flyteidl::core::_Resources_default_instance_); +} +inline ::flyteidl::core::Resources* WorkerGroupSpec::release_resources() { + // @@protoc_insertion_point(field_release:flyteidl.plugins.WorkerGroupSpec.resources) + + ::flyteidl::core::Resources* temp = resources_; + resources_ = nullptr; + return temp; +} +inline ::flyteidl::core::Resources* WorkerGroupSpec::mutable_resources() { + + if (resources_ == nullptr) { + auto* p = CreateMaybeMessage<::flyteidl::core::Resources>(GetArenaNoVirtual()); + resources_ = p; + } + // @@protoc_insertion_point(field_mutable:flyteidl.plugins.WorkerGroupSpec.resources) + return resources_; +} +inline void WorkerGroupSpec::set_allocated_resources(::flyteidl::core::Resources* resources) { + ::google::protobuf::Arena* message_arena = GetArenaNoVirtual(); + if (message_arena == nullptr) { + delete reinterpret_cast< ::google::protobuf::MessageLite*>(resources_); + } + if (resources) { + ::google::protobuf::Arena* submessage_arena = nullptr; + if (message_arena != submessage_arena) { + resources = ::google::protobuf::internal::GetOwnedMessage( + message_arena, resources, submessage_arena); + } + + } else { + + } + resources_ = resources; + // @@protoc_insertion_point(field_set_allocated:flyteidl.plugins.WorkerGroupSpec.resources) +} + #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ @@ -1026,6 +1201,8 @@ WorkerGroupSpec::mutable_ray_start_params() { // ------------------------------------------------------------------- +// ------------------------------------------------------------------- + // @@protoc_insertion_point(namespace_scope) diff --git a/gen/pb-go/flyteidl/plugins/ray.pb.go b/gen/pb-go/flyteidl/plugins/ray.pb.go index fd76d4143..3f5852962 100644 --- a/gen/pb-go/flyteidl/plugins/ray.pb.go +++ b/gen/pb-go/flyteidl/plugins/ray.pb.go @@ -5,6 +5,7 @@ package plugins import ( fmt "fmt" + core "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" proto "github.com/golang/protobuf/proto" math "math" ) @@ -76,10 +77,12 @@ type RayCluster struct { // HeadGroupSpecs are the spec for the head pod HeadGroupSpec *HeadGroupSpec `protobuf:"bytes,1,opt,name=head_group_spec,json=headGroupSpec,proto3" json:"head_group_spec,omitempty"` // WorkerGroupSpecs are the specs for the worker pods - WorkerGroupSpec []*WorkerGroupSpec `protobuf:"bytes,2,rep,name=worker_group_spec,json=workerGroupSpec,proto3" json:"worker_group_spec,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + WorkerGroupSpec []*WorkerGroupSpec `protobuf:"bytes,2,rep,name=worker_group_spec,json=workerGroupSpec,proto3" json:"worker_group_spec,omitempty"` + // Additional parameter overrides for ray cluster config + RayClusterParams map[string]string `protobuf:"bytes,3,rep,name=ray_cluster_params,json=rayClusterParams,proto3" json:"ray_cluster_params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *RayCluster) Reset() { *m = RayCluster{} } @@ -121,14 +124,23 @@ func (m *RayCluster) GetWorkerGroupSpec() []*WorkerGroupSpec { return nil } +func (m *RayCluster) GetRayClusterParams() map[string]string { + if m != nil { + return m.RayClusterParams + } + return nil +} + // HeadGroupSpec are the spec for the head pod type HeadGroupSpec struct { // Optional. RayStartParams are the params of the start command: address, object-store-memory. // Refer to https://docs.ray.io/en/latest/ray-core/package-ref.html#ray-start - RayStartParams map[string]string `protobuf:"bytes,1,rep,name=ray_start_params,json=rayStartParams,proto3" json:"ray_start_params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RayStartParams map[string]string `protobuf:"bytes,1,rep,name=ray_start_params,json=rayStartParams,proto3" json:"ray_start_params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + // Resource specification for ray head pod + Resources *core.Resources `protobuf:"bytes,6,opt,name=resources,proto3" json:"resources,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *HeadGroupSpec) Reset() { *m = HeadGroupSpec{} } @@ -163,6 +175,13 @@ func (m *HeadGroupSpec) GetRayStartParams() map[string]string { return nil } +func (m *HeadGroupSpec) GetResources() *core.Resources { + if m != nil { + return m.Resources + } + return nil +} + // WorkerGroupSpec are the specs for the worker pods type WorkerGroupSpec struct { // Required. RayCluster can have multiple worker groups, and it distinguishes them by name @@ -175,10 +194,12 @@ type WorkerGroupSpec struct { MaxReplicas int32 `protobuf:"varint,4,opt,name=max_replicas,json=maxReplicas,proto3" json:"max_replicas,omitempty"` // Optional. RayStartParams are the params of the start command: address, object-store-memory. // Refer to https://docs.ray.io/en/latest/ray-core/package-ref.html#ray-start - RayStartParams map[string]string `protobuf:"bytes,5,rep,name=ray_start_params,json=rayStartParams,proto3" json:"ray_start_params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RayStartParams map[string]string `protobuf:"bytes,5,rep,name=ray_start_params,json=rayStartParams,proto3" json:"ray_start_params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + // Resource specification for ray worker pods + Resources *core.Resources `protobuf:"bytes,6,opt,name=resources,proto3" json:"resources,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *WorkerGroupSpec) Reset() { *m = WorkerGroupSpec{} } @@ -241,9 +262,17 @@ func (m *WorkerGroupSpec) GetRayStartParams() map[string]string { return nil } +func (m *WorkerGroupSpec) GetResources() *core.Resources { + if m != nil { + return m.Resources + } + return nil +} + func init() { proto.RegisterType((*RayJob)(nil), "flyteidl.plugins.RayJob") proto.RegisterType((*RayCluster)(nil), "flyteidl.plugins.RayCluster") + proto.RegisterMapType((map[string]string)(nil), "flyteidl.plugins.RayCluster.RayClusterParamsEntry") proto.RegisterType((*HeadGroupSpec)(nil), "flyteidl.plugins.HeadGroupSpec") proto.RegisterMapType((map[string]string)(nil), "flyteidl.plugins.HeadGroupSpec.RayStartParamsEntry") proto.RegisterType((*WorkerGroupSpec)(nil), "flyteidl.plugins.WorkerGroupSpec") @@ -253,31 +282,35 @@ func init() { func init() { proto.RegisterFile("flyteidl/plugins/ray.proto", fileDescriptor_b980f6d58c7489d7) } var fileDescriptor_b980f6d58c7489d7 = []byte{ - // 412 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x93, 0x4d, 0xcb, 0xd3, 0x40, - 0x10, 0xc7, 0x49, 0x6a, 0x8b, 0x9d, 0x58, 0x5b, 0x57, 0x0f, 0xa5, 0x28, 0x6d, 0x73, 0xea, 0xc5, - 0x04, 0x5a, 0xc4, 0x17, 0xf0, 0xa0, 0x52, 0x2a, 0x82, 0x22, 0xdb, 0x83, 0x20, 0x48, 0xd8, 0xa4, - 0x6b, 0x12, 0x9a, 0xec, 0x2e, 0x9b, 0x4d, 0xdb, 0x7c, 0x1f, 0xbf, 0x80, 0x17, 0x3f, 0x9f, 0x64, - 0x9b, 0x27, 0x7d, 0x85, 0xde, 0x9e, 0xdb, 0xce, 0xcc, 0x7f, 0xfe, 0x33, 0xf9, 0x85, 0x81, 0xc1, - 0xef, 0xa4, 0x50, 0x34, 0x5e, 0x25, 0xae, 0x48, 0xf2, 0x30, 0x66, 0x99, 0x2b, 0x49, 0xe1, 0x08, - 0xc9, 0x15, 0x47, 0xbd, 0xbb, 0x9a, 0x53, 0xd5, 0xec, 0x08, 0x5a, 0x98, 0x14, 0x5f, 0xb8, 0x8f, - 0xde, 0x83, 0x25, 0x49, 0xe1, 0x05, 0x49, 0x9e, 0x29, 0x2a, 0xfb, 0xc6, 0xc8, 0x98, 0x58, 0xd3, - 0xe7, 0xce, 0x79, 0x87, 0x83, 0x49, 0xf1, 0x69, 0xaf, 0xc1, 0x20, 0xeb, 0x37, 0x1a, 0x82, 0x25, - 0x73, 0xa6, 0xe2, 0x94, 0x7a, 0x94, 0x6d, 0xfa, 0xe6, 0xc8, 0x98, 0xb4, 0x31, 0x54, 0xa9, 0x39, - 0xdb, 0xd8, 0x7f, 0x0c, 0x80, 0x43, 0x2f, 0x5a, 0x40, 0x37, 0xa2, 0x64, 0xe5, 0x85, 0x92, 0xe7, - 0xc2, 0xcb, 0x04, 0x0d, 0xaa, 0x91, 0xc3, 0xcb, 0x91, 0x9f, 0x29, 0x59, 0x2d, 0x4a, 0xdd, 0x52, - 0xd0, 0x00, 0x77, 0xa2, 0xe3, 0x10, 0x7d, 0x85, 0x27, 0x5b, 0x2e, 0xd7, 0x54, 0x1e, 0x5b, 0x99, - 0xa3, 0xc6, 0xc4, 0x9a, 0x8e, 0x2f, 0xad, 0x7e, 0x68, 0xe9, 0xc1, 0xac, 0xbb, 0x3d, 0x4d, 0xd8, - 0x7f, 0x0d, 0xe8, 0x9c, 0xcc, 0x43, 0xbf, 0xa0, 0x57, 0x82, 0xc9, 0x14, 0x91, 0xca, 0x13, 0x44, - 0x92, 0x34, 0xeb, 0x1b, 0xda, 0x7f, 0x76, 0x63, 0xd5, 0x92, 0xd5, 0xb2, 0x6c, 0xfb, 0xae, 0xbb, - 0xe6, 0x4c, 0xc9, 0x02, 0x3f, 0x96, 0x27, 0xc9, 0xc1, 0x07, 0x78, 0x7a, 0x45, 0x86, 0x7a, 0xd0, - 0x58, 0xd3, 0x42, 0x33, 0x69, 0xe3, 0xf2, 0x89, 0x9e, 0x41, 0x73, 0x43, 0x92, 0x9c, 0x56, 0x6c, - 0xf7, 0xc1, 0x3b, 0xf3, 0x8d, 0x61, 0xff, 0x33, 0xa1, 0x7b, 0xf6, 0x61, 0xe8, 0x05, 0xc0, 0x9e, - 0x07, 0x23, 0x29, 0xad, 0x6c, 0xda, 0x3a, 0xf3, 0x8d, 0xa4, 0x14, 0x0d, 0xe0, 0xa1, 0xa4, 0x22, - 0x89, 0x03, 0x92, 0x69, 0xbf, 0x26, 0xae, 0x63, 0x34, 0x86, 0x47, 0x69, 0xcc, 0xbc, 0xba, 0xde, - 0xd0, 0x75, 0x2b, 0x8d, 0x19, 0x3e, 0x96, 0x90, 0xdd, 0x41, 0xf2, 0xa0, 0x92, 0x90, 0x5d, 0x2d, - 0xf1, 0xae, 0x60, 0x6b, 0x6a, 0x6c, 0xaf, 0x6e, 0xfe, 0x96, 0x7b, 0x02, 0xf7, 0xf1, 0xed, 0xcf, - 0xd7, 0x61, 0xac, 0xa2, 0xdc, 0x77, 0x02, 0x9e, 0xba, 0x7a, 0x2b, 0x2e, 0x43, 0xb7, 0xbe, 0xa0, - 0x90, 0x32, 0x57, 0xf8, 0x2f, 0x43, 0xee, 0x9e, 0x1f, 0x95, 0xdf, 0xd2, 0x17, 0x35, 0xfb, 0x1f, - 0x00, 0x00, 0xff, 0xff, 0xfb, 0xc2, 0x9c, 0xe6, 0x6f, 0x03, 0x00, 0x00, + // 479 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0x5f, 0x8b, 0xd3, 0x40, + 0x10, 0x27, 0xa9, 0x2d, 0x76, 0xe2, 0xd9, 0xba, 0x2a, 0xc4, 0xa0, 0x5c, 0xaf, 0x4f, 0x7d, 0x31, + 0x81, 0x1e, 0xfe, 0x05, 0x1f, 0xf4, 0x38, 0x4e, 0x04, 0x45, 0xf6, 0x1e, 0x04, 0x41, 0xe2, 0x36, + 0x5d, 0xd3, 0xd0, 0x24, 0x1b, 0x66, 0x37, 0xbd, 0xcb, 0x67, 0xf4, 0x93, 0xf8, 0xe2, 0x67, 0x90, + 0x6c, 0xd3, 0x24, 0xed, 0x15, 0x8b, 0x6f, 0xbe, 0xcd, 0x9f, 0xdf, 0xfc, 0x66, 0xf6, 0x37, 0xcb, + 0x80, 0xf3, 0x23, 0x2e, 0x14, 0x8f, 0xe6, 0xb1, 0x97, 0xc5, 0x79, 0x18, 0xa5, 0xd2, 0x43, 0x56, + 0xb8, 0x19, 0x0a, 0x25, 0xc8, 0x70, 0x93, 0x73, 0xab, 0x9c, 0xf3, 0xa8, 0x46, 0x07, 0x02, 0xb9, + 0xa7, 0x98, 0x5c, 0xca, 0x35, 0x78, 0xbc, 0x80, 0x1e, 0x65, 0xc5, 0x07, 0x31, 0x23, 0x6f, 0xc0, + 0x42, 0x56, 0xf8, 0x41, 0x9c, 0x4b, 0xc5, 0xd1, 0x36, 0x46, 0xc6, 0xc4, 0x9a, 0x3e, 0x76, 0x77, + 0xc9, 0x5c, 0xca, 0x8a, 0xb3, 0x35, 0x86, 0x02, 0xd6, 0x36, 0x39, 0x06, 0x0b, 0xf3, 0x54, 0x45, + 0x09, 0xf7, 0x79, 0xba, 0xb2, 0xcd, 0x91, 0x31, 0xe9, 0x53, 0xa8, 0x42, 0xe7, 0xe9, 0x6a, 0xfc, + 0xd3, 0x04, 0x68, 0x6a, 0xc9, 0x05, 0x0c, 0x16, 0x9c, 0xcd, 0xfd, 0x10, 0x45, 0x9e, 0xf9, 0x32, + 0xe3, 0x41, 0xd5, 0xf2, 0xf8, 0x66, 0xcb, 0xf7, 0x9c, 0xcd, 0x2f, 0x4a, 0xdc, 0x65, 0xc6, 0x03, + 0x7a, 0xb4, 0x68, 0xbb, 0xe4, 0x23, 0xdc, 0xbb, 0x12, 0xb8, 0xe4, 0xd8, 0xa6, 0x32, 0x47, 0x9d, + 0x89, 0x35, 0x3d, 0xb9, 0x49, 0xf5, 0x45, 0x43, 0x1b, 0xb2, 0xc1, 0xd5, 0x76, 0x80, 0x7c, 0x07, + 0xd2, 0x92, 0xc1, 0xcf, 0x18, 0xb2, 0x44, 0xda, 0x1d, 0xcd, 0x37, 0xfd, 0x9b, 0x1a, 0x2d, 0xf3, + 0xb3, 0x2e, 0x3a, 0x4f, 0x15, 0x16, 0x74, 0x88, 0x3b, 0x61, 0xe7, 0x0c, 0x1e, 0xee, 0x85, 0x92, + 0x21, 0x74, 0x96, 0xbc, 0xd0, 0x32, 0xf4, 0x69, 0x69, 0x92, 0x07, 0xd0, 0x5d, 0xb1, 0x38, 0xe7, + 0x95, 0x9c, 0x6b, 0xe7, 0xb5, 0xf9, 0xd2, 0x18, 0xff, 0x32, 0xe0, 0x68, 0x4b, 0x16, 0xf2, 0x0d, + 0xca, 0x56, 0xbe, 0x54, 0x0c, 0xd5, 0x66, 0x6c, 0x43, 0x8f, 0x7d, 0x7a, 0x40, 0xd1, 0x72, 0xf2, + 0xcb, 0xb2, 0xac, 0x3d, 0xf7, 0x5d, 0xdc, 0x0a, 0x92, 0xe7, 0xd0, 0x47, 0x2e, 0x45, 0x8e, 0x01, + 0x97, 0x76, 0x4f, 0x6f, 0xca, 0x6e, 0x78, 0xcb, 0x7f, 0xe5, 0xd2, 0x4d, 0x9e, 0x36, 0x50, 0xe7, + 0x2d, 0xdc, 0xdf, 0x43, 0xff, 0x4f, 0x6f, 0xfd, 0x6d, 0xc2, 0x60, 0x67, 0x6f, 0xe4, 0x09, 0xc0, + 0x7a, 0xdd, 0x29, 0x4b, 0x78, 0x45, 0xd3, 0xd7, 0x91, 0x4f, 0x2c, 0xe1, 0xc4, 0x81, 0xdb, 0xc8, + 0xb3, 0x38, 0x0a, 0x98, 0xd4, 0x7c, 0x5d, 0x5a, 0xfb, 0xe4, 0x04, 0xee, 0x24, 0x51, 0xea, 0xd7, + 0xf9, 0x8e, 0xce, 0x5b, 0x49, 0x94, 0xd2, 0x36, 0x84, 0x5d, 0x37, 0x90, 0x5b, 0x15, 0x84, 0x5d, + 0xd7, 0x10, 0x7f, 0x8f, 0xdc, 0x5d, 0x2d, 0xf7, 0xb3, 0x83, 0xbf, 0xee, 0x3f, 0x17, 0xfc, 0xdd, + 0xab, 0xaf, 0x2f, 0xc2, 0x48, 0x2d, 0xf2, 0x99, 0x1b, 0x88, 0xc4, 0xd3, 0x3d, 0x05, 0x86, 0x5e, + 0x7d, 0x45, 0x42, 0x9e, 0x7a, 0xd9, 0xec, 0x69, 0x28, 0xbc, 0xdd, 0x33, 0x34, 0xeb, 0xe9, 0xb3, + 0x72, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0xbe, 0xc2, 0x0e, 0x49, 0xa1, 0x04, 0x00, 0x00, } diff --git a/gen/pb-go/flyteidl/plugins/ray.pb.validate.go b/gen/pb-go/flyteidl/plugins/ray.pb.validate.go index e85e27a8a..b4d4d74b0 100644 --- a/gen/pb-go/flyteidl/plugins/ray.pb.validate.go +++ b/gen/pb-go/flyteidl/plugins/ray.pb.validate.go @@ -144,6 +144,8 @@ func (m *RayCluster) Validate() error { } + // no validation rules for RayClusterParams + return nil } @@ -211,6 +213,16 @@ func (m *HeadGroupSpec) Validate() error { // no validation rules for RayStartParams + if v, ok := interface{}(m.GetResources()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return HeadGroupSpecValidationError{ + field: "Resources", + reason: "embedded message failed validation", + cause: err, + } + } + } + return nil } @@ -286,6 +298,16 @@ func (m *WorkerGroupSpec) Validate() error { // no validation rules for RayStartParams + if v, ok := interface{}(m.GetResources()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return WorkerGroupSpecValidationError{ + field: "Resources", + reason: "embedded message failed validation", + cause: err, + } + } + } + return nil } diff --git a/gen/pb-java/flyteidl/plugins/Ray.java b/gen/pb-java/flyteidl/plugins/Ray.java index 7b9a79a95..a6b1417e0 100644 --- a/gen/pb-java/flyteidl/plugins/Ray.java +++ b/gen/pb-java/flyteidl/plugins/Ray.java @@ -942,6 +942,60 @@ public interface RayClusterOrBuilder extends */ flyteidl.plugins.Ray.WorkerGroupSpecOrBuilder getWorkerGroupSpecOrBuilder( int index); + + /** + * 
+     * Additional parameter overrides for ray cluster config
+     *
+ * + * map<string, string> ray_cluster_params = 3; + */ + int getRayClusterParamsCount(); + /** + * 
+     * Additional parameter overrides for ray cluster config
+     *
+ * + * map<string, string> ray_cluster_params = 3; + */ + boolean containsRayClusterParams( + java.lang.String key); + /** + * Use {@link #getRayClusterParamsMap()} instead. + */ + @java.lang.Deprecated + java.util.Map + getRayClusterParams(); + /** + * 
+     * Additional parameter overrides for ray cluster config
+     *
+ * + * map<string, string> ray_cluster_params = 3; + */ + java.util.Map + getRayClusterParamsMap(); + /** + * 
+     * Additional parameter overrides for ray cluster config
+     *
+ * + * map<string, string> ray_cluster_params = 3; + */ + + java.lang.String getRayClusterParamsOrDefault( + java.lang.String key, + java.lang.String defaultValue); + /** + * 
+     * Additional parameter overrides for ray cluster config
+     *
+ * + * map<string, string> ray_cluster_params = 3; + */ + + java.lang.String getRayClusterParamsOrThrow( + java.lang.String key); } /** * 
@@ -1009,6 +1063,19 @@ private RayCluster(
                   input.readMessage(flyteidl.plugins.Ray.WorkerGroupSpec.parser(), extensionRegistry));
               break;
             }
+            case 26: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                rayClusterParams_ = com.google.protobuf.MapField.newMapField(
+                    RayClusterParamsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000004;
+              }
+              com.google.protobuf.MapEntry
+              rayClusterParams__ = input.readMessage(
+                  RayClusterParamsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              rayClusterParams_.getMutableMap().put(
+                  rayClusterParams__.getKey(), rayClusterParams__.getValue());
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -1036,6 +1103,18 @@ private RayCluster(
       return flyteidl.plugins.Ray.internal_static_flyteidl_plugins_RayCluster_descriptor;
     }
 
+    @SuppressWarnings({"rawtypes"})
+    @java.lang.Override
+    protected com.google.protobuf.MapField internalGetMapField(
+        int number) {
+      switch (number) {
+        case 3:
+          return internalGetRayClusterParams();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
@@ -1133,6 +1212,98 @@ public flyteidl.plugins.Ray.WorkerGroupSpecOrBuilder getWorkerGroupSpecOrBuilder
       return workerGroupSpec_.get(index);
     }
 
+    public static final int RAY_CLUSTER_PARAMS_FIELD_NUMBER = 3;
+    private static final class RayClusterParamsDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.String> defaultEntry =
+              com.google.protobuf.MapEntry
+              .newDefaultInstance(
+                  flyteidl.plugins.Ray.internal_static_flyteidl_plugins_RayCluster_RayClusterParamsEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "");
+    }
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> rayClusterParams_;
+    private com.google.protobuf.MapField
+    internalGetRayClusterParams() {
+      if (rayClusterParams_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            RayClusterParamsDefaultEntryHolder.defaultEntry);
+      }
+      return rayClusterParams_;
+    }
+
+    public int getRayClusterParamsCount() {
+      return internalGetRayClusterParams().getMap().size();
+    }
+    /**
+     * 
+     * Additional parameter overrides for ray cluster config
+     * 

+     *
+     * map<string, string> ray_cluster_params = 3;
+     */
+
+    public boolean containsRayClusterParams(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      return internalGetRayClusterParams().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getRayClusterParamsMap()} instead.
+     */
+    @java.lang.Deprecated
+    public java.util.Map getRayClusterParams() {
+      return getRayClusterParamsMap();
+    }
+    /**
+     * 
+     * Additional parameter overrides for ray cluster config
+     * 

+     *
+     * map<string, string> ray_cluster_params = 3;
+     */
+
+    public java.util.Map getRayClusterParamsMap() {
+      return internalGetRayClusterParams().getMap();
+    }
+    /**
+     * 
+     * Additional parameter overrides for ray cluster config
+     * 

+     *
+     * map<string, string> ray_cluster_params = 3;
+     */
+
+    public java.lang.String getRayClusterParamsOrDefault(
+        java.lang.String key,
+        java.lang.String defaultValue) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      java.util.Map map =
+          internalGetRayClusterParams().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * 
+     * Additional parameter overrides for ray cluster config
+     * 

+     *
+     * map<string, string> ray_cluster_params = 3;
+     */
+
+    public java.lang.String getRayClusterParamsOrThrow(
+        java.lang.String key) {
+      if (key == null) { throw new java.lang.NullPointerException(); }
+      java.util.Map map =
+          internalGetRayClusterParams().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1153,6 +1324,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < workerGroupSpec_.size(); i++) {
         output.writeMessage(2, workerGroupSpec_.get(i));
       }
+      com.google.protobuf.GeneratedMessageV3
+        .serializeStringMapTo(
+          output,
+          internalGetRayClusterParams(),
+          RayClusterParamsDefaultEntryHolder.defaultEntry,
+          3);
       unknownFields.writeTo(output);
     }
 
@@ -1170,6 +1347,16 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, workerGroupSpec_.get(i));
       }
+      for (java.util.Map.Entry entry
+           : internalGetRayClusterParams().getMap().entrySet()) {
+        com.google.protobuf.MapEntry
+        rayClusterParams__ = RayClusterParamsDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(3, rayClusterParams__);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -1192,6 +1379,8 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getWorkerGroupSpecList()
           .equals(other.getWorkerGroupSpecList())) return false;
+      if (!internalGetRayClusterParams().equals(
+          other.internalGetRayClusterParams())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1211,6 +1400,10 @@ public int hashCode() {
         hash = (37 * hash) + WORKER_GROUP_SPEC_FIELD_NUMBER;
         hash = (53 * hash) + getWorkerGroupSpecList().hashCode();
       }
+      if (!internalGetRayClusterParams().getMap().isEmpty()) {
+        hash = (37 * hash) + RAY_CLUSTER_PARAMS_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetRayClusterParams().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1322,6 +1515,28 @@ public static final class Builder extends
         return flyteidl.plugins.Ray.internal_static_flyteidl_plugins_RayCluster_descriptor;
       }
 
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapField internalGetMapField(
+          int number) {
+        switch (number) {
+          case 3:
+            return internalGetRayClusterParams();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapField internalGetMutableMapField(
+          int number) {
+        switch (number) {
+          case 3:
+            return internalGetMutableRayClusterParams();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
@@ -1361,6 +1576,7 @@ public Builder clear() {
         } else {
           workerGroupSpecBuilder_.clear();
         }
+        internalGetMutableRayClusterParams().clear();
         return this;
       }
 
@@ -1403,6 +1619,8 @@ public flyteidl.plugins.Ray.RayCluster buildPartial() {
         } else {
           result.workerGroupSpec_ = workerGroupSpecBuilder_.build();
         }
+        result.rayClusterParams_ = internalGetRayClusterParams();
+        result.rayClusterParams_.makeImmutable();
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -1481,6 +1699,8 @@ public Builder mergeFrom(flyteidl.plugins.Ray.RayCluster other) {
             }
           }
         }
+        internalGetMutableRayClusterParams().mergeFrom(
+            other.internalGetRayClusterParams());
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1975,6 +2195,157 @@ public flyteidl.plugins.Ray.WorkerGroupSpec.Builder addWorkerGroupSpecBuilder(
         }
         return workerGroupSpecBuilder_;
       }
+
+      private com.google.protobuf.MapField<
+          java.lang.String, java.lang.String> rayClusterParams_;
+      private com.google.protobuf.MapField
+      internalGetRayClusterParams() {
+        if (rayClusterParams_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              RayClusterParamsDefaultEntryHolder.defaultEntry);
+        }
+        return rayClusterParams_;
+      }
+      private com.google.protobuf.MapField
+      internalGetMutableRayClusterParams() {
+        onChanged();;
+        if (rayClusterParams_ == null) {
+          rayClusterParams_ = com.google.protobuf.MapField.newMapField(
+              RayClusterParamsDefaultEntryHolder.defaultEntry);
+        }
+        if (!rayClusterParams_.isMutable()) {
+          rayClusterParams_ = rayClusterParams_.copy();
+        }
+        return rayClusterParams_;
+      }
+
+      public int getRayClusterParamsCount() {
+        return internalGetRayClusterParams().getMap().size();
+      }
+      /**
+       * 
+       * Additional parameter overrides for ray cluster config
+       * 

+       *
+       * map<string, string> ray_cluster_params = 3;
+       */
+
+      public boolean containsRayClusterParams(
+          java.lang.String key) {
+        if (key == null) { throw new java.lang.NullPointerException(); }
+        return internalGetRayClusterParams().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getRayClusterParamsMap()} instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map getRayClusterParams() {
+        return getRayClusterParamsMap();
+      }
+      /**
+       * 
+       * Additional parameter overrides for ray cluster config
+       * 

+       *
+       * map<string, string> ray_cluster_params = 3;
+       */
+
+      public java.util.Map getRayClusterParamsMap() {
+        return internalGetRayClusterParams().getMap();
+      }
+      /**
+       * 
+       * Additional parameter overrides for ray cluster config
+       * 

+       *
+       * map<string, string> ray_cluster_params = 3;
+       */
+
+      public java.lang.String getRayClusterParamsOrDefault(
+          java.lang.String key,
+          java.lang.String defaultValue) {
+        if (key == null) { throw new java.lang.NullPointerException(); }
+        java.util.Map map =
+            internalGetRayClusterParams().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * 
+       * Additional parameter overrides for ray cluster config
+       * 

+       *
+       * map<string, string> ray_cluster_params = 3;
+       */
+
+      public java.lang.String getRayClusterParamsOrThrow(
+          java.lang.String key) {
+        if (key == null) { throw new java.lang.NullPointerException(); }
+        java.util.Map map =
+            internalGetRayClusterParams().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+
+      public Builder clearRayClusterParams() {
+        internalGetMutableRayClusterParams().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * 
+       * Additional parameter overrides for ray cluster config
+       * 

+       *
+       * map<string, string> ray_cluster_params = 3;
+       */
+
+      public Builder removeRayClusterParams(
+          java.lang.String key) {
+        if (key == null) { throw new java.lang.NullPointerException(); }
+        internalGetMutableRayClusterParams().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map
+      getMutableRayClusterParams() {
+        return internalGetMutableRayClusterParams().getMutableMap();
+      }
+      /**
+       * 
+       * Additional parameter overrides for ray cluster config
+       * 

+       *
+       * map<string, string> ray_cluster_params = 3;
+       */
+      public Builder putRayClusterParams(
+          java.lang.String key,
+          java.lang.String value) {
+        if (key == null) { throw new java.lang.NullPointerException(); }
+        if (value == null) { throw new java.lang.NullPointerException(); }
+        internalGetMutableRayClusterParams().getMutableMap()
+            .put(key, value);
+        return this;
+      }
+      /**
+       * 
+       * Additional parameter overrides for ray cluster config
+       * 

+       *
+       * map<string, string> ray_cluster_params = 3;
+       */
+
+      public Builder putAllRayClusterParams(
+          java.util.Map values) {
+        internalGetMutableRayClusterParams().getMutableMap()
+            .putAll(values);
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -2090,6 +2461,31 @@ java.lang.String getRayStartParamsOrDefault(
 
     java.lang.String getRayStartParamsOrThrow(
         java.lang.String key);
+
+    /**
+     * 
+     * Resource specification for ray head pod
+     * 

+     *
+     * .flyteidl.core.Resources resources = 6;
+     */
+    boolean hasResources();
+    /**
+     * 
+     * Resource specification for ray head pod
+     * 

+     *
+     * .flyteidl.core.Resources resources = 6;
+     */
+    flyteidl.core.Tasks.Resources getResources();
+    /**
+     * 
+     * Resource specification for ray head pod
+     * 

+     *
+     * .flyteidl.core.Resources resources = 6;
+     */
+    flyteidl.core.Tasks.ResourcesOrBuilder getResourcesOrBuilder();
   }
   /**
    * 
@@ -2147,6 +2543,19 @@ private HeadGroupSpec(
                   rayStartParams__.getKey(), rayStartParams__.getValue());
               break;
             }
+            case 50: {
+              flyteidl.core.Tasks.Resources.Builder subBuilder = null;
+              if (resources_ != null) {
+                subBuilder = resources_.toBuilder();
+              }
+              resources_ = input.readMessage(flyteidl.core.Tasks.Resources.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(resources_);
+                resources_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -2191,6 +2600,7 @@ protected com.google.protobuf.MapField internalGetMapField(
               flyteidl.plugins.Ray.HeadGroupSpec.class, flyteidl.plugins.Ray.HeadGroupSpec.Builder.class);
     }
 
+    private int bitField0_;
     public static final int RAY_START_PARAMS_FIELD_NUMBER = 1;
     private static final class RayStartParamsDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
@@ -2287,6 +2697,39 @@ public java.lang.String getRayStartParamsOrThrow(
       return map.get(key);
     }
 
+    public static final int RESOURCES_FIELD_NUMBER = 6;
+    private flyteidl.core.Tasks.Resources resources_;
+    /**
+     * 
+     * Resource specification for ray head pod
+     * 

+     *
+     * .flyteidl.core.Resources resources = 6;
+     */
+    public boolean hasResources() {
+      return resources_ != null;
+    }
+    /**
+     * 
+     * Resource specification for ray head pod
+     * 

+     *
+     * .flyteidl.core.Resources resources = 6;
+     */
+    public flyteidl.core.Tasks.Resources getResources() {
+      return resources_ == null ? flyteidl.core.Tasks.Resources.getDefaultInstance() : resources_;
+    }
+    /**
+     * 
+     * Resource specification for ray head pod
+     * 

+     *
+     * .flyteidl.core.Resources resources = 6;
+     */
+    public flyteidl.core.Tasks.ResourcesOrBuilder getResourcesOrBuilder() {
+      return getResources();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -2307,6 +2750,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
           internalGetRayStartParams(),
           RayStartParamsDefaultEntryHolder.defaultEntry,
           1);
+      if (resources_ != null) {
+        output.writeMessage(6, getResources());
+      }
       unknownFields.writeTo(output);
     }
 
@@ -2326,6 +2772,10 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
             .computeMessageSize(1, rayStartParams__);
       }
+      if (resources_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, getResources());
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -2343,6 +2793,11 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!internalGetRayStartParams().equals(
           other.internalGetRayStartParams())) return false;
+      if (hasResources() != other.hasResources()) return false;
+      if (hasResources()) {
+        if (!getResources()
+            .equals(other.getResources())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -2358,6 +2813,10 @@ public int hashCode() {
         hash = (37 * hash) + RAY_START_PARAMS_FIELD_NUMBER;
         hash = (53 * hash) + internalGetRayStartParams().hashCode();
       }
+      if (hasResources()) {
+        hash = (37 * hash) + RESOURCES_FIELD_NUMBER;
+        hash = (53 * hash) + getResources().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -2518,6 +2977,12 @@ private void maybeForceBuilderInitialization() {
       public Builder clear() {
         super.clear();
         internalGetMutableRayStartParams().clear();
+        if (resourcesBuilder_ == null) {
+          resources_ = null;
+        } else {
+          resources_ = null;
+          resourcesBuilder_ = null;
+        }
         return this;
       }
 
@@ -2545,8 +3010,15 @@ public flyteidl.plugins.Ray.HeadGroupSpec build() {
       public flyteidl.plugins.Ray.HeadGroupSpec buildPartial() {
         flyteidl.plugins.Ray.HeadGroupSpec result = new flyteidl.plugins.Ray.HeadGroupSpec(this);
         int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
         result.rayStartParams_ = internalGetRayStartParams();
         result.rayStartParams_.makeImmutable();
+        if (resourcesBuilder_ == null) {
+          result.resources_ = resources_;
+        } else {
+          result.resources_ = resourcesBuilder_.build();
+        }
+        result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
@@ -2597,6 +3069,9 @@ public Builder mergeFrom(flyteidl.plugins.Ray.HeadGroupSpec other) {
         if (other == flyteidl.plugins.Ray.HeadGroupSpec.getDefaultInstance()) return this;
         internalGetMutableRayStartParams().mergeFrom(
             other.internalGetRayStartParams());
+        if (other.hasResources()) {
+          mergeResources(other.getResources());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -2784,6 +3259,159 @@ public Builder putAllRayStartParams(
             .putAll(values);
         return this;
       }
+
+      private flyteidl.core.Tasks.Resources resources_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          flyteidl.core.Tasks.Resources, flyteidl.core.Tasks.Resources.Builder, flyteidl.core.Tasks.ResourcesOrBuilder> resourcesBuilder_;
+      /**
+       * 
+       * Resource specification for ray head pod
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public boolean hasResources() {
+        return resourcesBuilder_ != null || resources_ != null;
+      }
+      /**
+       * 
+       * Resource specification for ray head pod
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public flyteidl.core.Tasks.Resources getResources() {
+        if (resourcesBuilder_ == null) {
+          return resources_ == null ? flyteidl.core.Tasks.Resources.getDefaultInstance() : resources_;
+        } else {
+          return resourcesBuilder_.getMessage();
+        }
+      }
+      /**
+       * 
+       * Resource specification for ray head pod
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public Builder setResources(flyteidl.core.Tasks.Resources value) {
+        if (resourcesBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          resources_ = value;
+          onChanged();
+        } else {
+          resourcesBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Resource specification for ray head pod
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public Builder setResources(
+          flyteidl.core.Tasks.Resources.Builder builderForValue) {
+        if (resourcesBuilder_ == null) {
+          resources_ = builderForValue.build();
+          onChanged();
+        } else {
+          resourcesBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Resource specification for ray head pod
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public Builder mergeResources(flyteidl.core.Tasks.Resources value) {
+        if (resourcesBuilder_ == null) {
+          if (resources_ != null) {
+            resources_ =
+              flyteidl.core.Tasks.Resources.newBuilder(resources_).mergeFrom(value).buildPartial();
+          } else {
+            resources_ = value;
+          }
+          onChanged();
+        } else {
+          resourcesBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Resource specification for ray head pod
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public Builder clearResources() {
+        if (resourcesBuilder_ == null) {
+          resources_ = null;
+          onChanged();
+        } else {
+          resources_ = null;
+          resourcesBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Resource specification for ray head pod
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public flyteidl.core.Tasks.Resources.Builder getResourcesBuilder() {
+        
+        onChanged();
+        return getResourcesFieldBuilder().getBuilder();
+      }
+      /**
+       * 
+       * Resource specification for ray head pod
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public flyteidl.core.Tasks.ResourcesOrBuilder getResourcesOrBuilder() {
+        if (resourcesBuilder_ != null) {
+          return resourcesBuilder_.getMessageOrBuilder();
+        } else {
+          return resources_ == null ?
+              flyteidl.core.Tasks.Resources.getDefaultInstance() : resources_;
+        }
+      }
+      /**
+       * 
+       * Resource specification for ray head pod
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          flyteidl.core.Tasks.Resources, flyteidl.core.Tasks.Resources.Builder, flyteidl.core.Tasks.ResourcesOrBuilder> 
+          getResourcesFieldBuilder() {
+        if (resourcesBuilder_ == null) {
+          resourcesBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              flyteidl.core.Tasks.Resources, flyteidl.core.Tasks.Resources.Builder, flyteidl.core.Tasks.ResourcesOrBuilder>(
+                  getResources(),
+                  getParentForChildren(),
+                  isClean());
+          resources_ = null;
+        }
+        return resourcesBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -2944,6 +3572,31 @@ java.lang.String getRayStartParamsOrDefault(
 
     java.lang.String getRayStartParamsOrThrow(
         java.lang.String key);
+
+    /**
+     * 
+     * Resource specification for ray worker pods
+     * 

+     *
+     * .flyteidl.core.Resources resources = 6;
+     */
+    boolean hasResources();
+    /**
+     * 
+     * Resource specification for ray worker pods
+     * 

+     *
+     * .flyteidl.core.Resources resources = 6;
+     */
+    flyteidl.core.Tasks.Resources getResources();
+    /**
+     * 
+     * Resource specification for ray worker pods
+     * 

+     *
+     * .flyteidl.core.Resources resources = 6;
+     */
+    flyteidl.core.Tasks.ResourcesOrBuilder getResourcesOrBuilder();
   }
   /**
    * 
@@ -3023,6 +3676,19 @@ private WorkerGroupSpec(
                   rayStartParams__.getKey(), rayStartParams__.getValue());
               break;
             }
+            case 50: {
+              flyteidl.core.Tasks.Resources.Builder subBuilder = null;
+              if (resources_ != null) {
+                subBuilder = resources_.toBuilder();
+              }
+              resources_ = input.readMessage(flyteidl.core.Tasks.Resources.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(resources_);
+                resources_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -3245,6 +3911,39 @@ public java.lang.String getRayStartParamsOrThrow(
       return map.get(key);
     }
 
+    public static final int RESOURCES_FIELD_NUMBER = 6;
+    private flyteidl.core.Tasks.Resources resources_;
+    /**
+     * 
+     * Resource specification for ray worker pods
+     * 

+     *
+     * .flyteidl.core.Resources resources = 6;
+     */
+    public boolean hasResources() {
+      return resources_ != null;
+    }
+    /**
+     * 
+     * Resource specification for ray worker pods
+     * 

+     *
+     * .flyteidl.core.Resources resources = 6;
+     */
+    public flyteidl.core.Tasks.Resources getResources() {
+      return resources_ == null ? flyteidl.core.Tasks.Resources.getDefaultInstance() : resources_;
+    }
+    /**
+     * 
+     * Resource specification for ray worker pods
+     * 

+     *
+     * .flyteidl.core.Resources resources = 6;
+     */
+    public flyteidl.core.Tasks.ResourcesOrBuilder getResourcesOrBuilder() {
+      return getResources();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -3277,6 +3976,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
           internalGetRayStartParams(),
           RayStartParamsDefaultEntryHolder.defaultEntry,
           5);
+      if (resources_ != null) {
+        output.writeMessage(6, getResources());
+      }
       unknownFields.writeTo(output);
     }
 
@@ -3311,6 +4013,10 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
             .computeMessageSize(5, rayStartParams__);
       }
+      if (resources_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, getResources());
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -3336,6 +4042,11 @@ public boolean equals(final java.lang.Object obj) {
           != other.getMaxReplicas()) return false;
       if (!internalGetRayStartParams().equals(
           other.internalGetRayStartParams())) return false;
+      if (hasResources() != other.hasResources()) return false;
+      if (hasResources()) {
+        if (!getResources()
+            .equals(other.getResources())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -3359,6 +4070,10 @@ public int hashCode() {
         hash = (37 * hash) + RAY_START_PARAMS_FIELD_NUMBER;
         hash = (53 * hash) + internalGetRayStartParams().hashCode();
       }
+      if (hasResources()) {
+        hash = (37 * hash) + RESOURCES_FIELD_NUMBER;
+        hash = (53 * hash) + getResources().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -3527,6 +4242,12 @@ public Builder clear() {
         maxReplicas_ = 0;
 
         internalGetMutableRayStartParams().clear();
+        if (resourcesBuilder_ == null) {
+          resources_ = null;
+        } else {
+          resources_ = null;
+          resourcesBuilder_ = null;
+        }
         return this;
       }
 
@@ -3561,6 +4282,11 @@ public flyteidl.plugins.Ray.WorkerGroupSpec buildPartial() {
         result.maxReplicas_ = maxReplicas_;
         result.rayStartParams_ = internalGetRayStartParams();
         result.rayStartParams_.makeImmutable();
+        if (resourcesBuilder_ == null) {
+          result.resources_ = resources_;
+        } else {
+          result.resources_ = resourcesBuilder_.build();
+        }
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -3625,6 +4351,9 @@ public Builder mergeFrom(flyteidl.plugins.Ray.WorkerGroupSpec other) {
         }
         internalGetMutableRayStartParams().mergeFrom(
             other.internalGetRayStartParams());
+        if (other.hasResources()) {
+          mergeResources(other.getResources());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -4015,6 +4744,159 @@ public Builder putAllRayStartParams(
             .putAll(values);
         return this;
       }
+
+      private flyteidl.core.Tasks.Resources resources_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          flyteidl.core.Tasks.Resources, flyteidl.core.Tasks.Resources.Builder, flyteidl.core.Tasks.ResourcesOrBuilder> resourcesBuilder_;
+      /**
+       * 
+       * Resource specification for ray worker pods
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public boolean hasResources() {
+        return resourcesBuilder_ != null || resources_ != null;
+      }
+      /**
+       * 
+       * Resource specification for ray worker pods
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public flyteidl.core.Tasks.Resources getResources() {
+        if (resourcesBuilder_ == null) {
+          return resources_ == null ? flyteidl.core.Tasks.Resources.getDefaultInstance() : resources_;
+        } else {
+          return resourcesBuilder_.getMessage();
+        }
+      }
+      /**
+       * 
+       * Resource specification for ray worker pods
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public Builder setResources(flyteidl.core.Tasks.Resources value) {
+        if (resourcesBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          resources_ = value;
+          onChanged();
+        } else {
+          resourcesBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Resource specification for ray worker pods
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public Builder setResources(
+          flyteidl.core.Tasks.Resources.Builder builderForValue) {
+        if (resourcesBuilder_ == null) {
+          resources_ = builderForValue.build();
+          onChanged();
+        } else {
+          resourcesBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Resource specification for ray worker pods
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public Builder mergeResources(flyteidl.core.Tasks.Resources value) {
+        if (resourcesBuilder_ == null) {
+          if (resources_ != null) {
+            resources_ =
+              flyteidl.core.Tasks.Resources.newBuilder(resources_).mergeFrom(value).buildPartial();
+          } else {
+            resources_ = value;
+          }
+          onChanged();
+        } else {
+          resourcesBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Resource specification for ray worker pods
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public Builder clearResources() {
+        if (resourcesBuilder_ == null) {
+          resources_ = null;
+          onChanged();
+        } else {
+          resources_ = null;
+          resourcesBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * 
+       * Resource specification for ray worker pods
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public flyteidl.core.Tasks.Resources.Builder getResourcesBuilder() {
+        
+        onChanged();
+        return getResourcesFieldBuilder().getBuilder();
+      }
+      /**
+       * 
+       * Resource specification for ray worker pods
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      public flyteidl.core.Tasks.ResourcesOrBuilder getResourcesOrBuilder() {
+        if (resourcesBuilder_ != null) {
+          return resourcesBuilder_.getMessageOrBuilder();
+        } else {
+          return resources_ == null ?
+              flyteidl.core.Tasks.Resources.getDefaultInstance() : resources_;
+        }
+      }
+      /**
+       * 
+       * Resource specification for ray worker pods
+       * 

+       *
+       * .flyteidl.core.Resources resources = 6;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          flyteidl.core.Tasks.Resources, flyteidl.core.Tasks.Resources.Builder, flyteidl.core.Tasks.ResourcesOrBuilder> 
+          getResourcesFieldBuilder() {
+        if (resourcesBuilder_ == null) {
+          resourcesBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              flyteidl.core.Tasks.Resources, flyteidl.core.Tasks.Resources.Builder, flyteidl.core.Tasks.ResourcesOrBuilder>(
+                  getResources(),
+                  getParentForChildren(),
+                  isClean());
+          resources_ = null;
+        }
+        return resourcesBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -4078,6 +4960,11 @@ public flyteidl.plugins.Ray.WorkerGroupSpec getDefaultInstanceForType() {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_flyteidl_plugins_RayCluster_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_flyteidl_plugins_RayCluster_RayClusterParamsEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_flyteidl_plugins_RayCluster_RayClusterParamsEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_flyteidl_plugins_HeadGroupSpec_descriptor;
   private static final 
@@ -4108,23 +4995,30 @@ public flyteidl.plugins.Ray.WorkerGroupSpec getDefaultInstanceForType() {
   static {
     java.lang.String[] descriptorData = {
       "\n\032flyteidl/plugins/ray.proto\022\020flyteidl.p" +
-      "lugins\"P\n\006RayJob\0221\n\013ray_cluster\030\001 \001(\0132\034." +
-      "flyteidl.plugins.RayCluster\022\023\n\013runtime_e" +
-      "nv\030\002 \001(\t\"\204\001\n\nRayCluster\0228\n\017head_group_sp" +
-      "ec\030\001 \001(\0132\037.flyteidl.plugins.HeadGroupSpe" +
-      "c\022<\n\021worker_group_spec\030\002 \003(\0132!.flyteidl." +
-      "plugins.WorkerGroupSpec\"\225\001\n\rHeadGroupSpe" +
-      "c\022M\n\020ray_start_params\030\001 \003(\01323.flyteidl.p" +
-      "lugins.HeadGroupSpec.RayStartParamsEntry" +
-      "\0325\n\023RayStartParamsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" +
-      "value\030\002 \001(\t:\0028\001\"\353\001\n\017WorkerGroupSpec\022\022\n\ng" +
-      "roup_name\030\001 \001(\t\022\020\n\010replicas\030\002 \001(\005\022\024\n\014min" +
-      "_replicas\030\003 \001(\005\022\024\n\014max_replicas\030\004 \001(\005\022O\n" +
-      "\020ray_start_params\030\005 \003(\01325.flyteidl.plugi" +
-      "ns.WorkerGroupSpec.RayStartParamsEntry\0325" +
-      "\n\023RayStartParamsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" +
-      "lue\030\002 \001(\t:\0028\001B9Z7github.com/flyteorg/fly" +
-      "teidl/gen/pb-go/flyteidl/pluginsb\006proto3"
+      "lugins\032\031flyteidl/core/tasks.proto\"P\n\006Ray" +
+      "Job\0221\n\013ray_cluster\030\001 \001(\0132\034.flyteidl.plug" +
+      "ins.RayCluster\022\023\n\013runtime_env\030\002 \001(\t\"\215\002\n\n" +
+      "RayCluster\0228\n\017head_group_spec\030\001 \001(\0132\037.fl" +
+      "yteidl.plugins.HeadGroupSpec\022<\n\021worker_g" +
+      "roup_spec\030\002 \003(\0132!.flyteidl.plugins.Worke" +
+      "rGroupSpec\022N\n\022ray_cluster_params\030\003 \003(\01322" +
+      ".flyteidl.plugins.RayCluster.RayClusterP" +
+      "aramsEntry\0327\n\025RayClusterParamsEntry\022\013\n\003k" +
+      "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\302\001\n\rHeadGrou" +
+      "pSpec\022M\n\020ray_start_params\030\001 \003(\01323.flytei" +
+      "dl.plugins.HeadGroupSpec.RayStartParamsE" +
+      "ntry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.core." +
+      "Resources\0325\n\023RayStartParamsEntry\022\013\n\003key\030" +
+      "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\230\002\n\017WorkerGroup" +
+      "Spec\022\022\n\ngroup_name\030\001 \001(\t\022\020\n\010replicas\030\002 \001" +
+      "(\005\022\024\n\014min_replicas\030\003 \001(\005\022\024\n\014max_replicas" +
+      "\030\004 \001(\005\022O\n\020ray_start_params\030\005 \003(\01325.flyte" +
+      "idl.plugins.WorkerGroupSpec.RayStartPara" +
+      "msEntry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.co" +
+      "re.Resources\0325\n\023RayStartParamsEntry\022\013\n\003k" +
+      "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B9Z7github.co" +
+      "m/flyteorg/flyteidl/gen/pb-go/flyteidl/p" +
+      "luginsb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -4137,6 +5031,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          flyteidl.core.Tasks.getDescriptor(),
         }, assigner);
     internal_static_flyteidl_plugins_RayJob_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -4149,13 +5044,19 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_flyteidl_plugins_RayCluster_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_flyteidl_plugins_RayCluster_descriptor,
-        new java.lang.String[] { "HeadGroupSpec", "WorkerGroupSpec", });
+        new java.lang.String[] { "HeadGroupSpec", "WorkerGroupSpec", "RayClusterParams", });
+    internal_static_flyteidl_plugins_RayCluster_RayClusterParamsEntry_descriptor =
+      internal_static_flyteidl_plugins_RayCluster_descriptor.getNestedTypes().get(0);
+    internal_static_flyteidl_plugins_RayCluster_RayClusterParamsEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_flyteidl_plugins_RayCluster_RayClusterParamsEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
     internal_static_flyteidl_plugins_HeadGroupSpec_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_flyteidl_plugins_HeadGroupSpec_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_flyteidl_plugins_HeadGroupSpec_descriptor,
-        new java.lang.String[] { "RayStartParams", });
+        new java.lang.String[] { "RayStartParams", "Resources", });
     internal_static_flyteidl_plugins_HeadGroupSpec_RayStartParamsEntry_descriptor =
       internal_static_flyteidl_plugins_HeadGroupSpec_descriptor.getNestedTypes().get(0);
     internal_static_flyteidl_plugins_HeadGroupSpec_RayStartParamsEntry_fieldAccessorTable = new
@@ -4167,13 +5068,14 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_flyteidl_plugins_WorkerGroupSpec_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_flyteidl_plugins_WorkerGroupSpec_descriptor,
-        new java.lang.String[] { "GroupName", "Replicas", "MinReplicas", "MaxReplicas", "RayStartParams", });
+        new java.lang.String[] { "GroupName", "Replicas", "MinReplicas", "MaxReplicas", "RayStartParams", "Resources", });
     internal_static_flyteidl_plugins_WorkerGroupSpec_RayStartParamsEntry_descriptor =
       internal_static_flyteidl_plugins_WorkerGroupSpec_descriptor.getNestedTypes().get(0);
     internal_static_flyteidl_plugins_WorkerGroupSpec_RayStartParamsEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_flyteidl_plugins_WorkerGroupSpec_RayStartParamsEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
+    flyteidl.core.Tasks.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/gen/pb_python/flyteidl/plugins/ray_pb2.py b/gen/pb_python/flyteidl/plugins/ray_pb2.py
index 65fbc0352..13b93ac40 100644
--- a/gen/pb_python/flyteidl/plugins/ray_pb2.py
+++ b/gen/pb_python/flyteidl/plugins/ray_pb2.py
@@ -11,9 +11,10 @@
 _sym_db = _symbol_database.Default()
 
 
+from flyteidl.core import tasks_pb2 as flyteidl_dot_core_dot_tasks__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/plugins/ray.proto\x12\x10\x66lyteidl.plugins\"h\n\x06RayJob\x12=\n\x0bray_cluster\x18\x01 \x01(\x0b\x32\x1c.flyteidl.plugins.RayClusterR\nrayCluster\x12\x1f\n\x0bruntime_env\x18\x02 \x01(\tR\nruntimeEnv\"\xa4\x01\n\nRayCluster\x12G\n\x0fhead_group_spec\x18\x01 \x01(\x0b\x32\x1f.flyteidl.plugins.HeadGroupSpecR\rheadGroupSpec\x12M\n\x11worker_group_spec\x18\x02 \x03(\x0b\x32!.flyteidl.plugins.WorkerGroupSpecR\x0fworkerGroupSpec\"\xb1\x01\n\rHeadGroupSpec\x12]\n\x10ray_start_params\x18\x01 \x03(\x0b\x32\x33.flyteidl.plugins.HeadGroupSpec.RayStartParamsEntryR\x0erayStartParams\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xb6\x02\n\x0fWorkerGroupSpec\x12\x1d\n\ngroup_name\x18\x01 \x01(\tR\tgroupName\x12\x1a\n\x08replicas\x18\x02 \x01(\x05R\x08replicas\x12!\n\x0cmin_replicas\x18\x03 \x01(\x05R\x0bminReplicas\x12!\n\x0cmax_replicas\x18\x04 \x01(\x05R\x0bmaxReplicas\x12_\n\x10ray_start_params\x18\x05 \x03(\x0b\x32\x35.flyteidl.plugins.WorkerGroupSpec.RayStartParamsEntryR\x0erayStartParams\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\xba\x01\n\x14\x63om.flyteidl.pluginsB\x08RayProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins\xa2\x02\x03\x46PX\xaa\x02\x10\x46lyteidl.Plugins\xca\x02\x10\x46lyteidl\\Plugins\xe2\x02\x1c\x46lyteidl\\Plugins\\GPBMetadata\xea\x02\x11\x46lyteidl::Pluginsb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/plugins/ray.proto\x12\x10\x66lyteidl.plugins\x1a\x19\x66lyteidl/core/tasks.proto\"h\n\x06RayJob\x12=\n\x0bray_cluster\x18\x01 \x01(\x0b\x32\x1c.flyteidl.plugins.RayClusterR\nrayCluster\x12\x1f\n\x0bruntime_env\x18\x02 \x01(\tR\nruntimeEnv\"\xcb\x02\n\nRayCluster\x12G\n\x0fhead_group_spec\x18\x01 \x01(\x0b\x32\x1f.flyteidl.plugins.HeadGroupSpecR\rheadGroupSpec\x12M\n\x11worker_group_spec\x18\x02 \x03(\x0b\x32!.flyteidl.plugins.WorkerGroupSpecR\x0fworkerGroupSpec\x12`\n\x12ray_cluster_params\x18\x03 \x03(\x0b\x32\x32.flyteidl.plugins.RayCluster.RayClusterParamsEntryR\x10rayClusterParams\x1a\x43\n\x15RayClusterParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xe9\x01\n\rHeadGroupSpec\x12]\n\x10ray_start_params\x18\x01 \x03(\x0b\x32\x33.flyteidl.plugins.HeadGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xee\x02\n\x0fWorkerGroupSpec\x12\x1d\n\ngroup_name\x18\x01 \x01(\tR\tgroupName\x12\x1a\n\x08replicas\x18\x02 \x01(\x05R\x08replicas\x12!\n\x0cmin_replicas\x18\x03 \x01(\x05R\x0bminReplicas\x12!\n\x0cmax_replicas\x18\x04 \x01(\x05R\x0bmaxReplicas\x12_\n\x10ray_start_params\x18\x05 \x03(\x0b\x32\x35.flyteidl.plugins.WorkerGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\xba\x01\n\x14\x63om.flyteidl.pluginsB\x08RayProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins\xa2\x02\x03\x46PX\xaa\x02\x10\x46lyteidl.Plugins\xca\x02\x10\x46lyteidl\\Plugins\xe2\x02\x1c\x46lyteidl\\Plugins\\GPBMetadata\xea\x02\x11\x46lyteidl::Pluginsb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -22,20 +23,24 @@
 
   DESCRIPTOR._options = None
   DESCRIPTOR._serialized_options = b'\n\024com.flyteidl.pluginsB\010RayProtoP\001Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins\242\002\003FPX\252\002\020Flyteidl.Plugins\312\002\020Flyteidl\\Plugins\342\002\034Flyteidl\\Plugins\\GPBMetadata\352\002\021Flyteidl::Plugins'
+  _RAYCLUSTER_RAYCLUSTERPARAMSENTRY._options = None
+  _RAYCLUSTER_RAYCLUSTERPARAMSENTRY._serialized_options = b'8\001'
   _HEADGROUPSPEC_RAYSTARTPARAMSENTRY._options = None
   _HEADGROUPSPEC_RAYSTARTPARAMSENTRY._serialized_options = b'8\001'
   _WORKERGROUPSPEC_RAYSTARTPARAMSENTRY._options = None
   _WORKERGROUPSPEC_RAYSTARTPARAMSENTRY._serialized_options = b'8\001'
-  _globals['_RAYJOB']._serialized_start=48
-  _globals['_RAYJOB']._serialized_end=152
-  _globals['_RAYCLUSTER']._serialized_start=155
-  _globals['_RAYCLUSTER']._serialized_end=319
-  _globals['_HEADGROUPSPEC']._serialized_start=322
-  _globals['_HEADGROUPSPEC']._serialized_end=499
-  _globals['_HEADGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_start=434
-  _globals['_HEADGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_end=499
-  _globals['_WORKERGROUPSPEC']._serialized_start=502
-  _globals['_WORKERGROUPSPEC']._serialized_end=812
-  _globals['_WORKERGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_start=434
-  _globals['_WORKERGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_end=499
+  _globals['_RAYJOB']._serialized_start=75
+  _globals['_RAYJOB']._serialized_end=179
+  _globals['_RAYCLUSTER']._serialized_start=182
+  _globals['_RAYCLUSTER']._serialized_end=513
+  _globals['_RAYCLUSTER_RAYCLUSTERPARAMSENTRY']._serialized_start=446
+  _globals['_RAYCLUSTER_RAYCLUSTERPARAMSENTRY']._serialized_end=513
+  _globals['_HEADGROUPSPEC']._serialized_start=516
+  _globals['_HEADGROUPSPEC']._serialized_end=749
+  _globals['_HEADGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_start=684
+  _globals['_HEADGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_end=749
+  _globals['_WORKERGROUPSPEC']._serialized_start=752
+  _globals['_WORKERGROUPSPEC']._serialized_end=1118
+  _globals['_WORKERGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_start=684
+  _globals['_WORKERGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_end=749
 # @@protoc_insertion_point(module_scope)
diff --git a/gen/pb_python/flyteidl/plugins/ray_pb2.pyi b/gen/pb_python/flyteidl/plugins/ray_pb2.pyi
index 16b67e478..d3cfaa312 100644
--- a/gen/pb_python/flyteidl/plugins/ray_pb2.pyi
+++ b/gen/pb_python/flyteidl/plugins/ray_pb2.pyi
@@ -1,3 +1,4 @@
+from flyteidl.core import tasks_pb2 as _tasks_pb2
 from google.protobuf.internal import containers as _containers
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
@@ -14,15 +15,24 @@ class RayJob(_message.Message):
     def __init__(self, ray_cluster: _Optional[_Union[RayCluster, _Mapping]] = ..., runtime_env: _Optional[str] = ...) -> None: ...
 
 class RayCluster(_message.Message):
-    __slots__ = ["head_group_spec", "worker_group_spec"]
+    __slots__ = ["head_group_spec", "worker_group_spec", "ray_cluster_params"]
+    class RayClusterParamsEntry(_message.Message):
+        __slots__ = ["key", "value"]
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: str
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
     HEAD_GROUP_SPEC_FIELD_NUMBER: _ClassVar[int]
     WORKER_GROUP_SPEC_FIELD_NUMBER: _ClassVar[int]
+    RAY_CLUSTER_PARAMS_FIELD_NUMBER: _ClassVar[int]
     head_group_spec: HeadGroupSpec
     worker_group_spec: _containers.RepeatedCompositeFieldContainer[WorkerGroupSpec]
-    def __init__(self, head_group_spec: _Optional[_Union[HeadGroupSpec, _Mapping]] = ..., worker_group_spec: _Optional[_Iterable[_Union[WorkerGroupSpec, _Mapping]]] = ...) -> None: ...
+    ray_cluster_params: _containers.ScalarMap[str, str]
+    def __init__(self, head_group_spec: _Optional[_Union[HeadGroupSpec, _Mapping]] = ..., worker_group_spec: _Optional[_Iterable[_Union[WorkerGroupSpec, _Mapping]]] = ..., ray_cluster_params: _Optional[_Mapping[str, str]] = ...) -> None: ...
 
 class HeadGroupSpec(_message.Message):
-    __slots__ = ["ray_start_params"]
+    __slots__ = ["ray_start_params", "resources"]
     class RayStartParamsEntry(_message.Message):
         __slots__ = ["key", "value"]
         KEY_FIELD_NUMBER: _ClassVar[int]
@@ -31,11 +41,13 @@ class HeadGroupSpec(_message.Message):
         value: str
         def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
     RAY_START_PARAMS_FIELD_NUMBER: _ClassVar[int]
+    RESOURCES_FIELD_NUMBER: _ClassVar[int]
     ray_start_params: _containers.ScalarMap[str, str]
-    def __init__(self, ray_start_params: _Optional[_Mapping[str, str]] = ...) -> None: ...
+    resources: _tasks_pb2.Resources
+    def __init__(self, ray_start_params: _Optional[_Mapping[str, str]] = ..., resources: _Optional[_Union[_tasks_pb2.Resources, _Mapping]] = ...) -> None: ...
 
 class WorkerGroupSpec(_message.Message):
-    __slots__ = ["group_name", "replicas", "min_replicas", "max_replicas", "ray_start_params"]
+    __slots__ = ["group_name", "replicas", "min_replicas", "max_replicas", "ray_start_params", "resources"]
     class RayStartParamsEntry(_message.Message):
         __slots__ = ["key", "value"]
         KEY_FIELD_NUMBER: _ClassVar[int]
@@ -48,9 +60,11 @@ class WorkerGroupSpec(_message.Message):
     MIN_REPLICAS_FIELD_NUMBER: _ClassVar[int]
     MAX_REPLICAS_FIELD_NUMBER: _ClassVar[int]
     RAY_START_PARAMS_FIELD_NUMBER: _ClassVar[int]
+    RESOURCES_FIELD_NUMBER: _ClassVar[int]
     group_name: str
     replicas: int
     min_replicas: int
     max_replicas: int
     ray_start_params: _containers.ScalarMap[str, str]
-    def __init__(self, group_name: _Optional[str] = ..., replicas: _Optional[int] = ..., min_replicas: _Optional[int] = ..., max_replicas: _Optional[int] = ..., ray_start_params: _Optional[_Mapping[str, str]] = ...) -> None: ...
+    resources: _tasks_pb2.Resources
+    def __init__(self, group_name: _Optional[str] = ..., replicas: _Optional[int] = ..., min_replicas: _Optional[int] = ..., max_replicas: _Optional[int] = ..., ray_start_params: _Optional[_Mapping[str, str]] = ..., resources: _Optional[_Union[_tasks_pb2.Resources, _Mapping]] = ...) -> None: ...
diff --git a/gen/pb_rust/flyteidl.plugins.rs b/gen/pb_rust/flyteidl.plugins.rs
index 2bc8b08c2..557592122 100644
--- a/gen/pb_rust/flyteidl.plugins.rs
+++ b/gen/pb_rust/flyteidl.plugins.rs
@@ -186,6 +186,9 @@ pub struct RayCluster {
     /// WorkerGroupSpecs are the specs for the worker pods
     #[prost(message, repeated, tag="2")]
     pub worker_group_spec: ::prost::alloc::vec::Vec,
+    /// Additional parameter overrides for ray cluster config
+    #[prost(map="string, string", tag="3")]
+    pub ray_cluster_params: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>,
 }
 /// HeadGroupSpec are the spec for the head pod
 #[allow(clippy::derive_partial_eq_without_eq)]
@@ -195,6 +198,9 @@ pub struct HeadGroupSpec {
     /// Refer to 
     #[prost(map="string, string", tag="1")]
     pub ray_start_params: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>,
+    /// Resource specification for ray head pod
+    #[prost(message, optional, tag="6")]
+    pub resources: ::core::option::Option,
 }
 /// WorkerGroupSpec are the specs for the worker pods
 #[allow(clippy::derive_partial_eq_without_eq)]
@@ -216,6 +222,9 @@ pub struct WorkerGroupSpec {
     /// Refer to 
     #[prost(map="string, string", tag="5")]
     pub ray_start_params: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>,
+    /// Resource specification for ray worker pods
+    #[prost(message, optional, tag="6")]
+    pub resources: ::core::option::Option,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]

From 618d81bcd04f7ba36b292248054d4cbcc61c0e51 Mon Sep 17 00:00:00 2001
From: Guozhen La 
Date: Tue, 8 Aug 2023 16:48:51 -0400
Subject: [PATCH 6/9] add namespace and sa fields

Signed-off-by: Guozhen La 
---
 gen/pb-cpp/flyteidl/plugins/ray.pb.cc         | 357 ++++++++---
 gen/pb-cpp/flyteidl/plugins/ray.pb.h          | 194 +++++-
 gen/pb-go/flyteidl/plugins/ray.pb.go          |  98 +--
 gen/pb-go/flyteidl/plugins/ray.pb.validate.go |   6 +-
 gen/pb-java/flyteidl/plugins/Ray.java         | 603 ++++++++++++++----
 gen/pb_python/flyteidl/plugins/ray_pb2.py     |  28 +-
 gen/pb_python/flyteidl/plugins/ray_pb2.pyi    |  14 +-
 gen/pb_rust/flyteidl.plugins.rs               |   8 +-
 protos/flyteidl/plugins/ray.proto             |   6 +-
 9 files changed, 995 insertions(+), 319 deletions(-)

diff --git a/gen/pb-cpp/flyteidl/plugins/ray.pb.cc b/gen/pb-cpp/flyteidl/plugins/ray.pb.cc
index 78fb4fc7d..eff5f9781 100644
--- a/gen/pb-cpp/flyteidl/plugins/ray.pb.cc
+++ b/gen/pb-cpp/flyteidl/plugins/ray.pb.cc
@@ -18,7 +18,7 @@
 
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ftasks_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_Resources_flyteidl_2fcore_2ftasks_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_HeadGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto;
-extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_RayCluster_RayClusterParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto;
+extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_RayCluster_ConfigOverrideEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_WorkerGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto;
 extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto;
@@ -29,10 +29,10 @@ class RayJobDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed _instance;
 } _RayJob_default_instance_;
-class RayCluster_RayClusterParamsEntry_DoNotUseDefaultTypeInternal {
+class RayCluster_ConfigOverrideEntry_DoNotUseDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed _instance;
-} _RayCluster_RayClusterParamsEntry_DoNotUse_default_instance_;
+  ::google::protobuf::internal::ExplicitlyConstructed _instance;
+} _RayCluster_ConfigOverrideEntry_DoNotUse_default_instance_;
 class RayClusterDefaultTypeInternal {
  public:
   ::google::protobuf::internal::ExplicitlyConstructed _instance;
@@ -70,18 +70,18 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_RayJob_flyteidl_2fplugins_2fra
     {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsRayJob_flyteidl_2fplugins_2fray_2eproto}, {
       &scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto.base,}};
 
-static void InitDefaultsRayCluster_RayClusterParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto() {
+static void InitDefaultsRayCluster_ConfigOverrideEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::flyteidl::plugins::_RayCluster_RayClusterParamsEntry_DoNotUse_default_instance_;
-    new (ptr) ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse();
+    void* ptr = &::flyteidl::plugins::_RayCluster_ConfigOverrideEntry_DoNotUse_default_instance_;
+    new (ptr) ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse();
   }
-  ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse::InitAsDefaultInstance();
+  ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse::InitAsDefaultInstance();
 }
 
-::google::protobuf::internal::SCCInfo<0> scc_info_RayCluster_RayClusterParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsRayCluster_RayClusterParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto}, {}};
+::google::protobuf::internal::SCCInfo<0> scc_info_RayCluster_ConfigOverrideEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsRayCluster_ConfigOverrideEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto}, {}};
 
 static void InitDefaultsRayCluster_flyteidl_2fplugins_2fray_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
@@ -98,7 +98,7 @@ ::google::protobuf::internal::SCCInfo<3> scc_info_RayCluster_flyteidl_2fplugins_
     {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsRayCluster_flyteidl_2fplugins_2fray_2eproto}, {
       &scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto.base,
       &scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto.base,
-      &scc_info_RayCluster_RayClusterParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base,}};
+      &scc_info_RayCluster_ConfigOverrideEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base,}};
 
 static void InitDefaultsHeadGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
@@ -160,7 +160,7 @@ ::google::protobuf::internal::SCCInfo<2> scc_info_WorkerGroupSpec_flyteidl_2fplu
 
 void InitDefaults_flyteidl_2fplugins_2fray_2eproto() {
   ::google::protobuf::internal::InitSCC(&scc_info_RayJob_flyteidl_2fplugins_2fray_2eproto.base);
-  ::google::protobuf::internal::InitSCC(&scc_info_RayCluster_RayClusterParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base);
+  ::google::protobuf::internal::InitSCC(&scc_info_RayCluster_ConfigOverrideEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_HeadGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base);
   ::google::protobuf::internal::InitSCC(&scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto.base);
@@ -180,13 +180,13 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fplugins_2fray_2eproto::o
   ~0u,  // no _weak_field_map_
   PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayJob, ray_cluster_),
   PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayJob, runtime_env_),
-  PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse, _has_bits_),
-  PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse, _internal_metadata_),
+  PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse, _has_bits_),
+  PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse, key_),
-  PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse, value_),
+  PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse, key_),
+  PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse, value_),
   0,
   1,
   ~0u,  // no _has_bits_
@@ -196,7 +196,9 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fplugins_2fray_2eproto::o
   ~0u,  // no _weak_field_map_
   PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, head_group_spec_),
   PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, worker_group_spec_),
-  PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, ray_cluster_params_),
+  PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, config_override_),
+  PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, namespace__),
+  PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, k8s_service_account_),
   PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse, _has_bits_),
   PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse, _internal_metadata_),
   ~0u,  // no _extensions_
@@ -236,17 +238,17 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fplugins_2fray_2eproto::o
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
   { 0, -1, sizeof(::flyteidl::plugins::RayJob)},
-  { 7, 14, sizeof(::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse)},
+  { 7, 14, sizeof(::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse)},
   { 16, -1, sizeof(::flyteidl::plugins::RayCluster)},
-  { 24, 31, sizeof(::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse)},
-  { 33, -1, sizeof(::flyteidl::plugins::HeadGroupSpec)},
-  { 40, 47, sizeof(::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse)},
-  { 49, -1, sizeof(::flyteidl::plugins::WorkerGroupSpec)},
+  { 26, 33, sizeof(::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse)},
+  { 35, -1, sizeof(::flyteidl::plugins::HeadGroupSpec)},
+  { 42, 49, sizeof(::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse)},
+  { 51, -1, sizeof(::flyteidl::plugins::WorkerGroupSpec)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
   reinterpret_cast(&::flyteidl::plugins::_RayJob_default_instance_),
-  reinterpret_cast(&::flyteidl::plugins::_RayCluster_RayClusterParamsEntry_DoNotUse_default_instance_),
+  reinterpret_cast(&::flyteidl::plugins::_RayCluster_ConfigOverrideEntry_DoNotUse_default_instance_),
   reinterpret_cast(&::flyteidl::plugins::_RayCluster_default_instance_),
   reinterpret_cast(&::flyteidl::plugins::_HeadGroupSpec_RayStartParamsEntry_DoNotUse_default_instance_),
   reinterpret_cast(&::flyteidl::plugins::_HeadGroupSpec_default_instance_),
@@ -264,33 +266,34 @@ const char descriptor_table_protodef_flyteidl_2fplugins_2fray_2eproto[] =
   "\n\032flyteidl/plugins/ray.proto\022\020flyteidl.p"
   "lugins\032\031flyteidl/core/tasks.proto\"P\n\006Ray"
   "Job\0221\n\013ray_cluster\030\001 \001(\0132\034.flyteidl.plug"
-  "ins.RayCluster\022\023\n\013runtime_env\030\002 \001(\t\"\215\002\n\n"
+  "ins.RayCluster\022\023\n\013runtime_env\030\002 \001(\t\"\266\002\n\n"
   "RayCluster\0228\n\017head_group_spec\030\001 \001(\0132\037.fl"
   "yteidl.plugins.HeadGroupSpec\022<\n\021worker_g"
   "roup_spec\030\002 \003(\0132!.flyteidl.plugins.Worke"
-  "rGroupSpec\022N\n\022ray_cluster_params\030\003 \003(\01322"
-  ".flyteidl.plugins.RayCluster.RayClusterP"
-  "aramsEntry\0327\n\025RayClusterParamsEntry\022\013\n\003k"
-  "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\302\001\n\rHeadGrou"
-  "pSpec\022M\n\020ray_start_params\030\001 \003(\01323.flytei"
-  "dl.plugins.HeadGroupSpec.RayStartParamsE"
-  "ntry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.core."
-  "Resources\0325\n\023RayStartParamsEntry\022\013\n\003key\030"
-  "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\230\002\n\017WorkerGroup"
-  "Spec\022\022\n\ngroup_name\030\001 \001(\t\022\020\n\010replicas\030\002 \001"
-  "(\005\022\024\n\014min_replicas\030\003 \001(\005\022\024\n\014max_replicas"
-  "\030\004 \001(\005\022O\n\020ray_start_params\030\005 \003(\01325.flyte"
-  "idl.plugins.WorkerGroupSpec.RayStartPara"
-  "msEntry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.co"
-  "re.Resources\0325\n\023RayStartParamsEntry\022\013\n\003k"
-  "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B9Z7github.co"
-  "m/flyteorg/flyteidl/gen/pb-go/flyteidl/p"
-  "luginsb\006proto3"
+  "rGroupSpec\022I\n\017config_override\030\003 \003(\01320.fl"
+  "yteidl.plugins.RayCluster.ConfigOverride"
+  "Entry\022\021\n\tnamespace\030\004 \001(\t\022\033\n\023k8s_service_"
+  "account\030\005 \001(\t\0325\n\023ConfigOverrideEntry\022\013\n\003"
+  "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\302\001\n\rHeadGro"
+  "upSpec\022M\n\020ray_start_params\030\001 \003(\01323.flyte"
+  "idl.plugins.HeadGroupSpec.RayStartParams"
+  "Entry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.core"
+  ".Resources\0325\n\023RayStartParamsEntry\022\013\n\003key"
+  "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\230\002\n\017WorkerGrou"
+  "pSpec\022\022\n\ngroup_name\030\001 \001(\t\022\020\n\010replicas\030\002 "
+  "\001(\005\022\024\n\014min_replicas\030\003 \001(\005\022\024\n\014max_replica"
+  "s\030\004 \001(\005\022O\n\020ray_start_params\030\005 \003(\01325.flyt"
+  "eidl.plugins.WorkerGroupSpec.RayStartPar"
+  "amsEntry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.c"
+  "ore.Resources\0325\n\023RayStartParamsEntry\022\013\n\003"
+  "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B9Z7github.c"
+  "om/flyteorg/flyteidl/gen/pb-go/flyteidl/"
+  "pluginsb\006proto3"
   ;
 ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fplugins_2fray_2eproto = {
   false, InitDefaults_flyteidl_2fplugins_2fray_2eproto, 
   descriptor_table_protodef_flyteidl_2fplugins_2fray_2eproto,
-  "flyteidl/plugins/ray.proto", &assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto, 974,
+  "flyteidl/plugins/ray.proto", &assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto, 1015,
 };
 
 void AddDescriptors_flyteidl_2fplugins_2fray_2eproto() {
@@ -672,25 +675,25 @@ ::google::protobuf::Metadata RayJob::GetMetadata() const {
 
 // ===================================================================
 
-RayCluster_RayClusterParamsEntry_DoNotUse::RayCluster_RayClusterParamsEntry_DoNotUse() {}
-RayCluster_RayClusterParamsEntry_DoNotUse::RayCluster_RayClusterParamsEntry_DoNotUse(::google::protobuf::Arena* arena)
+RayCluster_ConfigOverrideEntry_DoNotUse::RayCluster_ConfigOverrideEntry_DoNotUse() {}
+RayCluster_ConfigOverrideEntry_DoNotUse::RayCluster_ConfigOverrideEntry_DoNotUse(::google::protobuf::Arena* arena)
     : SuperType(arena) {}
-void RayCluster_RayClusterParamsEntry_DoNotUse::MergeFrom(const RayCluster_RayClusterParamsEntry_DoNotUse& other) {
+void RayCluster_ConfigOverrideEntry_DoNotUse::MergeFrom(const RayCluster_ConfigOverrideEntry_DoNotUse& other) {
   MergeFromInternal(other);
 }
-::google::protobuf::Metadata RayCluster_RayClusterParamsEntry_DoNotUse::GetMetadata() const {
+::google::protobuf::Metadata RayCluster_ConfigOverrideEntry_DoNotUse::GetMetadata() const {
   ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto);
   return ::file_level_metadata_flyteidl_2fplugins_2fray_2eproto[1];
 }
-void RayCluster_RayClusterParamsEntry_DoNotUse::MergeFrom(
+void RayCluster_ConfigOverrideEntry_DoNotUse::MergeFrom(
     const ::google::protobuf::Message& other) {
   ::google::protobuf::Message::MergeFrom(other);
 }
 
 #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
-bool RayCluster_RayClusterParamsEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) {
+bool RayCluster_ConfigOverrideEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) {
   using MF = ::google::protobuf::internal::MapField<
-      RayCluster_RayClusterParamsEntry_DoNotUse, EntryKeyType, EntryValueType,
+      RayCluster_ConfigOverrideEntry_DoNotUse, EntryKeyType, EntryValueType,
       kEntryKeyFieldType, kEntryValueFieldType,
       kEntryDefaultEnumValue>;
   auto mf = static_cast(object);
@@ -700,11 +703,11 @@ bool RayCluster_RayClusterParamsEntry_DoNotUse::_ParseMap(const char* begin, con
   DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
     parser.key().data(), static_cast(parser.key().length()),
     ::google::protobuf::internal::WireFormatLite::PARSE,
-    "flyteidl.plugins.RayCluster.RayClusterParamsEntry.key"));
+    "flyteidl.plugins.RayCluster.ConfigOverrideEntry.key"));
   DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
     parser.value().data(), static_cast(parser.value().length()),
     ::google::protobuf::internal::WireFormatLite::PARSE,
-    "flyteidl.plugins.RayCluster.RayClusterParamsEntry.value"));
+    "flyteidl.plugins.RayCluster.ConfigOverrideEntry.value"));
 #undef DO_
   return true;
 }
@@ -729,7 +732,9 @@ RayCluster::HasBitSetters::head_group_spec(const RayCluster* msg) {
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int RayCluster::kHeadGroupSpecFieldNumber;
 const int RayCluster::kWorkerGroupSpecFieldNumber;
-const int RayCluster::kRayClusterParamsFieldNumber;
+const int RayCluster::kConfigOverrideFieldNumber;
+const int RayCluster::kNamespaceFieldNumber;
+const int RayCluster::kK8SServiceAccountFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 RayCluster::RayCluster()
@@ -742,7 +747,15 @@ RayCluster::RayCluster(const RayCluster& from)
       _internal_metadata_(nullptr),
       worker_group_spec_(from.worker_group_spec_) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ray_cluster_params_.MergeFrom(from.ray_cluster_params_);
+  config_override_.MergeFrom(from.config_override_);
+  namespace__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  if (from.namespace_().size() > 0) {
+    namespace__.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.namespace__);
+  }
+  k8s_service_account_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  if (from.k8s_service_account().size() > 0) {
+    k8s_service_account_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.k8s_service_account_);
+  }
   if (from.has_head_group_spec()) {
     head_group_spec_ = new ::flyteidl::plugins::HeadGroupSpec(*from.head_group_spec_);
   } else {
@@ -754,6 +767,8 @@ RayCluster::RayCluster(const RayCluster& from)
 void RayCluster::SharedCtor() {
   ::google::protobuf::internal::InitSCC(
       &scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto.base);
+  namespace__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  k8s_service_account_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   head_group_spec_ = nullptr;
 }
 
@@ -763,6 +778,8 @@ RayCluster::~RayCluster() {
 }
 
 void RayCluster::SharedDtor() {
+  namespace__.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  k8s_service_account_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   if (this != internal_default_instance()) delete head_group_spec_;
 }
 
@@ -782,7 +799,9 @@ void RayCluster::Clear() {
   (void) cached_has_bits;
 
   worker_group_spec_.Clear();
-  ray_cluster_params_.Clear();
+  config_override_.Clear();
+  namespace__.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  k8s_service_account_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   if (GetArenaNoVirtual() == nullptr && head_group_spec_ != nullptr) {
     delete head_group_spec_;
   }
@@ -832,17 +851,17 @@ const char* RayCluster::_InternalParse(const char* begin, const char* end, void*
         } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 18 && (ptr += 1));
         break;
       }
-      // map ray_cluster_params = 3;
+      // map config_override = 3;
       case 3: {
         if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual;
         do {
           ptr = ::google::protobuf::io::ReadSize(ptr, &size);
           GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
           parser_till_end = ::google::protobuf::internal::SlowMapEntryParser;
-          auto parse_map = ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse::_ParseMap;
+          auto parse_map = ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse::_ParseMap;
           ctx->extra_parse_data().payload.clear();
           ctx->extra_parse_data().parse_map = parse_map;
-          object = &msg->ray_cluster_params_;
+          object = &msg->config_override_;
           if (size > end - ptr) goto len_delim_till_end;
           auto newend = ptr + size;
           GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx));
@@ -851,6 +870,38 @@ const char* RayCluster::_InternalParse(const char* begin, const char* end, void*
         } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 26 && (ptr += 1));
         break;
       }
+      // string namespace = 4;
+      case 4: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        ctx->extra_parse_data().SetFieldName("flyteidl.plugins.RayCluster.namespace");
+        object = msg->mutable_namespace_();
+        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
+          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
+          goto string_till_end;
+        }
+        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
+        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
+        ptr += size;
+        break;
+      }
+      // string k8s_service_account = 5;
+      case 5: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        ctx->extra_parse_data().SetFieldName("flyteidl.plugins.RayCluster.k8s_service_account");
+        object = msg->mutable_k8s_service_account();
+        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
+          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8;
+          goto string_till_end;
+        }
+        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8(ptr, size, ctx));
+        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
+        ptr += size;
+        break;
+      }
       default: {
       handle_unusual:
         if ((tag & 7) == 4 || tag == 0) {
@@ -866,6 +917,10 @@ const char* RayCluster::_InternalParse(const char* begin, const char* end, void*
     }  // switch
   }  // while
   return ptr;
+string_till_end:
+  static_cast<::std::string*>(object)->clear();
+  static_cast<::std::string*>(object)->reserve(size);
+  goto len_delim_till_end;
 len_delim_till_end:
   return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
                                {parser_till_end, object}, size);
@@ -903,26 +958,56 @@ bool RayCluster::MergePartialFromCodedStream(
         break;
       }
 
-      // map ray_cluster_params = 3;
+      // map config_override = 3;
       case 3: {
         if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) {
-          RayCluster_RayClusterParamsEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField<
-              RayCluster_RayClusterParamsEntry_DoNotUse,
+          RayCluster_ConfigOverrideEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField<
+              RayCluster_ConfigOverrideEntry_DoNotUse,
               ::std::string, ::std::string,
               ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
               ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
               0 >,
-            ::google::protobuf::Map< ::std::string, ::std::string > > parser(&ray_cluster_params_);
+            ::google::protobuf::Map< ::std::string, ::std::string > > parser(&config_override_);
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
               input, &parser));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
             parser.key().data(), static_cast(parser.key().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "flyteidl.plugins.RayCluster.RayClusterParamsEntry.key"));
+            "flyteidl.plugins.RayCluster.ConfigOverrideEntry.key"));
           DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
             parser.value().data(), static_cast(parser.value().length()),
             ::google::protobuf::internal::WireFormatLite::PARSE,
-            "flyteidl.plugins.RayCluster.RayClusterParamsEntry.value"));
+            "flyteidl.plugins.RayCluster.ConfigOverrideEntry.value"));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      // string namespace = 4;
+      case 4: {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_namespace_()));
+          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+            this->namespace_().data(), static_cast(this->namespace_().length()),
+            ::google::protobuf::internal::WireFormatLite::PARSE,
+            "flyteidl.plugins.RayCluster.namespace"));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      // string k8s_service_account = 5;
+      case 5: {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_k8s_service_account()));
+          DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+            this->k8s_service_account().data(), static_cast(this->k8s_service_account().length()),
+            ::google::protobuf::internal::WireFormatLite::PARSE,
+            "flyteidl.plugins.RayCluster.k8s_service_account"));
         } else {
           goto handle_unusual;
         }
@@ -971,8 +1056,8 @@ void RayCluster::SerializeWithCachedSizes(
       output);
   }
 
-  // map ray_cluster_params = 3;
-  if (!this->ray_cluster_params().empty()) {
+  // map config_override = 3;
+  if (!this->config_override().empty()) {
     typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer
         ConstPtr;
     typedef ConstPtr SortItem;
@@ -982,44 +1067,64 @@ void RayCluster::SerializeWithCachedSizes(
         ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
           p->first.data(), static_cast(p->first.length()),
           ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-          "flyteidl.plugins.RayCluster.RayClusterParamsEntry.key");
+          "flyteidl.plugins.RayCluster.ConfigOverrideEntry.key");
         ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
           p->second.data(), static_cast(p->second.length()),
           ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-          "flyteidl.plugins.RayCluster.RayClusterParamsEntry.value");
+          "flyteidl.plugins.RayCluster.ConfigOverrideEntry.value");
       }
     };
 
     if (output->IsSerializationDeterministic() &&
-        this->ray_cluster_params().size() > 1) {
+        this->config_override().size() > 1) {
       ::std::unique_ptr items(
-          new SortItem[this->ray_cluster_params().size()]);
+          new SortItem[this->config_override().size()]);
       typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type;
       size_type n = 0;
       for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator
-          it = this->ray_cluster_params().begin();
-          it != this->ray_cluster_params().end(); ++it, ++n) {
+          it = this->config_override().begin();
+          it != this->config_override().end(); ++it, ++n) {
         items[static_cast(n)] = SortItem(&*it);
       }
       ::std::sort(&items[0], &items[static_cast(n)], Less());
-      ::std::unique_ptr entry;
+      ::std::unique_ptr entry;
       for (size_type i = 0; i < n; i++) {
-        entry.reset(ray_cluster_params_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second));
+        entry.reset(config_override_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second));
         ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(3, *entry, output);
         Utf8Check::Check(&(*items[static_cast(i)]));
       }
     } else {
-      ::std::unique_ptr entry;
+      ::std::unique_ptr entry;
       for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator
-          it = this->ray_cluster_params().begin();
-          it != this->ray_cluster_params().end(); ++it) {
-        entry.reset(ray_cluster_params_.NewEntryWrapper(it->first, it->second));
+          it = this->config_override().begin();
+          it != this->config_override().end(); ++it) {
+        entry.reset(config_override_.NewEntryWrapper(it->first, it->second));
         ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(3, *entry, output);
         Utf8Check::Check(&(*it));
       }
     }
   }
 
+  // string namespace = 4;
+  if (this->namespace_().size() > 0) {
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+      this->namespace_().data(), static_cast(this->namespace_().length()),
+      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
+      "flyteidl.plugins.RayCluster.namespace");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      4, this->namespace_(), output);
+  }
+
+  // string k8s_service_account = 5;
+  if (this->k8s_service_account().size() > 0) {
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+      this->k8s_service_account().data(), static_cast(this->k8s_service_account().length()),
+      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
+      "flyteidl.plugins.RayCluster.k8s_service_account");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      5, this->k8s_service_account(), output);
+  }
+
   if (_internal_metadata_.have_unknown_fields()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
@@ -1048,8 +1153,8 @@ ::google::protobuf::uint8* RayCluster::InternalSerializeWithCachedSizesToArray(
         2, this->worker_group_spec(static_cast(i)), target);
   }
 
-  // map ray_cluster_params = 3;
-  if (!this->ray_cluster_params().empty()) {
+  // map config_override = 3;
+  if (!this->config_override().empty()) {
     typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer
         ConstPtr;
     typedef ConstPtr SortItem;
@@ -1059,44 +1164,66 @@ ::google::protobuf::uint8* RayCluster::InternalSerializeWithCachedSizesToArray(
         ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
           p->first.data(), static_cast(p->first.length()),
           ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-          "flyteidl.plugins.RayCluster.RayClusterParamsEntry.key");
+          "flyteidl.plugins.RayCluster.ConfigOverrideEntry.key");
         ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
           p->second.data(), static_cast(p->second.length()),
           ::google::protobuf::internal::WireFormatLite::SERIALIZE,
-          "flyteidl.plugins.RayCluster.RayClusterParamsEntry.value");
+          "flyteidl.plugins.RayCluster.ConfigOverrideEntry.value");
       }
     };
 
     if (false &&
-        this->ray_cluster_params().size() > 1) {
+        this->config_override().size() > 1) {
       ::std::unique_ptr items(
-          new SortItem[this->ray_cluster_params().size()]);
+          new SortItem[this->config_override().size()]);
       typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type;
       size_type n = 0;
       for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator
-          it = this->ray_cluster_params().begin();
-          it != this->ray_cluster_params().end(); ++it, ++n) {
+          it = this->config_override().begin();
+          it != this->config_override().end(); ++it, ++n) {
         items[static_cast(n)] = SortItem(&*it);
       }
       ::std::sort(&items[0], &items[static_cast(n)], Less());
-      ::std::unique_ptr entry;
+      ::std::unique_ptr entry;
       for (size_type i = 0; i < n; i++) {
-        entry.reset(ray_cluster_params_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second));
+        entry.reset(config_override_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second));
         target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(3, *entry, target);
         Utf8Check::Check(&(*items[static_cast(i)]));
       }
     } else {
-      ::std::unique_ptr entry;
+      ::std::unique_ptr entry;
       for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator
-          it = this->ray_cluster_params().begin();
-          it != this->ray_cluster_params().end(); ++it) {
-        entry.reset(ray_cluster_params_.NewEntryWrapper(it->first, it->second));
+          it = this->config_override().begin();
+          it != this->config_override().end(); ++it) {
+        entry.reset(config_override_.NewEntryWrapper(it->first, it->second));
         target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(3, *entry, target);
         Utf8Check::Check(&(*it));
       }
     }
   }
 
+  // string namespace = 4;
+  if (this->namespace_().size() > 0) {
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+      this->namespace_().data(), static_cast(this->namespace_().length()),
+      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
+      "flyteidl.plugins.RayCluster.namespace");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        4, this->namespace_(), target);
+  }
+
+  // string k8s_service_account = 5;
+  if (this->k8s_service_account().size() > 0) {
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+      this->k8s_service_account().data(), static_cast(this->k8s_service_account().length()),
+      ::google::protobuf::internal::WireFormatLite::SERIALIZE,
+      "flyteidl.plugins.RayCluster.k8s_service_account");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        5, this->k8s_service_account(), target);
+  }
+
   if (_internal_metadata_.have_unknown_fields()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
@@ -1129,20 +1256,34 @@ size_t RayCluster::ByteSizeLong() const {
     }
   }
 
-  // map ray_cluster_params = 3;
+  // map config_override = 3;
   total_size += 1 *
-      ::google::protobuf::internal::FromIntSize(this->ray_cluster_params_size());
+      ::google::protobuf::internal::FromIntSize(this->config_override_size());
   {
-    ::std::unique_ptr entry;
+    ::std::unique_ptr entry;
     for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator
-        it = this->ray_cluster_params().begin();
-        it != this->ray_cluster_params().end(); ++it) {
-      entry.reset(ray_cluster_params_.NewEntryWrapper(it->first, it->second));
+        it = this->config_override().begin();
+        it != this->config_override().end(); ++it) {
+      entry.reset(config_override_.NewEntryWrapper(it->first, it->second));
       total_size += ::google::protobuf::internal::WireFormatLite::
           MessageSizeNoVirtual(*entry);
     }
   }
 
+  // string namespace = 4;
+  if (this->namespace_().size() > 0) {
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::StringSize(
+        this->namespace_());
+  }
+
+  // string k8s_service_account = 5;
+  if (this->k8s_service_account().size() > 0) {
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::StringSize(
+        this->k8s_service_account());
+  }
+
   // .flyteidl.plugins.HeadGroupSpec head_group_spec = 1;
   if (this->has_head_group_spec()) {
     total_size += 1 +
@@ -1178,7 +1319,15 @@ void RayCluster::MergeFrom(const RayCluster& from) {
   (void) cached_has_bits;
 
   worker_group_spec_.MergeFrom(from.worker_group_spec_);
-  ray_cluster_params_.MergeFrom(from.ray_cluster_params_);
+  config_override_.MergeFrom(from.config_override_);
+  if (from.namespace_().size() > 0) {
+
+    namespace__.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.namespace__);
+  }
+  if (from.k8s_service_account().size() > 0) {
+
+    k8s_service_account_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.k8s_service_account_);
+  }
   if (from.has_head_group_spec()) {
     mutable_head_group_spec()->::flyteidl::plugins::HeadGroupSpec::MergeFrom(from.head_group_spec());
   }
@@ -1210,7 +1359,11 @@ void RayCluster::InternalSwap(RayCluster* other) {
   using std::swap;
   _internal_metadata_.Swap(&other->_internal_metadata_);
   CastToBase(&worker_group_spec_)->InternalSwap(CastToBase(&other->worker_group_spec_));
-  ray_cluster_params_.Swap(&other->ray_cluster_params_);
+  config_override_.Swap(&other->config_override_);
+  namespace__.Swap(&other->namespace__, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
+    GetArenaNoVirtual());
+  k8s_service_account_.Swap(&other->k8s_service_account_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
+    GetArenaNoVirtual());
   swap(head_group_spec_, other->head_group_spec_);
 }
 
@@ -2431,8 +2584,8 @@ namespace protobuf {
 template<> PROTOBUF_NOINLINE ::flyteidl::plugins::RayJob* Arena::CreateMaybeMessage< ::flyteidl::plugins::RayJob >(Arena* arena) {
   return Arena::CreateInternal< ::flyteidl::plugins::RayJob >(arena);
 }
-template<> PROTOBUF_NOINLINE ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse >(Arena* arena) {
-  return Arena::CreateInternal< ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse >(arena);
+template<> PROTOBUF_NOINLINE ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse >(Arena* arena) {
+  return Arena::CreateInternal< ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse >(arena);
 }
 template<> PROTOBUF_NOINLINE ::flyteidl::plugins::RayCluster* Arena::CreateMaybeMessage< ::flyteidl::plugins::RayCluster >(Arena* arena) {
   return Arena::CreateInternal< ::flyteidl::plugins::RayCluster >(arena);
diff --git a/gen/pb-cpp/flyteidl/plugins/ray.pb.h b/gen/pb-cpp/flyteidl/plugins/ray.pb.h
index bcc1b2bb8..40442f8cc 100644
--- a/gen/pb-cpp/flyteidl/plugins/ray.pb.h
+++ b/gen/pb-cpp/flyteidl/plugins/ray.pb.h
@@ -63,9 +63,9 @@ extern HeadGroupSpec_RayStartParamsEntry_DoNotUseDefaultTypeInternal _HeadGroupS
 class RayCluster;
 class RayClusterDefaultTypeInternal;
 extern RayClusterDefaultTypeInternal _RayCluster_default_instance_;
-class RayCluster_RayClusterParamsEntry_DoNotUse;
-class RayCluster_RayClusterParamsEntry_DoNotUseDefaultTypeInternal;
-extern RayCluster_RayClusterParamsEntry_DoNotUseDefaultTypeInternal _RayCluster_RayClusterParamsEntry_DoNotUse_default_instance_;
+class RayCluster_ConfigOverrideEntry_DoNotUse;
+class RayCluster_ConfigOverrideEntry_DoNotUseDefaultTypeInternal;
+extern RayCluster_ConfigOverrideEntry_DoNotUseDefaultTypeInternal _RayCluster_ConfigOverrideEntry_DoNotUse_default_instance_;
 class RayJob;
 class RayJobDefaultTypeInternal;
 extern RayJobDefaultTypeInternal _RayJob_default_instance_;
@@ -82,7 +82,7 @@ namespace protobuf {
 template<> ::flyteidl::plugins::HeadGroupSpec* Arena::CreateMaybeMessage<::flyteidl::plugins::HeadGroupSpec>(Arena*);
 template<> ::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse>(Arena*);
 template<> ::flyteidl::plugins::RayCluster* Arena::CreateMaybeMessage<::flyteidl::plugins::RayCluster>(Arena*);
-template<> ::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::plugins::RayCluster_RayClusterParamsEntry_DoNotUse>(Arena*);
+template<> ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse>(Arena*);
 template<> ::flyteidl::plugins::RayJob* Arena::CreateMaybeMessage<::flyteidl::plugins::RayJob>(Arena*);
 template<> ::flyteidl::plugins::WorkerGroupSpec* Arena::CreateMaybeMessage<::flyteidl::plugins::WorkerGroupSpec>(Arena*);
 template<> ::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse>(Arena*);
@@ -223,7 +223,7 @@ class RayJob final :
 };
 // -------------------------------------------------------------------
 
-class RayCluster_RayClusterParamsEntry_DoNotUse : public ::google::protobuf::internal::MapEntry SuperType;
-  RayCluster_RayClusterParamsEntry_DoNotUse();
-  RayCluster_RayClusterParamsEntry_DoNotUse(::google::protobuf::Arena* arena);
-  void MergeFrom(const RayCluster_RayClusterParamsEntry_DoNotUse& other);
-  static const RayCluster_RayClusterParamsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_RayCluster_RayClusterParamsEntry_DoNotUse_default_instance_); }
+  RayCluster_ConfigOverrideEntry_DoNotUse();
+  RayCluster_ConfigOverrideEntry_DoNotUse(::google::protobuf::Arena* arena);
+  void MergeFrom(const RayCluster_ConfigOverrideEntry_DoNotUse& other);
+  static const RayCluster_ConfigOverrideEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_RayCluster_ConfigOverrideEntry_DoNotUse_default_instance_); }
   void MergeFrom(const ::google::protobuf::Message& other) final;
   ::google::protobuf::Metadata GetMetadata() const;
 };
@@ -355,14 +355,42 @@ class RayCluster final :
   const ::google::protobuf::RepeatedPtrField< ::flyteidl::plugins::WorkerGroupSpec >&
       worker_group_spec() const;
 
-  // map ray_cluster_params = 3;
-  int ray_cluster_params_size() const;
-  void clear_ray_cluster_params();
-  static const int kRayClusterParamsFieldNumber = 3;
+  // map config_override = 3;
+  int config_override_size() const;
+  void clear_config_override();
+  static const int kConfigOverrideFieldNumber = 3;
   const ::google::protobuf::Map< ::std::string, ::std::string >&
-      ray_cluster_params() const;
+      config_override() const;
   ::google::protobuf::Map< ::std::string, ::std::string >*
-      mutable_ray_cluster_params();
+      mutable_config_override();
+
+  // string namespace = 4;
+  void clear_namespace_();
+  static const int kNamespaceFieldNumber = 4;
+  const ::std::string& namespace_() const;
+  void set_namespace_(const ::std::string& value);
+  #if LANG_CXX11
+  void set_namespace_(::std::string&& value);
+  #endif
+  void set_namespace_(const char* value);
+  void set_namespace_(const char* value, size_t size);
+  ::std::string* mutable_namespace_();
+  ::std::string* release_namespace_();
+  void set_allocated_namespace_(::std::string* namespace_);
+
+  // string k8s_service_account = 5;
+  void clear_k8s_service_account();
+  static const int kK8SServiceAccountFieldNumber = 5;
+  const ::std::string& k8s_service_account() const;
+  void set_k8s_service_account(const ::std::string& value);
+  #if LANG_CXX11
+  void set_k8s_service_account(::std::string&& value);
+  #endif
+  void set_k8s_service_account(const char* value);
+  void set_k8s_service_account(const char* value, size_t size);
+  ::std::string* mutable_k8s_service_account();
+  ::std::string* release_k8s_service_account();
+  void set_allocated_k8s_service_account(::std::string* k8s_service_account);
 
   // .flyteidl.plugins.HeadGroupSpec head_group_spec = 1;
   bool has_head_group_spec() const;
@@ -380,11 +408,13 @@ class RayCluster final :
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
   ::google::protobuf::RepeatedPtrField< ::flyteidl::plugins::WorkerGroupSpec > worker_group_spec_;
   ::google::protobuf::internal::MapField<
-      RayCluster_RayClusterParamsEntry_DoNotUse,
+      RayCluster_ConfigOverrideEntry_DoNotUse,
       ::std::string, ::std::string,
       ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
       ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
-      0 > ray_cluster_params_;
+      0 > config_override_;
+  ::google::protobuf::internal::ArenaStringPtr namespace__;
+  ::google::protobuf::internal::ArenaStringPtr k8s_service_account_;
   ::flyteidl::plugins::HeadGroupSpec* head_group_spec_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
   friend struct ::TableStruct_flyteidl_2fplugins_2fray_2eproto;
@@ -937,22 +967,128 @@ RayCluster::worker_group_spec() const {
   return worker_group_spec_;
 }
 
-// map ray_cluster_params = 3;
-inline int RayCluster::ray_cluster_params_size() const {
-  return ray_cluster_params_.size();
+// map config_override = 3;
+inline int RayCluster::config_override_size() const {
+  return config_override_.size();
 }
-inline void RayCluster::clear_ray_cluster_params() {
-  ray_cluster_params_.Clear();
+inline void RayCluster::clear_config_override() {
+  config_override_.Clear();
 }
 inline const ::google::protobuf::Map< ::std::string, ::std::string >&
-RayCluster::ray_cluster_params() const {
-  // @@protoc_insertion_point(field_map:flyteidl.plugins.RayCluster.ray_cluster_params)
-  return ray_cluster_params_.GetMap();
+RayCluster::config_override() const {
+  // @@protoc_insertion_point(field_map:flyteidl.plugins.RayCluster.config_override)
+  return config_override_.GetMap();
 }
 inline ::google::protobuf::Map< ::std::string, ::std::string >*
-RayCluster::mutable_ray_cluster_params() {
-  // @@protoc_insertion_point(field_mutable_map:flyteidl.plugins.RayCluster.ray_cluster_params)
-  return ray_cluster_params_.MutableMap();
+RayCluster::mutable_config_override() {
+  // @@protoc_insertion_point(field_mutable_map:flyteidl.plugins.RayCluster.config_override)
+  return config_override_.MutableMap();
+}
+
+// string namespace = 4;
+inline void RayCluster::clear_namespace_() {
+  namespace__.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+}
+inline const ::std::string& RayCluster::namespace_() const {
+  // @@protoc_insertion_point(field_get:flyteidl.plugins.RayCluster.namespace)
+  return namespace__.GetNoArena();
+}
+inline void RayCluster::set_namespace_(const ::std::string& value) {
+  
+  namespace__.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
+  // @@protoc_insertion_point(field_set:flyteidl.plugins.RayCluster.namespace)
+}
+#if LANG_CXX11
+inline void RayCluster::set_namespace_(::std::string&& value) {
+  
+  namespace__.SetNoArena(
+    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
+  // @@protoc_insertion_point(field_set_rvalue:flyteidl.plugins.RayCluster.namespace)
+}
+#endif
+inline void RayCluster::set_namespace_(const char* value) {
+  GOOGLE_DCHECK(value != nullptr);
+  
+  namespace__.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
+  // @@protoc_insertion_point(field_set_char:flyteidl.plugins.RayCluster.namespace)
+}
+inline void RayCluster::set_namespace_(const char* value, size_t size) {
+  
+  namespace__.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
+      ::std::string(reinterpret_cast(value), size));
+  // @@protoc_insertion_point(field_set_pointer:flyteidl.plugins.RayCluster.namespace)
+}
+inline ::std::string* RayCluster::mutable_namespace_() {
+  
+  // @@protoc_insertion_point(field_mutable:flyteidl.plugins.RayCluster.namespace)
+  return namespace__.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+}
+inline ::std::string* RayCluster::release_namespace_() {
+  // @@protoc_insertion_point(field_release:flyteidl.plugins.RayCluster.namespace)
+  
+  return namespace__.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+}
+inline void RayCluster::set_allocated_namespace_(::std::string* namespace_) {
+  if (namespace_ != nullptr) {
+    
+  } else {
+    
+  }
+  namespace__.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), namespace_);
+  // @@protoc_insertion_point(field_set_allocated:flyteidl.plugins.RayCluster.namespace)
+}
+
+// string k8s_service_account = 5;
+inline void RayCluster::clear_k8s_service_account() {
+  k8s_service_account_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+}
+inline const ::std::string& RayCluster::k8s_service_account() const {
+  // @@protoc_insertion_point(field_get:flyteidl.plugins.RayCluster.k8s_service_account)
+  return k8s_service_account_.GetNoArena();
+}
+inline void RayCluster::set_k8s_service_account(const ::std::string& value) {
+  
+  k8s_service_account_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
+  // @@protoc_insertion_point(field_set:flyteidl.plugins.RayCluster.k8s_service_account)
+}
+#if LANG_CXX11
+inline void RayCluster::set_k8s_service_account(::std::string&& value) {
+  
+  k8s_service_account_.SetNoArena(
+    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
+  // @@protoc_insertion_point(field_set_rvalue:flyteidl.plugins.RayCluster.k8s_service_account)
+}
+#endif
+inline void RayCluster::set_k8s_service_account(const char* value) {
+  GOOGLE_DCHECK(value != nullptr);
+  
+  k8s_service_account_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
+  // @@protoc_insertion_point(field_set_char:flyteidl.plugins.RayCluster.k8s_service_account)
+}
+inline void RayCluster::set_k8s_service_account(const char* value, size_t size) {
+  
+  k8s_service_account_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
+      ::std::string(reinterpret_cast(value), size));
+  // @@protoc_insertion_point(field_set_pointer:flyteidl.plugins.RayCluster.k8s_service_account)
+}
+inline ::std::string* RayCluster::mutable_k8s_service_account() {
+  
+  // @@protoc_insertion_point(field_mutable:flyteidl.plugins.RayCluster.k8s_service_account)
+  return k8s_service_account_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+}
+inline ::std::string* RayCluster::release_k8s_service_account() {
+  // @@protoc_insertion_point(field_release:flyteidl.plugins.RayCluster.k8s_service_account)
+  
+  return k8s_service_account_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+}
+inline void RayCluster::set_allocated_k8s_service_account(::std::string* k8s_service_account) {
+  if (k8s_service_account != nullptr) {
+    
+  } else {
+    
+  }
+  k8s_service_account_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), k8s_service_account);
+  // @@protoc_insertion_point(field_set_allocated:flyteidl.plugins.RayCluster.k8s_service_account)
 }
 
 // -------------------------------------------------------------------
diff --git a/gen/pb-go/flyteidl/plugins/ray.pb.go b/gen/pb-go/flyteidl/plugins/ray.pb.go
index 3f5852962..6dd6006e6 100644
--- a/gen/pb-go/flyteidl/plugins/ray.pb.go
+++ b/gen/pb-go/flyteidl/plugins/ray.pb.go
@@ -79,10 +79,14 @@ type RayCluster struct {
 	// WorkerGroupSpecs are the specs for the worker pods
 	WorkerGroupSpec []*WorkerGroupSpec `protobuf:"bytes,2,rep,name=worker_group_spec,json=workerGroupSpec,proto3" json:"worker_group_spec,omitempty"`
 	// Additional parameter overrides for ray cluster config
-	RayClusterParams     map[string]string `protobuf:"bytes,3,rep,name=ray_cluster_params,json=rayClusterParams,proto3" json:"ray_cluster_params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
-	XXX_unrecognized     []byte            `json:"-"`
-	XXX_sizecache        int32             `json:"-"`
+	ConfigOverride map[string]string `protobuf:"bytes,3,rep,name=config_override,json=configOverride,proto3" json:"config_override,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	// Namespace used to create the ray cluster
+	Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"`
+	// Kubernetes service account used by the ray cluster
+	K8SServiceAccount    string   `protobuf:"bytes,5,opt,name=k8s_service_account,json=k8sServiceAccount,proto3" json:"k8s_service_account,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }
 
 func (m *RayCluster) Reset()         { *m = RayCluster{} }
@@ -124,13 +128,27 @@ func (m *RayCluster) GetWorkerGroupSpec() []*WorkerGroupSpec {
 	return nil
 }
 
-func (m *RayCluster) GetRayClusterParams() map[string]string {
+func (m *RayCluster) GetConfigOverride() map[string]string {
 	if m != nil {
-		return m.RayClusterParams
+		return m.ConfigOverride
 	}
 	return nil
 }
 
+func (m *RayCluster) GetNamespace() string {
+	if m != nil {
+		return m.Namespace
+	}
+	return ""
+}
+
+func (m *RayCluster) GetK8SServiceAccount() string {
+	if m != nil {
+		return m.K8SServiceAccount
+	}
+	return ""
+}
+
 // HeadGroupSpec are the spec for the head pod
 type HeadGroupSpec struct {
 	// Optional. RayStartParams are the params of the start command: address, object-store-memory.
@@ -272,7 +290,7 @@ func (m *WorkerGroupSpec) GetResources() *core.Resources {
 func init() {
 	proto.RegisterType((*RayJob)(nil), "flyteidl.plugins.RayJob")
 	proto.RegisterType((*RayCluster)(nil), "flyteidl.plugins.RayCluster")
-	proto.RegisterMapType((map[string]string)(nil), "flyteidl.plugins.RayCluster.RayClusterParamsEntry")
+	proto.RegisterMapType((map[string]string)(nil), "flyteidl.plugins.RayCluster.ConfigOverrideEntry")
 	proto.RegisterType((*HeadGroupSpec)(nil), "flyteidl.plugins.HeadGroupSpec")
 	proto.RegisterMapType((map[string]string)(nil), "flyteidl.plugins.HeadGroupSpec.RayStartParamsEntry")
 	proto.RegisterType((*WorkerGroupSpec)(nil), "flyteidl.plugins.WorkerGroupSpec")
@@ -282,35 +300,39 @@ func init() {
 func init() { proto.RegisterFile("flyteidl/plugins/ray.proto", fileDescriptor_b980f6d58c7489d7) }
 
 var fileDescriptor_b980f6d58c7489d7 = []byte{
-	// 479 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0x5f, 0x8b, 0xd3, 0x40,
-	0x10, 0x27, 0xa9, 0x2d, 0x76, 0xe2, 0xd9, 0xba, 0x2a, 0xc4, 0xa0, 0x5c, 0xaf, 0x4f, 0x7d, 0x31,
-	0x81, 0x1e, 0xfe, 0x05, 0x1f, 0xf4, 0x38, 0x4e, 0x04, 0x45, 0xf6, 0x1e, 0x04, 0x41, 0xe2, 0x36,
-	0x5d, 0xd3, 0xd0, 0x24, 0x1b, 0x66, 0x37, 0xbd, 0xcb, 0x67, 0xf4, 0x93, 0xf8, 0xe2, 0x67, 0x90,
-	0x6c, 0xd3, 0x24, 0xed, 0x15, 0x8b, 0x6f, 0xbe, 0xcd, 0x9f, 0xdf, 0xfc, 0x66, 0xf6, 0x37, 0xcb,
-	0x80, 0xf3, 0x23, 0x2e, 0x14, 0x8f, 0xe6, 0xb1, 0x97, 0xc5, 0x79, 0x18, 0xa5, 0xd2, 0x43, 0x56,
-	0xb8, 0x19, 0x0a, 0x25, 0xc8, 0x70, 0x93, 0x73, 0xab, 0x9c, 0xf3, 0xa8, 0x46, 0x07, 0x02, 0xb9,
-	0xa7, 0x98, 0x5c, 0xca, 0x35, 0x78, 0xbc, 0x80, 0x1e, 0x65, 0xc5, 0x07, 0x31, 0x23, 0x6f, 0xc0,
-	0x42, 0x56, 0xf8, 0x41, 0x9c, 0x4b, 0xc5, 0xd1, 0x36, 0x46, 0xc6, 0xc4, 0x9a, 0x3e, 0x76, 0x77,
-	0xc9, 0x5c, 0xca, 0x8a, 0xb3, 0x35, 0x86, 0x02, 0xd6, 0x36, 0x39, 0x06, 0x0b, 0xf3, 0x54, 0x45,
-	0x09, 0xf7, 0x79, 0xba, 0xb2, 0xcd, 0x91, 0x31, 0xe9, 0x53, 0xa8, 0x42, 0xe7, 0xe9, 0x6a, 0xfc,
-	0xd3, 0x04, 0x68, 0x6a, 0xc9, 0x05, 0x0c, 0x16, 0x9c, 0xcd, 0xfd, 0x10, 0x45, 0x9e, 0xf9, 0x32,
-	0xe3, 0x41, 0xd5, 0xf2, 0xf8, 0x66, 0xcb, 0xf7, 0x9c, 0xcd, 0x2f, 0x4a, 0xdc, 0x65, 0xc6, 0x03,
-	0x7a, 0xb4, 0x68, 0xbb, 0xe4, 0x23, 0xdc, 0xbb, 0x12, 0xb8, 0xe4, 0xd8, 0xa6, 0x32, 0x47, 0x9d,
-	0x89, 0x35, 0x3d, 0xb9, 0x49, 0xf5, 0x45, 0x43, 0x1b, 0xb2, 0xc1, 0xd5, 0x76, 0x80, 0x7c, 0x07,
-	0xd2, 0x92, 0xc1, 0xcf, 0x18, 0xb2, 0x44, 0xda, 0x1d, 0xcd, 0x37, 0xfd, 0x9b, 0x1a, 0x2d, 0xf3,
-	0xb3, 0x2e, 0x3a, 0x4f, 0x15, 0x16, 0x74, 0x88, 0x3b, 0x61, 0xe7, 0x0c, 0x1e, 0xee, 0x85, 0x92,
-	0x21, 0x74, 0x96, 0xbc, 0xd0, 0x32, 0xf4, 0x69, 0x69, 0x92, 0x07, 0xd0, 0x5d, 0xb1, 0x38, 0xe7,
-	0x95, 0x9c, 0x6b, 0xe7, 0xb5, 0xf9, 0xd2, 0x18, 0xff, 0x32, 0xe0, 0x68, 0x4b, 0x16, 0xf2, 0x0d,
-	0xca, 0x56, 0xbe, 0x54, 0x0c, 0xd5, 0x66, 0x6c, 0x43, 0x8f, 0x7d, 0x7a, 0x40, 0xd1, 0x72, 0xf2,
-	0xcb, 0xb2, 0xac, 0x3d, 0xf7, 0x5d, 0xdc, 0x0a, 0x92, 0xe7, 0xd0, 0x47, 0x2e, 0x45, 0x8e, 0x01,
-	0x97, 0x76, 0x4f, 0x6f, 0xca, 0x6e, 0x78, 0xcb, 0x7f, 0xe5, 0xd2, 0x4d, 0x9e, 0x36, 0x50, 0xe7,
-	0x2d, 0xdc, 0xdf, 0x43, 0xff, 0x4f, 0x6f, 0xfd, 0x6d, 0xc2, 0x60, 0x67, 0x6f, 0xe4, 0x09, 0xc0,
-	0x7a, 0xdd, 0x29, 0x4b, 0x78, 0x45, 0xd3, 0xd7, 0x91, 0x4f, 0x2c, 0xe1, 0xc4, 0x81, 0xdb, 0xc8,
-	0xb3, 0x38, 0x0a, 0x98, 0xd4, 0x7c, 0x5d, 0x5a, 0xfb, 0xe4, 0x04, 0xee, 0x24, 0x51, 0xea, 0xd7,
-	0xf9, 0x8e, 0xce, 0x5b, 0x49, 0x94, 0xd2, 0x36, 0x84, 0x5d, 0x37, 0x90, 0x5b, 0x15, 0x84, 0x5d,
-	0xd7, 0x10, 0x7f, 0x8f, 0xdc, 0x5d, 0x2d, 0xf7, 0xb3, 0x83, 0xbf, 0xee, 0x3f, 0x17, 0xfc, 0xdd,
-	0xab, 0xaf, 0x2f, 0xc2, 0x48, 0x2d, 0xf2, 0x99, 0x1b, 0x88, 0xc4, 0xd3, 0x3d, 0x05, 0x86, 0x5e,
-	0x7d, 0x45, 0x42, 0x9e, 0x7a, 0xd9, 0xec, 0x69, 0x28, 0xbc, 0xdd, 0x33, 0x34, 0xeb, 0xe9, 0xb3,
-	0x72, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0xbe, 0xc2, 0x0e, 0x49, 0xa1, 0x04, 0x00, 0x00,
+	// 534 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0x4d, 0x6f, 0xd3, 0x40,
+	0x10, 0x95, 0x93, 0xa6, 0x22, 0x13, 0x4a, 0xd2, 0x2d, 0x07, 0x13, 0x15, 0x35, 0xcd, 0x29, 0x17,
+	0x6c, 0xd4, 0x0a, 0x08, 0x48, 0x1c, 0x4a, 0x55, 0x15, 0x21, 0xf1, 0xa1, 0xcd, 0x01, 0x81, 0x84,
+	0xac, 0xcd, 0x66, 0xea, 0x58, 0xb1, 0x77, 0xad, 0x5d, 0x3b, 0xad, 0xff, 0x05, 0x7f, 0x93, 0x0b,
+	0xbf, 0x01, 0x79, 0xed, 0xda, 0x49, 0x1a, 0x51, 0x71, 0xe3, 0xb6, 0xfb, 0xde, 0x9b, 0x37, 0xda,
+	0x37, 0xa3, 0x85, 0xfe, 0x55, 0x98, 0x25, 0x18, 0xcc, 0x42, 0x37, 0x0e, 0x53, 0x3f, 0x10, 0xda,
+	0x55, 0x2c, 0x73, 0x62, 0x25, 0x13, 0x49, 0x7a, 0xb7, 0x9c, 0x53, 0x72, 0xfd, 0x27, 0x95, 0x9a,
+	0x4b, 0x85, 0x6e, 0xc2, 0xf4, 0x42, 0x17, 0xe2, 0xe1, 0x1c, 0x76, 0x29, 0xcb, 0x3e, 0xc8, 0x29,
+	0x79, 0x0b, 0x1d, 0xc5, 0x32, 0x8f, 0x87, 0xa9, 0x4e, 0x50, 0xd9, 0xd6, 0xc0, 0x1a, 0x75, 0x4e,
+	0x0e, 0x9d, 0x4d, 0x33, 0x87, 0xb2, 0xec, 0xbc, 0xd0, 0x50, 0x50, 0xd5, 0x99, 0x1c, 0x41, 0x47,
+	0xa5, 0x22, 0x09, 0x22, 0xf4, 0x50, 0x2c, 0xed, 0xc6, 0xc0, 0x1a, 0xb5, 0x29, 0x94, 0xd0, 0x85,
+	0x58, 0x0e, 0x7f, 0x36, 0x01, 0xea, 0x5a, 0x72, 0x09, 0xdd, 0x39, 0xb2, 0x99, 0xe7, 0x2b, 0x99,
+	0xc6, 0x9e, 0x8e, 0x91, 0x97, 0x2d, 0x8f, 0xee, 0xb6, 0x7c, 0x8f, 0x6c, 0x76, 0x99, 0xeb, 0x26,
+	0x31, 0x72, 0xba, 0x37, 0x5f, 0xbd, 0x92, 0x8f, 0xb0, 0x7f, 0x2d, 0xd5, 0x02, 0xd5, 0xaa, 0x55,
+	0x63, 0xd0, 0x1c, 0x75, 0x4e, 0x8e, 0xef, 0x5a, 0x7d, 0x35, 0xd2, 0xda, 0xac, 0x7b, 0xbd, 0x0e,
+	0x90, 0x6f, 0xd0, 0xe5, 0x52, 0x5c, 0x05, 0xbe, 0x27, 0x97, 0xa8, 0x54, 0x30, 0x43, 0xbb, 0x69,
+	0xcc, 0x9e, 0xff, 0x2d, 0x0a, 0xe7, 0xdc, 0xd4, 0x7c, 0x2e, 0x4b, 0x2e, 0x44, 0xa2, 0x32, 0xfa,
+	0x88, 0xaf, 0x81, 0xe4, 0x10, 0xda, 0x82, 0x45, 0xa8, 0x63, 0xc6, 0xd1, 0xde, 0x31, 0x01, 0xd5,
+	0x00, 0x71, 0xe0, 0x60, 0x31, 0xd6, 0x9e, 0x46, 0xb5, 0x0c, 0x38, 0x7a, 0x8c, 0x73, 0x99, 0x8a,
+	0xc4, 0x6e, 0x19, 0xdd, 0xfe, 0x62, 0xac, 0x27, 0x05, 0x73, 0x56, 0x10, 0xfd, 0x33, 0x38, 0xd8,
+	0xd2, 0x94, 0xf4, 0xa0, 0xb9, 0xc0, 0xcc, 0x64, 0xd9, 0xa6, 0xf9, 0x91, 0x3c, 0x86, 0xd6, 0x92,
+	0x85, 0x29, 0x96, 0x33, 0x29, 0x2e, 0x6f, 0x1a, 0x63, 0x6b, 0xf8, 0xcb, 0x82, 0xbd, 0xb5, 0x6c,
+	0xc9, 0x0f, 0xe8, 0xe5, 0x4b, 0xa0, 0x13, 0xa6, 0x12, 0x2f, 0x66, 0x8a, 0x45, 0xda, 0xb6, 0xcc,
+	0xf3, 0x4f, 0xef, 0x19, 0x4b, 0x1e, 0xc6, 0x24, 0x2f, 0xfb, 0x62, 0xaa, 0xca, 0x04, 0xd4, 0x1a,
+	0x48, 0x5e, 0x42, 0x5b, 0xa1, 0x96, 0xa9, 0xe2, 0xa8, 0xed, 0x5d, 0x33, 0x6e, 0xbb, 0xf6, 0xcd,
+	0x97, 0xd3, 0xa1, 0xb7, 0x3c, 0xad, 0xa5, 0xf9, 0x5b, 0xb7, 0xd8, 0xff, 0xd3, 0x5b, 0x7f, 0x37,
+	0xa0, 0xbb, 0x31, 0x7c, 0xf2, 0x14, 0xa0, 0xd8, 0x99, 0x7c, 0x0a, 0xa5, 0x4d, 0xdb, 0x20, 0x9f,
+	0x58, 0x84, 0xa4, 0x0f, 0x0f, 0x14, 0xc6, 0x61, 0xc0, 0x99, 0x36, 0x7e, 0x2d, 0x5a, 0xdd, 0xc9,
+	0x31, 0x3c, 0x8c, 0x02, 0xe1, 0x55, 0x7c, 0xd3, 0xf0, 0x9d, 0x28, 0x10, 0x74, 0x55, 0xc2, 0x6e,
+	0x6a, 0xc9, 0x4e, 0x29, 0x61, 0x37, 0x95, 0xc4, 0xdb, 0x12, 0x77, 0xcb, 0xc4, 0xfd, 0xe2, 0xde,
+	0xd5, 0xfd, 0xcf, 0x03, 0x7f, 0xf7, 0xfa, 0xfb, 0x2b, 0x3f, 0x48, 0xe6, 0xe9, 0xd4, 0xe1, 0x32,
+	0x72, 0x4d, 0x4f, 0xa9, 0x7c, 0xb7, 0xfa, 0x8a, 0x7c, 0x14, 0x6e, 0x3c, 0x7d, 0xe6, 0x4b, 0x77,
+	0xf3, 0x2f, 0x9b, 0xee, 0x9a, 0xbf, 0xe9, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x69, 0x08,
+	0x72, 0x7d, 0xe6, 0x04, 0x00, 0x00,
 }
diff --git a/gen/pb-go/flyteidl/plugins/ray.pb.validate.go b/gen/pb-go/flyteidl/plugins/ray.pb.validate.go
index b4d4d74b0..4cad6cb69 100644
--- a/gen/pb-go/flyteidl/plugins/ray.pb.validate.go
+++ b/gen/pb-go/flyteidl/plugins/ray.pb.validate.go
@@ -144,7 +144,11 @@ func (m *RayCluster) Validate() error {
 
 	}
 
-	// no validation rules for RayClusterParams
+	// no validation rules for ConfigOverride
+
+	// no validation rules for Namespace
+
+	// no validation rules for K8SServiceAccount
 
 	return nil
 }
diff --git a/gen/pb-java/flyteidl/plugins/Ray.java b/gen/pb-java/flyteidl/plugins/Ray.java
index a6b1417e0..db0c4c375 100644
--- a/gen/pb-java/flyteidl/plugins/Ray.java
+++ b/gen/pb-java/flyteidl/plugins/Ray.java
@@ -948,42 +948,42 @@ flyteidl.plugins.Ray.WorkerGroupSpecOrBuilder getWorkerGroupSpecOrBuilder(
      * Additional parameter overrides for ray cluster config
      * 

      *
-     * map<string, string> ray_cluster_params = 3;
+     * map<string, string> config_override = 3;
      */
-    int getRayClusterParamsCount();
+    int getConfigOverrideCount();
     /**
      * 
      * Additional parameter overrides for ray cluster config
      * 

      *
-     * map<string, string> ray_cluster_params = 3;
+     * map<string, string> config_override = 3;
      */
-    boolean containsRayClusterParams(
+    boolean containsConfigOverride(
         java.lang.String key);
     /**
-     * Use {@link #getRayClusterParamsMap()} instead.
+     * Use {@link #getConfigOverrideMap()} instead.
      */
     @java.lang.Deprecated
     java.util.Map
-    getRayClusterParams();
+    getConfigOverride();
     /**
      * 
      * Additional parameter overrides for ray cluster config
      * 

      *
-     * map<string, string> ray_cluster_params = 3;
+     * map<string, string> config_override = 3;
      */
     java.util.Map
-    getRayClusterParamsMap();
+    getConfigOverrideMap();
     /**
      * 
      * Additional parameter overrides for ray cluster config
      * 

      *
-     * map<string, string> ray_cluster_params = 3;
+     * map<string, string> config_override = 3;
      */
 
-    java.lang.String getRayClusterParamsOrDefault(
+    java.lang.String getConfigOverrideOrDefault(
         java.lang.String key,
         java.lang.String defaultValue);
     /**
@@ -991,11 +991,47 @@ java.lang.String getRayClusterParamsOrDefault(
      * Additional parameter overrides for ray cluster config
      * 

      *
-     * map<string, string> ray_cluster_params = 3;
+     * map<string, string> config_override = 3;
      */
 
-    java.lang.String getRayClusterParamsOrThrow(
+    java.lang.String getConfigOverrideOrThrow(
         java.lang.String key);
+
+    /**
+     * 
+     * Namespace used to create the ray cluster
+     * 

+     *
+     * string namespace = 4;
+     */
+    java.lang.String getNamespace();
+    /**
+     * 
+     * Namespace used to create the ray cluster
+     * 

+     *
+     * string namespace = 4;
+     */
+    com.google.protobuf.ByteString
+        getNamespaceBytes();
+
+    /**
+     * 
+     * Kubernetes service account used by the ray cluster
+     * 

+     *
+     * string k8s_service_account = 5;
+     */
+    java.lang.String getK8SServiceAccount();
+    /**
+     * 
+     * Kubernetes service account used by the ray cluster
+     * 

+     *
+     * string k8s_service_account = 5;
+     */
+    com.google.protobuf.ByteString
+        getK8SServiceAccountBytes();
   }
   /**
    * 
@@ -1015,6 +1051,8 @@ private RayCluster(com.google.protobuf.GeneratedMessageV3.Builder builder) {
     }
     private RayCluster() {
       workerGroupSpec_ = java.util.Collections.emptyList();
+      namespace_ = "";
+      k8SServiceAccount_ = "";
     }
 
     @java.lang.Override
@@ -1065,15 +1103,27 @@ private RayCluster(
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                rayClusterParams_ = com.google.protobuf.MapField.newMapField(
-                    RayClusterParamsDefaultEntryHolder.defaultEntry);
+                configOverride_ = com.google.protobuf.MapField.newMapField(
+                    ConfigOverrideDefaultEntryHolder.defaultEntry);
                 mutable_bitField0_ |= 0x00000004;
               }
               com.google.protobuf.MapEntry
-              rayClusterParams__ = input.readMessage(
-                  RayClusterParamsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              rayClusterParams_.getMutableMap().put(
-                  rayClusterParams__.getKey(), rayClusterParams__.getValue());
+              configOverride__ = input.readMessage(
+                  ConfigOverrideDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              configOverride_.getMutableMap().put(
+                  configOverride__.getKey(), configOverride__.getValue());
+              break;
+            }
+            case 34: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              namespace_ = s;
+              break;
+            }
+            case 42: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              k8SServiceAccount_ = s;
               break;
             }
             default: {
@@ -1109,7 +1159,7 @@ protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
         case 3:
-          return internalGetRayClusterParams();
+          return internalGetConfigOverride();
         default:
           throw new RuntimeException(
               "Invalid map field number: " + number);
@@ -1212,77 +1262,77 @@ public flyteidl.plugins.Ray.WorkerGroupSpecOrBuilder getWorkerGroupSpecOrBuilder
       return workerGroupSpec_.get(index);
     }
 
-    public static final int RAY_CLUSTER_PARAMS_FIELD_NUMBER = 3;
-    private static final class RayClusterParamsDefaultEntryHolder {
+    public static final int CONFIG_OVERRIDE_FIELD_NUMBER = 3;
+    private static final class ConfigOverrideDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.String, java.lang.String> defaultEntry =
               com.google.protobuf.MapEntry
               .newDefaultInstance(
-                  flyteidl.plugins.Ray.internal_static_flyteidl_plugins_RayCluster_RayClusterParamsEntry_descriptor, 
+                  flyteidl.plugins.Ray.internal_static_flyteidl_plugins_RayCluster_ConfigOverrideEntry_descriptor, 
                   com.google.protobuf.WireFormat.FieldType.STRING,
                   "",
                   com.google.protobuf.WireFormat.FieldType.STRING,
                   "");
     }
     private com.google.protobuf.MapField<
-        java.lang.String, java.lang.String> rayClusterParams_;
+        java.lang.String, java.lang.String> configOverride_;
     private com.google.protobuf.MapField
-    internalGetRayClusterParams() {
-      if (rayClusterParams_ == null) {
+    internalGetConfigOverride() {
+      if (configOverride_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
-            RayClusterParamsDefaultEntryHolder.defaultEntry);
+            ConfigOverrideDefaultEntryHolder.defaultEntry);
       }
-      return rayClusterParams_;
+      return configOverride_;
     }
 
-    public int getRayClusterParamsCount() {
-      return internalGetRayClusterParams().getMap().size();
+    public int getConfigOverrideCount() {
+      return internalGetConfigOverride().getMap().size();
     }
     /**
      * 
      * Additional parameter overrides for ray cluster config
      * 

      *
-     * map<string, string> ray_cluster_params = 3;
+     * map<string, string> config_override = 3;
      */
 
-    public boolean containsRayClusterParams(
+    public boolean containsConfigOverride(
         java.lang.String key) {
       if (key == null) { throw new java.lang.NullPointerException(); }
-      return internalGetRayClusterParams().getMap().containsKey(key);
+      return internalGetConfigOverride().getMap().containsKey(key);
     }
     /**
-     * Use {@link #getRayClusterParamsMap()} instead.
+     * Use {@link #getConfigOverrideMap()} instead.
      */
     @java.lang.Deprecated
-    public java.util.Map getRayClusterParams() {
-      return getRayClusterParamsMap();
+    public java.util.Map getConfigOverride() {
+      return getConfigOverrideMap();
     }
     /**
      * 
      * Additional parameter overrides for ray cluster config
      * 

      *
-     * map<string, string> ray_cluster_params = 3;
+     * map<string, string> config_override = 3;
      */
 
-    public java.util.Map getRayClusterParamsMap() {
-      return internalGetRayClusterParams().getMap();
+    public java.util.Map getConfigOverrideMap() {
+      return internalGetConfigOverride().getMap();
     }
     /**
      * 
      * Additional parameter overrides for ray cluster config
      * 

      *
-     * map<string, string> ray_cluster_params = 3;
+     * map<string, string> config_override = 3;
      */
 
-    public java.lang.String getRayClusterParamsOrDefault(
+    public java.lang.String getConfigOverrideOrDefault(
         java.lang.String key,
         java.lang.String defaultValue) {
       if (key == null) { throw new java.lang.NullPointerException(); }
       java.util.Map map =
-          internalGetRayClusterParams().getMap();
+          internalGetConfigOverride().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
@@ -1290,20 +1340,104 @@ public java.lang.String getRayClusterParamsOrDefault(
      * Additional parameter overrides for ray cluster config
      * 

      *
-     * map<string, string> ray_cluster_params = 3;
+     * map<string, string> config_override = 3;
      */
 
-    public java.lang.String getRayClusterParamsOrThrow(
+    public java.lang.String getConfigOverrideOrThrow(
         java.lang.String key) {
       if (key == null) { throw new java.lang.NullPointerException(); }
       java.util.Map map =
-          internalGetRayClusterParams().getMap();
+          internalGetConfigOverride().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
       return map.get(key);
     }
 
+    public static final int NAMESPACE_FIELD_NUMBER = 4;
+    private volatile java.lang.Object namespace_;
+    /**
+     * 
+     * Namespace used to create the ray cluster
+     * 

+     *
+     * string namespace = 4;
+     */
+    public java.lang.String getNamespace() {
+      java.lang.Object ref = namespace_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        namespace_ = s;
+        return s;
+      }
+    }
+    /**
+     * 
+     * Namespace used to create the ray cluster
+     * 

+     *
+     * string namespace = 4;
+     */
+    public com.google.protobuf.ByteString
+        getNamespaceBytes() {
+      java.lang.Object ref = namespace_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        namespace_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int K8S_SERVICE_ACCOUNT_FIELD_NUMBER = 5;
+    private volatile java.lang.Object k8SServiceAccount_;
+    /**
+     * 
+     * Kubernetes service account used by the ray cluster
+     * 

+     *
+     * string k8s_service_account = 5;
+     */
+    public java.lang.String getK8SServiceAccount() {
+      java.lang.Object ref = k8SServiceAccount_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        k8SServiceAccount_ = s;
+        return s;
+      }
+    }
+    /**
+     * 
+     * Kubernetes service account used by the ray cluster
+     * 

+     *
+     * string k8s_service_account = 5;
+     */
+    public com.google.protobuf.ByteString
+        getK8SServiceAccountBytes() {
+      java.lang.Object ref = k8SServiceAccount_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        k8SServiceAccount_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1327,9 +1461,15 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       com.google.protobuf.GeneratedMessageV3
         .serializeStringMapTo(
           output,
-          internalGetRayClusterParams(),
-          RayClusterParamsDefaultEntryHolder.defaultEntry,
+          internalGetConfigOverride(),
+          ConfigOverrideDefaultEntryHolder.defaultEntry,
           3);
+      if (!getNamespaceBytes().isEmpty()) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, namespace_);
+      }
+      if (!getK8SServiceAccountBytes().isEmpty()) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, k8SServiceAccount_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -1348,14 +1488,20 @@ public int getSerializedSize() {
           .computeMessageSize(2, workerGroupSpec_.get(i));
       }
       for (java.util.Map.Entry entry
-           : internalGetRayClusterParams().getMap().entrySet()) {
+           : internalGetConfigOverride().getMap().entrySet()) {
         com.google.protobuf.MapEntry
-        rayClusterParams__ = RayClusterParamsDefaultEntryHolder.defaultEntry.newBuilderForType()
+        configOverride__ = ConfigOverrideDefaultEntryHolder.defaultEntry.newBuilderForType()
             .setKey(entry.getKey())
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(3, rayClusterParams__);
+            .computeMessageSize(3, configOverride__);
+      }
+      if (!getNamespaceBytes().isEmpty()) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, namespace_);
+      }
+      if (!getK8SServiceAccountBytes().isEmpty()) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, k8SServiceAccount_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1379,8 +1525,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getWorkerGroupSpecList()
           .equals(other.getWorkerGroupSpecList())) return false;
-      if (!internalGetRayClusterParams().equals(
-          other.internalGetRayClusterParams())) return false;
+      if (!internalGetConfigOverride().equals(
+          other.internalGetConfigOverride())) return false;
+      if (!getNamespace()
+          .equals(other.getNamespace())) return false;
+      if (!getK8SServiceAccount()
+          .equals(other.getK8SServiceAccount())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1400,10 +1550,14 @@ public int hashCode() {
         hash = (37 * hash) + WORKER_GROUP_SPEC_FIELD_NUMBER;
         hash = (53 * hash) + getWorkerGroupSpecList().hashCode();
       }
-      if (!internalGetRayClusterParams().getMap().isEmpty()) {
-        hash = (37 * hash) + RAY_CLUSTER_PARAMS_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetRayClusterParams().hashCode();
+      if (!internalGetConfigOverride().getMap().isEmpty()) {
+        hash = (37 * hash) + CONFIG_OVERRIDE_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetConfigOverride().hashCode();
       }
+      hash = (37 * hash) + NAMESPACE_FIELD_NUMBER;
+      hash = (53 * hash) + getNamespace().hashCode();
+      hash = (37 * hash) + K8S_SERVICE_ACCOUNT_FIELD_NUMBER;
+      hash = (53 * hash) + getK8SServiceAccount().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1520,7 +1674,7 @@ protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
           case 3:
-            return internalGetRayClusterParams();
+            return internalGetConfigOverride();
           default:
             throw new RuntimeException(
                 "Invalid map field number: " + number);
@@ -1531,7 +1685,7 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
           case 3:
-            return internalGetMutableRayClusterParams();
+            return internalGetMutableConfigOverride();
           default:
             throw new RuntimeException(
                 "Invalid map field number: " + number);
@@ -1576,7 +1730,11 @@ public Builder clear() {
         } else {
           workerGroupSpecBuilder_.clear();
         }
-        internalGetMutableRayClusterParams().clear();
+        internalGetMutableConfigOverride().clear();
+        namespace_ = "";
+
+        k8SServiceAccount_ = "";
+
         return this;
       }
 
@@ -1619,8 +1777,10 @@ public flyteidl.plugins.Ray.RayCluster buildPartial() {
         } else {
           result.workerGroupSpec_ = workerGroupSpecBuilder_.build();
         }
-        result.rayClusterParams_ = internalGetRayClusterParams();
-        result.rayClusterParams_.makeImmutable();
+        result.configOverride_ = internalGetConfigOverride();
+        result.configOverride_.makeImmutable();
+        result.namespace_ = namespace_;
+        result.k8SServiceAccount_ = k8SServiceAccount_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -1699,8 +1859,16 @@ public Builder mergeFrom(flyteidl.plugins.Ray.RayCluster other) {
             }
           }
         }
-        internalGetMutableRayClusterParams().mergeFrom(
-            other.internalGetRayClusterParams());
+        internalGetMutableConfigOverride().mergeFrom(
+            other.internalGetConfigOverride());
+        if (!other.getNamespace().isEmpty()) {
+          namespace_ = other.namespace_;
+          onChanged();
+        }
+        if (!other.getK8SServiceAccount().isEmpty()) {
+          k8SServiceAccount_ = other.k8SServiceAccount_;
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -2197,76 +2365,76 @@ public flyteidl.plugins.Ray.WorkerGroupSpec.Builder addWorkerGroupSpecBuilder(
       }
 
       private com.google.protobuf.MapField<
-          java.lang.String, java.lang.String> rayClusterParams_;
+          java.lang.String, java.lang.String> configOverride_;
       private com.google.protobuf.MapField
-      internalGetRayClusterParams() {
-        if (rayClusterParams_ == null) {
+      internalGetConfigOverride() {
+        if (configOverride_ == null) {
           return com.google.protobuf.MapField.emptyMapField(
-              RayClusterParamsDefaultEntryHolder.defaultEntry);
+              ConfigOverrideDefaultEntryHolder.defaultEntry);
         }
-        return rayClusterParams_;
+        return configOverride_;
       }
       private com.google.protobuf.MapField
-      internalGetMutableRayClusterParams() {
+      internalGetMutableConfigOverride() {
         onChanged();;
-        if (rayClusterParams_ == null) {
-          rayClusterParams_ = com.google.protobuf.MapField.newMapField(
-              RayClusterParamsDefaultEntryHolder.defaultEntry);
+        if (configOverride_ == null) {
+          configOverride_ = com.google.protobuf.MapField.newMapField(
+              ConfigOverrideDefaultEntryHolder.defaultEntry);
         }
-        if (!rayClusterParams_.isMutable()) {
-          rayClusterParams_ = rayClusterParams_.copy();
+        if (!configOverride_.isMutable()) {
+          configOverride_ = configOverride_.copy();
         }
-        return rayClusterParams_;
+        return configOverride_;
       }
 
-      public int getRayClusterParamsCount() {
-        return internalGetRayClusterParams().getMap().size();
+      public int getConfigOverrideCount() {
+        return internalGetConfigOverride().getMap().size();
       }
       /**
        * 
        * Additional parameter overrides for ray cluster config
        * 

        *
-       * map<string, string> ray_cluster_params = 3;
+       * map<string, string> config_override = 3;
        */
 
-      public boolean containsRayClusterParams(
+      public boolean containsConfigOverride(
           java.lang.String key) {
         if (key == null) { throw new java.lang.NullPointerException(); }
-        return internalGetRayClusterParams().getMap().containsKey(key);
+        return internalGetConfigOverride().getMap().containsKey(key);
       }
       /**
-       * Use {@link #getRayClusterParamsMap()} instead.
+       * Use {@link #getConfigOverrideMap()} instead.
        */
       @java.lang.Deprecated
-      public java.util.Map getRayClusterParams() {
-        return getRayClusterParamsMap();
+      public java.util.Map getConfigOverride() {
+        return getConfigOverrideMap();
       }
       /**
        * 
        * Additional parameter overrides for ray cluster config
        * 

        *
-       * map<string, string> ray_cluster_params = 3;
+       * map<string, string> config_override = 3;
        */
 
-      public java.util.Map getRayClusterParamsMap() {
-        return internalGetRayClusterParams().getMap();
+      public java.util.Map getConfigOverrideMap() {
+        return internalGetConfigOverride().getMap();
       }
       /**
        * 
        * Additional parameter overrides for ray cluster config
        * 

        *
-       * map<string, string> ray_cluster_params = 3;
+       * map<string, string> config_override = 3;
        */
 
-      public java.lang.String getRayClusterParamsOrDefault(
+      public java.lang.String getConfigOverrideOrDefault(
           java.lang.String key,
           java.lang.String defaultValue) {
         if (key == null) { throw new java.lang.NullPointerException(); }
         java.util.Map map =
-            internalGetRayClusterParams().getMap();
+            internalGetConfigOverride().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
@@ -2274,22 +2442,22 @@ public java.lang.String getRayClusterParamsOrDefault(
        * Additional parameter overrides for ray cluster config
        *
* - * map<string, string> ray_cluster_params = 3; + * map<string, string> config_override = 3; */ - public java.lang.String getRayClusterParamsOrThrow( + public java.lang.String getConfigOverrideOrThrow( java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } java.util.Map map = - internalGetRayClusterParams().getMap(); + internalGetConfigOverride().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public Builder clearRayClusterParams() { - internalGetMutableRayClusterParams().getMutableMap() + public Builder clearConfigOverride() { + internalGetMutableConfigOverride().getMutableMap() .clear(); return this; } @@ -2298,13 +2466,13 @@ public Builder clearRayClusterParams() { * Additional parameter overrides for ray cluster config * * - * map<string, string> ray_cluster_params = 3; + * map<string, string> config_override = 3; */ - public Builder removeRayClusterParams( + public Builder removeConfigOverride( java.lang.String key) { if (key == null) { throw new java.lang.NullPointerException(); } - internalGetMutableRayClusterParams().getMutableMap() + internalGetMutableConfigOverride().getMutableMap() .remove(key); return this; } @@ -2313,22 +2481,22 @@ public Builder removeRayClusterParams( */ @java.lang.Deprecated public java.util.Map - getMutableRayClusterParams() { - return internalGetMutableRayClusterParams().getMutableMap(); + getMutableConfigOverride() { + return internalGetMutableConfigOverride().getMutableMap(); } /** * 
        * Additional parameter overrides for ray cluster config
        *
* - * map<string, string> ray_cluster_params = 3; + * map<string, string> config_override = 3; */ - public Builder putRayClusterParams( + public Builder putConfigOverride( java.lang.String key, java.lang.String value) { if (key == null) { throw new java.lang.NullPointerException(); } if (value == null) { throw new java.lang.NullPointerException(); } - internalGetMutableRayClusterParams().getMutableMap() + internalGetMutableConfigOverride().getMutableMap() .put(key, value); return this; } @@ -2337,15 +2505,193 @@ public Builder putRayClusterParams( * Additional parameter overrides for ray cluster config * * - * map<string, string> ray_cluster_params = 3; + * map<string, string> config_override = 3; */ - public Builder putAllRayClusterParams( + public Builder putAllConfigOverride( java.util.Map values) { - internalGetMutableRayClusterParams().getMutableMap() + internalGetMutableConfigOverride().getMutableMap() .putAll(values); return this; } + + private java.lang.Object namespace_ = ""; + /** + * 
+       * Namespace used to create the ray cluster
+       *
+ * + * string namespace = 4; + */ + public java.lang.String getNamespace() { + java.lang.Object ref = namespace_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + namespace_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * Namespace used to create the ray cluster
+       *
+ * + * string namespace = 4; + */ + public com.google.protobuf.ByteString + getNamespaceBytes() { + java.lang.Object ref = namespace_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + namespace_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * Namespace used to create the ray cluster
+       *
+ * + * string namespace = 4; + */ + public Builder setNamespace( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + namespace_ = value; + onChanged(); + return this; + } + /** + * 
+       * Namespace used to create the ray cluster
+       *
+ * + * string namespace = 4; + */ + public Builder clearNamespace() { + + namespace_ = getDefaultInstance().getNamespace(); + onChanged(); + return this; + } + /** + * 
+       * Namespace used to create the ray cluster
+       *
+ * + * string namespace = 4; + */ + public Builder setNamespaceBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + namespace_ = value; + onChanged(); + return this; + } + + private java.lang.Object k8SServiceAccount_ = ""; + /** + * 
+       * Kubernetes service account used by the ray cluster
+       *
+ * + * string k8s_service_account = 5; + */ + public java.lang.String getK8SServiceAccount() { + java.lang.Object ref = k8SServiceAccount_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + k8SServiceAccount_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * Kubernetes service account used by the ray cluster
+       *
+ * + * string k8s_service_account = 5; + */ + public com.google.protobuf.ByteString + getK8SServiceAccountBytes() { + java.lang.Object ref = k8SServiceAccount_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + k8SServiceAccount_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * Kubernetes service account used by the ray cluster
+       *
+ * + * string k8s_service_account = 5; + */ + public Builder setK8SServiceAccount( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + k8SServiceAccount_ = value; + onChanged(); + return this; + } + /** + * 
+       * Kubernetes service account used by the ray cluster
+       *
+ * + * string k8s_service_account = 5; + */ + public Builder clearK8SServiceAccount() { + + k8SServiceAccount_ = getDefaultInstance().getK8SServiceAccount(); + onChanged(); + return this; + } + /** + * 
+       * Kubernetes service account used by the ray cluster
+       *
+ * + * string k8s_service_account = 5; + */ + public Builder setK8SServiceAccountBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + k8SServiceAccount_ = value; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -4961,10 +5307,10 @@ public flyteidl.plugins.Ray.WorkerGroupSpec getDefaultInstanceForType() { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_flyteidl_plugins_RayCluster_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_flyteidl_plugins_RayCluster_RayClusterParamsEntry_descriptor; + internal_static_flyteidl_plugins_RayCluster_ConfigOverrideEntry_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_flyteidl_plugins_RayCluster_RayClusterParamsEntry_fieldAccessorTable; + internal_static_flyteidl_plugins_RayCluster_ConfigOverrideEntry_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_flyteidl_plugins_HeadGroupSpec_descriptor; private static final @@ -4997,28 +5343,29 @@ public flyteidl.plugins.Ray.WorkerGroupSpec getDefaultInstanceForType() { "\n\032flyteidl/plugins/ray.proto\022\020flyteidl.p" + "lugins\032\031flyteidl/core/tasks.proto\"P\n\006Ray" + "Job\0221\n\013ray_cluster\030\001 \001(\0132\034.flyteidl.plug" + - "ins.RayCluster\022\023\n\013runtime_env\030\002 \001(\t\"\215\002\n\n" + + "ins.RayCluster\022\023\n\013runtime_env\030\002 \001(\t\"\266\002\n\n" + "RayCluster\0228\n\017head_group_spec\030\001 \001(\0132\037.fl" + "yteidl.plugins.HeadGroupSpec\022<\n\021worker_g" + "roup_spec\030\002 \003(\0132!.flyteidl.plugins.Worke" + - "rGroupSpec\022N\n\022ray_cluster_params\030\003 \003(\01322" + - ".flyteidl.plugins.RayCluster.RayClusterP" + - "aramsEntry\0327\n\025RayClusterParamsEntry\022\013\n\003k" + - "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\302\001\n\rHeadGrou" + - "pSpec\022M\n\020ray_start_params\030\001 \003(\01323.flytei" + - "dl.plugins.HeadGroupSpec.RayStartParamsE" + - "ntry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.core." + - "Resources\0325\n\023RayStartParamsEntry\022\013\n\003key\030" + - "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\230\002\n\017WorkerGroup" + - "Spec\022\022\n\ngroup_name\030\001 \001(\t\022\020\n\010replicas\030\002 \001" + - "(\005\022\024\n\014min_replicas\030\003 \001(\005\022\024\n\014max_replicas" + - "\030\004 \001(\005\022O\n\020ray_start_params\030\005 \003(\01325.flyte" + - "idl.plugins.WorkerGroupSpec.RayStartPara" + - "msEntry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.co" + - "re.Resources\0325\n\023RayStartParamsEntry\022\013\n\003k" + - "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B9Z7github.co" + - "m/flyteorg/flyteidl/gen/pb-go/flyteidl/p" + - "luginsb\006proto3" + "rGroupSpec\022I\n\017config_override\030\003 \003(\01320.fl" + + "yteidl.plugins.RayCluster.ConfigOverride" + + "Entry\022\021\n\tnamespace\030\004 \001(\t\022\033\n\023k8s_service_" + + "account\030\005 \001(\t\0325\n\023ConfigOverrideEntry\022\013\n\003" + + "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\302\001\n\rHeadGro" + + "upSpec\022M\n\020ray_start_params\030\001 \003(\01323.flyte" + + "idl.plugins.HeadGroupSpec.RayStartParams" + + "Entry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.core" + + ".Resources\0325\n\023RayStartParamsEntry\022\013\n\003key" + + "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\230\002\n\017WorkerGrou" + + "pSpec\022\022\n\ngroup_name\030\001 \001(\t\022\020\n\010replicas\030\002 " + + "\001(\005\022\024\n\014min_replicas\030\003 \001(\005\022\024\n\014max_replica" + + "s\030\004 \001(\005\022O\n\020ray_start_params\030\005 \003(\01325.flyt" + + "eidl.plugins.WorkerGroupSpec.RayStartPar" + + "amsEntry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.c" + + "ore.Resources\0325\n\023RayStartParamsEntry\022\013\n\003" + + "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B9Z7github.c" + + "om/flyteorg/flyteidl/gen/pb-go/flyteidl/" + + "pluginsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -5044,12 +5391,12 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_plugins_RayCluster_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_plugins_RayCluster_descriptor, - new java.lang.String[] { "HeadGroupSpec", "WorkerGroupSpec", "RayClusterParams", }); - internal_static_flyteidl_plugins_RayCluster_RayClusterParamsEntry_descriptor = + new java.lang.String[] { "HeadGroupSpec", "WorkerGroupSpec", "ConfigOverride", "Namespace", "K8SServiceAccount", }); + internal_static_flyteidl_plugins_RayCluster_ConfigOverrideEntry_descriptor = internal_static_flyteidl_plugins_RayCluster_descriptor.getNestedTypes().get(0); - internal_static_flyteidl_plugins_RayCluster_RayClusterParamsEntry_fieldAccessorTable = new + internal_static_flyteidl_plugins_RayCluster_ConfigOverrideEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_flyteidl_plugins_RayCluster_RayClusterParamsEntry_descriptor, + internal_static_flyteidl_plugins_RayCluster_ConfigOverrideEntry_descriptor, new java.lang.String[] { "Key", "Value", }); internal_static_flyteidl_plugins_HeadGroupSpec_descriptor = getDescriptor().getMessageTypes().get(2); diff --git a/gen/pb_python/flyteidl/plugins/ray_pb2.py b/gen/pb_python/flyteidl/plugins/ray_pb2.py index 13b93ac40..0adebc9c7 100644 --- a/gen/pb_python/flyteidl/plugins/ray_pb2.py +++ b/gen/pb_python/flyteidl/plugins/ray_pb2.py @@ -14,7 +14,7 @@ from flyteidl.core import tasks_pb2 as flyteidl_dot_core_dot_tasks__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/plugins/ray.proto\x12\x10\x66lyteidl.plugins\x1a\x19\x66lyteidl/core/tasks.proto\"h\n\x06RayJob\x12=\n\x0bray_cluster\x18\x01 \x01(\x0b\x32\x1c.flyteidl.plugins.RayClusterR\nrayCluster\x12\x1f\n\x0bruntime_env\x18\x02 \x01(\tR\nruntimeEnv\"\xcb\x02\n\nRayCluster\x12G\n\x0fhead_group_spec\x18\x01 \x01(\x0b\x32\x1f.flyteidl.plugins.HeadGroupSpecR\rheadGroupSpec\x12M\n\x11worker_group_spec\x18\x02 \x03(\x0b\x32!.flyteidl.plugins.WorkerGroupSpecR\x0fworkerGroupSpec\x12`\n\x12ray_cluster_params\x18\x03 \x03(\x0b\x32\x32.flyteidl.plugins.RayCluster.RayClusterParamsEntryR\x10rayClusterParams\x1a\x43\n\x15RayClusterParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xe9\x01\n\rHeadGroupSpec\x12]\n\x10ray_start_params\x18\x01 \x03(\x0b\x32\x33.flyteidl.plugins.HeadGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xee\x02\n\x0fWorkerGroupSpec\x12\x1d\n\ngroup_name\x18\x01 \x01(\tR\tgroupName\x12\x1a\n\x08replicas\x18\x02 \x01(\x05R\x08replicas\x12!\n\x0cmin_replicas\x18\x03 \x01(\x05R\x0bminReplicas\x12!\n\x0cmax_replicas\x18\x04 \x01(\x05R\x0bmaxReplicas\x12_\n\x10ray_start_params\x18\x05 \x03(\x0b\x32\x35.flyteidl.plugins.WorkerGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\xba\x01\n\x14\x63om.flyteidl.pluginsB\x08RayProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins\xa2\x02\x03\x46PX\xaa\x02\x10\x46lyteidl.Plugins\xca\x02\x10\x46lyteidl\\Plugins\xe2\x02\x1c\x46lyteidl\\Plugins\\GPBMetadata\xea\x02\x11\x46lyteidl::Pluginsb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/plugins/ray.proto\x12\x10\x66lyteidl.plugins\x1a\x19\x66lyteidl/core/tasks.proto\"h\n\x06RayJob\x12=\n\x0bray_cluster\x18\x01 \x01(\x0b\x32\x1c.flyteidl.plugins.RayClusterR\nrayCluster\x12\x1f\n\x0bruntime_env\x18\x02 \x01(\tR\nruntimeEnv\"\x90\x03\n\nRayCluster\x12G\n\x0fhead_group_spec\x18\x01 \x01(\x0b\x32\x1f.flyteidl.plugins.HeadGroupSpecR\rheadGroupSpec\x12M\n\x11worker_group_spec\x18\x02 \x03(\x0b\x32!.flyteidl.plugins.WorkerGroupSpecR\x0fworkerGroupSpec\x12Y\n\x0f\x63onfig_override\x18\x03 \x03(\x0b\x32\x30.flyteidl.plugins.RayCluster.ConfigOverrideEntryR\x0e\x63onfigOverride\x12\x1c\n\tnamespace\x18\x04 \x01(\tR\tnamespace\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x1a\x41\n\x13\x43onfigOverrideEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xe9\x01\n\rHeadGroupSpec\x12]\n\x10ray_start_params\x18\x01 \x03(\x0b\x32\x33.flyteidl.plugins.HeadGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xee\x02\n\x0fWorkerGroupSpec\x12\x1d\n\ngroup_name\x18\x01 \x01(\tR\tgroupName\x12\x1a\n\x08replicas\x18\x02 \x01(\x05R\x08replicas\x12!\n\x0cmin_replicas\x18\x03 \x01(\x05R\x0bminReplicas\x12!\n\x0cmax_replicas\x18\x04 \x01(\x05R\x0bmaxReplicas\x12_\n\x10ray_start_params\x18\x05 \x03(\x0b\x32\x35.flyteidl.plugins.WorkerGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\xba\x01\n\x14\x63om.flyteidl.pluginsB\x08RayProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins\xa2\x02\x03\x46PX\xaa\x02\x10\x46lyteidl.Plugins\xca\x02\x10\x46lyteidl\\Plugins\xe2\x02\x1c\x46lyteidl\\Plugins\\GPBMetadata\xea\x02\x11\x46lyteidl::Pluginsb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -23,8 +23,8 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\024com.flyteidl.pluginsB\010RayProtoP\001Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins\242\002\003FPX\252\002\020Flyteidl.Plugins\312\002\020Flyteidl\\Plugins\342\002\034Flyteidl\\Plugins\\GPBMetadata\352\002\021Flyteidl::Plugins' - _RAYCLUSTER_RAYCLUSTERPARAMSENTRY._options = None - _RAYCLUSTER_RAYCLUSTERPARAMSENTRY._serialized_options = b'8\001' + _RAYCLUSTER_CONFIGOVERRIDEENTRY._options = None + _RAYCLUSTER_CONFIGOVERRIDEENTRY._serialized_options = b'8\001' _HEADGROUPSPEC_RAYSTARTPARAMSENTRY._options = None _HEADGROUPSPEC_RAYSTARTPARAMSENTRY._serialized_options = b'8\001' _WORKERGROUPSPEC_RAYSTARTPARAMSENTRY._options = None @@ -32,15 +32,15 @@ _globals['_RAYJOB']._serialized_start=75 _globals['_RAYJOB']._serialized_end=179 _globals['_RAYCLUSTER']._serialized_start=182 - _globals['_RAYCLUSTER']._serialized_end=513 - _globals['_RAYCLUSTER_RAYCLUSTERPARAMSENTRY']._serialized_start=446 - _globals['_RAYCLUSTER_RAYCLUSTERPARAMSENTRY']._serialized_end=513 - _globals['_HEADGROUPSPEC']._serialized_start=516 - _globals['_HEADGROUPSPEC']._serialized_end=749 - _globals['_HEADGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_start=684 - _globals['_HEADGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_end=749 - _globals['_WORKERGROUPSPEC']._serialized_start=752 - _globals['_WORKERGROUPSPEC']._serialized_end=1118 - _globals['_WORKERGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_start=684 - _globals['_WORKERGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_end=749 + _globals['_RAYCLUSTER']._serialized_end=582 + _globals['_RAYCLUSTER_CONFIGOVERRIDEENTRY']._serialized_start=517 + _globals['_RAYCLUSTER_CONFIGOVERRIDEENTRY']._serialized_end=582 + _globals['_HEADGROUPSPEC']._serialized_start=585 + _globals['_HEADGROUPSPEC']._serialized_end=818 + _globals['_HEADGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_start=753 + _globals['_HEADGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_end=818 + _globals['_WORKERGROUPSPEC']._serialized_start=821 + _globals['_WORKERGROUPSPEC']._serialized_end=1187 + _globals['_WORKERGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_start=753 + _globals['_WORKERGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_end=818 # @@protoc_insertion_point(module_scope) diff --git a/gen/pb_python/flyteidl/plugins/ray_pb2.pyi b/gen/pb_python/flyteidl/plugins/ray_pb2.pyi index d3cfaa312..9daf39a40 100644 --- a/gen/pb_python/flyteidl/plugins/ray_pb2.pyi +++ b/gen/pb_python/flyteidl/plugins/ray_pb2.pyi @@ -15,8 +15,8 @@ class RayJob(_message.Message): def __init__(self, ray_cluster: _Optional[_Union[RayCluster, _Mapping]] = ..., runtime_env: _Optional[str] = ...) -> None: ... class RayCluster(_message.Message): - __slots__ = ["head_group_spec", "worker_group_spec", "ray_cluster_params"] - class RayClusterParamsEntry(_message.Message): + __slots__ = ["head_group_spec", "worker_group_spec", "config_override", "namespace", "k8s_service_account"] + class ConfigOverrideEntry(_message.Message): __slots__ = ["key", "value"] KEY_FIELD_NUMBER: _ClassVar[int] VALUE_FIELD_NUMBER: _ClassVar[int] @@ -25,11 +25,15 @@ class RayCluster(_message.Message): def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ... HEAD_GROUP_SPEC_FIELD_NUMBER: _ClassVar[int] WORKER_GROUP_SPEC_FIELD_NUMBER: _ClassVar[int] - RAY_CLUSTER_PARAMS_FIELD_NUMBER: _ClassVar[int] + CONFIG_OVERRIDE_FIELD_NUMBER: _ClassVar[int] + NAMESPACE_FIELD_NUMBER: _ClassVar[int] + K8S_SERVICE_ACCOUNT_FIELD_NUMBER: _ClassVar[int] head_group_spec: HeadGroupSpec worker_group_spec: _containers.RepeatedCompositeFieldContainer[WorkerGroupSpec] - ray_cluster_params: _containers.ScalarMap[str, str] - def __init__(self, head_group_spec: _Optional[_Union[HeadGroupSpec, _Mapping]] = ..., worker_group_spec: _Optional[_Iterable[_Union[WorkerGroupSpec, _Mapping]]] = ..., ray_cluster_params: _Optional[_Mapping[str, str]] = ...) -> None: ... + config_override: _containers.ScalarMap[str, str] + namespace: str + k8s_service_account: str + def __init__(self, head_group_spec: _Optional[_Union[HeadGroupSpec, _Mapping]] = ..., worker_group_spec: _Optional[_Iterable[_Union[WorkerGroupSpec, _Mapping]]] = ..., config_override: _Optional[_Mapping[str, str]] = ..., namespace: _Optional[str] = ..., k8s_service_account: _Optional[str] = ...) -> None: ... class HeadGroupSpec(_message.Message): __slots__ = ["ray_start_params", "resources"] diff --git a/gen/pb_rust/flyteidl.plugins.rs b/gen/pb_rust/flyteidl.plugins.rs index 557592122..273a05e7c 100644 --- a/gen/pb_rust/flyteidl.plugins.rs +++ b/gen/pb_rust/flyteidl.plugins.rs @@ -188,7 +188,13 @@ pub struct RayCluster { pub worker_group_spec: ::prost::alloc::vec::Vec, /// Additional parameter overrides for ray cluster config #[prost(map="string, string", tag="3")] - pub ray_cluster_params: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>, + pub config_override: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>, + /// Namespace used to create the ray cluster + #[prost(string, tag="4")] + pub namespace: ::prost::alloc::string::String, + /// Kubernetes service account used by the ray cluster + #[prost(string, tag="5")] + pub k8s_service_account: ::prost::alloc::string::String, } /// HeadGroupSpec are the spec for the head pod #[allow(clippy::derive_partial_eq_without_eq)] diff --git a/protos/flyteidl/plugins/ray.proto b/protos/flyteidl/plugins/ray.proto index 383a615e1..d53ebf796 100644 --- a/protos/flyteidl/plugins/ray.proto +++ b/protos/flyteidl/plugins/ray.proto @@ -22,7 +22,11 @@ message RayCluster { // WorkerGroupSpecs are the specs for the worker pods repeated WorkerGroupSpec worker_group_spec = 2; // Additional parameter overrides for ray cluster config - map ray_cluster_params = 3; + map config_override = 3; + // Namespace used to create the ray cluster + string namespace = 4; + // Kubernetes service account used by the ray cluster + string k8s_service_account = 5; } // HeadGroupSpec are the spec for the head pod From ecbff2abb23c0d548e297829d53311dcc6ddb686 Mon Sep 17 00:00:00 2001 From: Guozhen La Date: Tue, 8 Aug 2023 17:08:42 -0400 Subject: [PATCH 7/9] remove override Signed-off-by: Guozhen La --- gen/pb-cpp/flyteidl/plugins/ray.pb.cc | 339 ++----------- gen/pb-cpp/flyteidl/plugins/ray.pb.h | 86 +--- gen/pb-go/flyteidl/plugins/ray.pb.go | 81 ++- gen/pb-go/flyteidl/plugins/ray.pb.validate.go | 2 - gen/pb-java/flyteidl/plugins/Ray.java | 471 ++---------------- gen/pb_python/flyteidl/plugins/ray_pb2.py | 24 +- gen/pb_python/flyteidl/plugins/ray_pb2.pyi | 13 +- gen/pb_rust/flyteidl.plugins.rs | 7 +- protos/flyteidl/plugins/ray.proto | 6 +- 9 files changed, 152 insertions(+), 877 deletions(-) diff --git a/gen/pb-cpp/flyteidl/plugins/ray.pb.cc b/gen/pb-cpp/flyteidl/plugins/ray.pb.cc index eff5f9781..16f9d137b 100644 --- a/gen/pb-cpp/flyteidl/plugins/ray.pb.cc +++ b/gen/pb-cpp/flyteidl/plugins/ray.pb.cc @@ -18,21 +18,16 @@ extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fcore_2ftasks_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_Resources_flyteidl_2fcore_2ftasks_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_HeadGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_RayCluster_ConfigOverrideEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_WorkerGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto; extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fray_2eproto ::google::protobuf::internal::SCCInfo<3> scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto; namespace flyteidl { namespace plugins { class RayJobDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _RayJob_default_instance_; -class RayCluster_ConfigOverrideEntry_DoNotUseDefaultTypeInternal { - public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; -} _RayCluster_ConfigOverrideEntry_DoNotUse_default_instance_; class RayClusterDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; @@ -70,19 +65,6 @@ ::google::protobuf::internal::SCCInfo<1> scc_info_RayJob_flyteidl_2fplugins_2fra {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsRayJob_flyteidl_2fplugins_2fray_2eproto}, { &scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto.base,}}; -static void InitDefaultsRayCluster_ConfigOverrideEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto() { - GOOGLE_PROTOBUF_VERIFY_VERSION; - - { - void* ptr = &::flyteidl::plugins::_RayCluster_ConfigOverrideEntry_DoNotUse_default_instance_; - new (ptr) ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse(); - } - ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse::InitAsDefaultInstance(); -} - -::google::protobuf::internal::SCCInfo<0> scc_info_RayCluster_ConfigOverrideEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsRayCluster_ConfigOverrideEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto}, {}}; - static void InitDefaultsRayCluster_flyteidl_2fplugins_2fray_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -94,11 +76,10 @@ static void InitDefaultsRayCluster_flyteidl_2fplugins_2fray_2eproto() { ::flyteidl::plugins::RayCluster::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<3> scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsRayCluster_flyteidl_2fplugins_2fray_2eproto}, { +::google::protobuf::internal::SCCInfo<2> scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsRayCluster_flyteidl_2fplugins_2fray_2eproto}, { &scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto.base, - &scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto.base, - &scc_info_RayCluster_ConfigOverrideEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base,}}; + &scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto.base,}}; static void InitDefaultsHeadGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -160,7 +141,6 @@ ::google::protobuf::internal::SCCInfo<2> scc_info_WorkerGroupSpec_flyteidl_2fplu void InitDefaults_flyteidl_2fplugins_2fray_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_RayJob_flyteidl_2fplugins_2fray_2eproto.base); - ::google::protobuf::internal::InitSCC(&scc_info_RayCluster_ConfigOverrideEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_RayCluster_flyteidl_2fplugins_2fray_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_HeadGroupSpec_RayStartParamsEntry_DoNotUse_flyteidl_2fplugins_2fray_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_HeadGroupSpec_flyteidl_2fplugins_2fray_2eproto.base); @@ -168,7 +148,7 @@ void InitDefaults_flyteidl_2fplugins_2fray_2eproto() { ::google::protobuf::internal::InitSCC(&scc_info_WorkerGroupSpec_flyteidl_2fplugins_2fray_2eproto.base); } -::google::protobuf::Metadata file_level_metadata_flyteidl_2fplugins_2fray_2eproto[7]; +::google::protobuf::Metadata file_level_metadata_flyteidl_2fplugins_2fray_2eproto[6]; constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_flyteidl_2fplugins_2fray_2eproto = nullptr; constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fplugins_2fray_2eproto = nullptr; @@ -180,15 +160,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fplugins_2fray_2eproto::o ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayJob, ray_cluster_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayJob, runtime_env_), - PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse, _has_bits_), - PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse, _internal_metadata_), - ~0u, // no _extensions_ - ~0u, // no _oneof_case_ - ~0u, // no _weak_field_map_ - PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse, key_), - PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse, value_), - 0, - 1, ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, _internal_metadata_), ~0u, // no _extensions_ @@ -196,7 +167,6 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fplugins_2fray_2eproto::o ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, head_group_spec_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, worker_group_spec_), - PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, config_override_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, namespace__), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::RayCluster, k8s_service_account_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse, _has_bits_), @@ -238,17 +208,15 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fplugins_2fray_2eproto::o }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { { 0, -1, sizeof(::flyteidl::plugins::RayJob)}, - { 7, 14, sizeof(::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse)}, - { 16, -1, sizeof(::flyteidl::plugins::RayCluster)}, - { 26, 33, sizeof(::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse)}, - { 35, -1, sizeof(::flyteidl::plugins::HeadGroupSpec)}, - { 42, 49, sizeof(::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse)}, - { 51, -1, sizeof(::flyteidl::plugins::WorkerGroupSpec)}, + { 7, -1, sizeof(::flyteidl::plugins::RayCluster)}, + { 16, 23, sizeof(::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse)}, + { 25, -1, sizeof(::flyteidl::plugins::HeadGroupSpec)}, + { 32, 39, sizeof(::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse)}, + { 41, -1, sizeof(::flyteidl::plugins::WorkerGroupSpec)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { reinterpret_cast(&::flyteidl::plugins::_RayJob_default_instance_), - reinterpret_cast(&::flyteidl::plugins::_RayCluster_ConfigOverrideEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::plugins::_RayCluster_default_instance_), reinterpret_cast(&::flyteidl::plugins::_HeadGroupSpec_RayStartParamsEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::plugins::_HeadGroupSpec_default_instance_), @@ -259,41 +227,38 @@ static ::google::protobuf::Message const * const file_default_instances[] = { ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto = { {}, AddDescriptors_flyteidl_2fplugins_2fray_2eproto, "flyteidl/plugins/ray.proto", schemas, file_default_instances, TableStruct_flyteidl_2fplugins_2fray_2eproto::offsets, - file_level_metadata_flyteidl_2fplugins_2fray_2eproto, 7, file_level_enum_descriptors_flyteidl_2fplugins_2fray_2eproto, file_level_service_descriptors_flyteidl_2fplugins_2fray_2eproto, + file_level_metadata_flyteidl_2fplugins_2fray_2eproto, 6, file_level_enum_descriptors_flyteidl_2fplugins_2fray_2eproto, file_level_service_descriptors_flyteidl_2fplugins_2fray_2eproto, }; const char descriptor_table_protodef_flyteidl_2fplugins_2fray_2eproto[] = "\n\032flyteidl/plugins/ray.proto\022\020flyteidl.p" "lugins\032\031flyteidl/core/tasks.proto\"P\n\006Ray" "Job\0221\n\013ray_cluster\030\001 \001(\0132\034.flyteidl.plug" - "ins.RayCluster\022\023\n\013runtime_env\030\002 \001(\t\"\266\002\n\n" + "ins.RayCluster\022\023\n\013runtime_env\030\002 \001(\t\"\264\001\n\n" "RayCluster\0228\n\017head_group_spec\030\001 \001(\0132\037.fl" "yteidl.plugins.HeadGroupSpec\022<\n\021worker_g" "roup_spec\030\002 \003(\0132!.flyteidl.plugins.Worke" - "rGroupSpec\022I\n\017config_override\030\003 \003(\01320.fl" - "yteidl.plugins.RayCluster.ConfigOverride" - "Entry\022\021\n\tnamespace\030\004 \001(\t\022\033\n\023k8s_service_" - "account\030\005 \001(\t\0325\n\023ConfigOverrideEntry\022\013\n\003" - "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\302\001\n\rHeadGro" - "upSpec\022M\n\020ray_start_params\030\001 \003(\01323.flyte" - "idl.plugins.HeadGroupSpec.RayStartParams" - "Entry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.core" - ".Resources\0325\n\023RayStartParamsEntry\022\013\n\003key" - "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\230\002\n\017WorkerGrou" - "pSpec\022\022\n\ngroup_name\030\001 \001(\t\022\020\n\010replicas\030\002 " - "\001(\005\022\024\n\014min_replicas\030\003 \001(\005\022\024\n\014max_replica" - "s\030\004 \001(\005\022O\n\020ray_start_params\030\005 \003(\01325.flyt" - "eidl.plugins.WorkerGroupSpec.RayStartPar" - "amsEntry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.c" - "ore.Resources\0325\n\023RayStartParamsEntry\022\013\n\003" - "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B9Z7github.c" - "om/flyteorg/flyteidl/gen/pb-go/flyteidl/" - "pluginsb\006proto3" + "rGroupSpec\022\021\n\tnamespace\030\003 \001(\t\022\033\n\023k8s_ser" + "vice_account\030\004 \001(\t\"\302\001\n\rHeadGroupSpec\022M\n\020" + "ray_start_params\030\001 \003(\01323.flyteidl.plugin" + "s.HeadGroupSpec.RayStartParamsEntry\022+\n\tr" + "esources\030\006 \001(\0132\030.flyteidl.core.Resources" + "\0325\n\023RayStartParamsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" + "value\030\002 \001(\t:\0028\001\"\230\002\n\017WorkerGroupSpec\022\022\n\ng" + "roup_name\030\001 \001(\t\022\020\n\010replicas\030\002 \001(\005\022\024\n\014min" + "_replicas\030\003 \001(\005\022\024\n\014max_replicas\030\004 \001(\005\022O\n" + "\020ray_start_params\030\005 \003(\01325.flyteidl.plugi" + "ns.WorkerGroupSpec.RayStartParamsEntry\022+" + "\n\tresources\030\006 \001(\0132\030.flyteidl.core.Resour" + "ces\0325\n\023RayStartParamsEntry\022\013\n\003key\030\001 \001(\t\022" + "\r\n\005value\030\002 \001(\t:\0028\001B9Z7github.com/flyteor" + "g/flyteidl/gen/pb-go/flyteidl/pluginsb\006p" + "roto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fplugins_2fray_2eproto = { false, InitDefaults_flyteidl_2fplugins_2fray_2eproto, descriptor_table_protodef_flyteidl_2fplugins_2fray_2eproto, - "flyteidl/plugins/ray.proto", &assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto, 1015, + "flyteidl/plugins/ray.proto", &assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto, 885, }; void AddDescriptors_flyteidl_2fplugins_2fray_2eproto() { @@ -673,47 +638,6 @@ ::google::protobuf::Metadata RayJob::GetMetadata() const { } -// =================================================================== - -RayCluster_ConfigOverrideEntry_DoNotUse::RayCluster_ConfigOverrideEntry_DoNotUse() {} -RayCluster_ConfigOverrideEntry_DoNotUse::RayCluster_ConfigOverrideEntry_DoNotUse(::google::protobuf::Arena* arena) - : SuperType(arena) {} -void RayCluster_ConfigOverrideEntry_DoNotUse::MergeFrom(const RayCluster_ConfigOverrideEntry_DoNotUse& other) { - MergeFromInternal(other); -} -::google::protobuf::Metadata RayCluster_ConfigOverrideEntry_DoNotUse::GetMetadata() const { - ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto); - return ::file_level_metadata_flyteidl_2fplugins_2fray_2eproto[1]; -} -void RayCluster_ConfigOverrideEntry_DoNotUse::MergeFrom( - const ::google::protobuf::Message& other) { - ::google::protobuf::Message::MergeFrom(other); -} - -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -bool RayCluster_ConfigOverrideEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { - using MF = ::google::protobuf::internal::MapField< - RayCluster_ConfigOverrideEntry_DoNotUse, EntryKeyType, EntryValueType, - kEntryKeyFieldType, kEntryValueFieldType, - kEntryDefaultEnumValue>; - auto mf = static_cast(object); - Parser> parser(mf); -#define DO_(x) if (!(x)) return false - DO_(parser.ParseMap(begin, end)); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.key().data(), static_cast(parser.key().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.plugins.RayCluster.ConfigOverrideEntry.key")); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.value().data(), static_cast(parser.value().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.plugins.RayCluster.ConfigOverrideEntry.value")); -#undef DO_ - return true; -} -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - - // =================================================================== void RayCluster::InitAsDefaultInstance() { @@ -732,7 +656,6 @@ RayCluster::HasBitSetters::head_group_spec(const RayCluster* msg) { #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int RayCluster::kHeadGroupSpecFieldNumber; const int RayCluster::kWorkerGroupSpecFieldNumber; -const int RayCluster::kConfigOverrideFieldNumber; const int RayCluster::kNamespaceFieldNumber; const int RayCluster::kK8SServiceAccountFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 @@ -747,7 +670,6 @@ RayCluster::RayCluster(const RayCluster& from) _internal_metadata_(nullptr), worker_group_spec_(from.worker_group_spec_) { _internal_metadata_.MergeFrom(from._internal_metadata_); - config_override_.MergeFrom(from.config_override_); namespace__.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.namespace_().size() > 0) { namespace__.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.namespace__); @@ -799,7 +721,6 @@ void RayCluster::Clear() { (void) cached_has_bits; worker_group_spec_.Clear(); - config_override_.Clear(); namespace__.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); k8s_service_account_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (GetArenaNoVirtual() == nullptr && head_group_spec_ != nullptr) { @@ -851,28 +772,9 @@ const char* RayCluster::_InternalParse(const char* begin, const char* end, void* } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 18 && (ptr += 1)); break; } - // map config_override = 3; + // string namespace = 3; case 3: { if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; - do { - ptr = ::google::protobuf::io::ReadSize(ptr, &size); - GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); - parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; - auto parse_map = ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse::_ParseMap; - ctx->extra_parse_data().payload.clear(); - ctx->extra_parse_data().parse_map = parse_map; - object = &msg->config_override_; - if (size > end - ptr) goto len_delim_till_end; - auto newend = ptr + size; - GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); - ptr = newend; - if (ptr >= end) break; - } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 26 && (ptr += 1)); - break; - } - // string namespace = 4; - case 4: { - if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); ctx->extra_parse_data().SetFieldName("flyteidl.plugins.RayCluster.namespace"); @@ -886,9 +788,9 @@ const char* RayCluster::_InternalParse(const char* begin, const char* end, void* ptr += size; break; } - // string k8s_service_account = 5; - case 5: { - if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual; + // string k8s_service_account = 4; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); ctx->extra_parse_data().SetFieldName("flyteidl.plugins.RayCluster.k8s_service_account"); @@ -958,35 +860,9 @@ bool RayCluster::MergePartialFromCodedStream( break; } - // map config_override = 3; + // string namespace = 3; case 3: { if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { - RayCluster_ConfigOverrideEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< - RayCluster_ConfigOverrideEntry_DoNotUse, - ::std::string, ::std::string, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - 0 >, - ::google::protobuf::Map< ::std::string, ::std::string > > parser(&config_override_); - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, &parser)); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.key().data(), static_cast(parser.key().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.plugins.RayCluster.ConfigOverrideEntry.key")); - DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - parser.value().data(), static_cast(parser.value().length()), - ::google::protobuf::internal::WireFormatLite::PARSE, - "flyteidl.plugins.RayCluster.ConfigOverrideEntry.value")); - } else { - goto handle_unusual; - } - break; - } - - // string namespace = 4; - case 4: { - if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_namespace_())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -999,9 +875,9 @@ bool RayCluster::MergePartialFromCodedStream( break; } - // string k8s_service_account = 5; - case 5: { - if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) { + // string k8s_service_account = 4; + case 4: { + if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_k8s_service_account())); DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( @@ -1056,73 +932,24 @@ void RayCluster::SerializeWithCachedSizes( output); } - // map config_override = 3; - if (!this->config_override().empty()) { - typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer - ConstPtr; - typedef ConstPtr SortItem; - typedef ::google::protobuf::internal::CompareByDerefFirst Less; - struct Utf8Check { - static void Check(ConstPtr p) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - p->first.data(), static_cast(p->first.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.plugins.RayCluster.ConfigOverrideEntry.key"); - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - p->second.data(), static_cast(p->second.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.plugins.RayCluster.ConfigOverrideEntry.value"); - } - }; - - if (output->IsSerializationDeterministic() && - this->config_override().size() > 1) { - ::std::unique_ptr items( - new SortItem[this->config_override().size()]); - typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; - size_type n = 0; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->config_override().begin(); - it != this->config_override().end(); ++it, ++n) { - items[static_cast(n)] = SortItem(&*it); - } - ::std::sort(&items[0], &items[static_cast(n)], Less()); - ::std::unique_ptr entry; - for (size_type i = 0; i < n; i++) { - entry.reset(config_override_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(3, *entry, output); - Utf8Check::Check(&(*items[static_cast(i)])); - } - } else { - ::std::unique_ptr entry; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->config_override().begin(); - it != this->config_override().end(); ++it) { - entry.reset(config_override_.NewEntryWrapper(it->first, it->second)); - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(3, *entry, output); - Utf8Check::Check(&(*it)); - } - } - } - - // string namespace = 4; + // string namespace = 3; if (this->namespace_().size() > 0) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->namespace_().data(), static_cast(this->namespace_().length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "flyteidl.plugins.RayCluster.namespace"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 4, this->namespace_(), output); + 3, this->namespace_(), output); } - // string k8s_service_account = 5; + // string k8s_service_account = 4; if (this->k8s_service_account().size() > 0) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->k8s_service_account().data(), static_cast(this->k8s_service_account().length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "flyteidl.plugins.RayCluster.k8s_service_account"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 5, this->k8s_service_account(), output); + 4, this->k8s_service_account(), output); } if (_internal_metadata_.have_unknown_fields()) { @@ -1153,56 +980,7 @@ ::google::protobuf::uint8* RayCluster::InternalSerializeWithCachedSizesToArray( 2, this->worker_group_spec(static_cast(i)), target); } - // map config_override = 3; - if (!this->config_override().empty()) { - typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer - ConstPtr; - typedef ConstPtr SortItem; - typedef ::google::protobuf::internal::CompareByDerefFirst Less; - struct Utf8Check { - static void Check(ConstPtr p) { - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - p->first.data(), static_cast(p->first.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.plugins.RayCluster.ConfigOverrideEntry.key"); - ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( - p->second.data(), static_cast(p->second.length()), - ::google::protobuf::internal::WireFormatLite::SERIALIZE, - "flyteidl.plugins.RayCluster.ConfigOverrideEntry.value"); - } - }; - - if (false && - this->config_override().size() > 1) { - ::std::unique_ptr items( - new SortItem[this->config_override().size()]); - typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; - size_type n = 0; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->config_override().begin(); - it != this->config_override().end(); ++it, ++n) { - items[static_cast(n)] = SortItem(&*it); - } - ::std::sort(&items[0], &items[static_cast(n)], Less()); - ::std::unique_ptr entry; - for (size_type i = 0; i < n; i++) { - entry.reset(config_override_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); - target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(3, *entry, target); - Utf8Check::Check(&(*items[static_cast(i)])); - } - } else { - ::std::unique_ptr entry; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->config_override().begin(); - it != this->config_override().end(); ++it) { - entry.reset(config_override_.NewEntryWrapper(it->first, it->second)); - target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(3, *entry, target); - Utf8Check::Check(&(*it)); - } - } - } - - // string namespace = 4; + // string namespace = 3; if (this->namespace_().size() > 0) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->namespace_().data(), static_cast(this->namespace_().length()), @@ -1210,10 +988,10 @@ ::google::protobuf::uint8* RayCluster::InternalSerializeWithCachedSizesToArray( "flyteidl.plugins.RayCluster.namespace"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 4, this->namespace_(), target); + 3, this->namespace_(), target); } - // string k8s_service_account = 5; + // string k8s_service_account = 4; if (this->k8s_service_account().size() > 0) { ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( this->k8s_service_account().data(), static_cast(this->k8s_service_account().length()), @@ -1221,7 +999,7 @@ ::google::protobuf::uint8* RayCluster::InternalSerializeWithCachedSizesToArray( "flyteidl.plugins.RayCluster.k8s_service_account"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 5, this->k8s_service_account(), target); + 4, this->k8s_service_account(), target); } if (_internal_metadata_.have_unknown_fields()) { @@ -1256,28 +1034,14 @@ size_t RayCluster::ByteSizeLong() const { } } - // map config_override = 3; - total_size += 1 * - ::google::protobuf::internal::FromIntSize(this->config_override_size()); - { - ::std::unique_ptr entry; - for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator - it = this->config_override().begin(); - it != this->config_override().end(); ++it) { - entry.reset(config_override_.NewEntryWrapper(it->first, it->second)); - total_size += ::google::protobuf::internal::WireFormatLite:: - MessageSizeNoVirtual(*entry); - } - } - - // string namespace = 4; + // string namespace = 3; if (this->namespace_().size() > 0) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->namespace_()); } - // string k8s_service_account = 5; + // string k8s_service_account = 4; if (this->k8s_service_account().size() > 0) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( @@ -1319,7 +1083,6 @@ void RayCluster::MergeFrom(const RayCluster& from) { (void) cached_has_bits; worker_group_spec_.MergeFrom(from.worker_group_spec_); - config_override_.MergeFrom(from.config_override_); if (from.namespace_().size() > 0) { namespace__.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.namespace__); @@ -1359,7 +1122,6 @@ void RayCluster::InternalSwap(RayCluster* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); CastToBase(&worker_group_spec_)->InternalSwap(CastToBase(&other->worker_group_spec_)); - config_override_.Swap(&other->config_override_); namespace__.Swap(&other->namespace__, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); k8s_service_account_.Swap(&other->k8s_service_account_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), @@ -1383,7 +1145,7 @@ void HeadGroupSpec_RayStartParamsEntry_DoNotUse::MergeFrom(const HeadGroupSpec_R } ::google::protobuf::Metadata HeadGroupSpec_RayStartParamsEntry_DoNotUse::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto); - return ::file_level_metadata_flyteidl_2fplugins_2fray_2eproto[3]; + return ::file_level_metadata_flyteidl_2fplugins_2fray_2eproto[2]; } void HeadGroupSpec_RayStartParamsEntry_DoNotUse::MergeFrom( const ::google::protobuf::Message& other) { @@ -1879,7 +1641,7 @@ void WorkerGroupSpec_RayStartParamsEntry_DoNotUse::MergeFrom(const WorkerGroupSp } ::google::protobuf::Metadata WorkerGroupSpec_RayStartParamsEntry_DoNotUse::GetMetadata() const { ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fplugins_2fray_2eproto); - return ::file_level_metadata_flyteidl_2fplugins_2fray_2eproto[5]; + return ::file_level_metadata_flyteidl_2fplugins_2fray_2eproto[4]; } void WorkerGroupSpec_RayStartParamsEntry_DoNotUse::MergeFrom( const ::google::protobuf::Message& other) { @@ -2584,9 +2346,6 @@ namespace protobuf { template<> PROTOBUF_NOINLINE ::flyteidl::plugins::RayJob* Arena::CreateMaybeMessage< ::flyteidl::plugins::RayJob >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::plugins::RayJob >(arena); } -template<> PROTOBUF_NOINLINE ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse >(Arena* arena) { - return Arena::CreateInternal< ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse >(arena); -} template<> PROTOBUF_NOINLINE ::flyteidl::plugins::RayCluster* Arena::CreateMaybeMessage< ::flyteidl::plugins::RayCluster >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::plugins::RayCluster >(arena); } diff --git a/gen/pb-cpp/flyteidl/plugins/ray.pb.h b/gen/pb-cpp/flyteidl/plugins/ray.pb.h index 40442f8cc..e94127b3a 100644 --- a/gen/pb-cpp/flyteidl/plugins/ray.pb.h +++ b/gen/pb-cpp/flyteidl/plugins/ray.pb.h @@ -45,7 +45,7 @@ struct TableStruct_flyteidl_2fplugins_2fray_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[7] + static const ::google::protobuf::internal::ParseTable schema[6] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; @@ -63,9 +63,6 @@ extern HeadGroupSpec_RayStartParamsEntry_DoNotUseDefaultTypeInternal _HeadGroupS class RayCluster; class RayClusterDefaultTypeInternal; extern RayClusterDefaultTypeInternal _RayCluster_default_instance_; -class RayCluster_ConfigOverrideEntry_DoNotUse; -class RayCluster_ConfigOverrideEntry_DoNotUseDefaultTypeInternal; -extern RayCluster_ConfigOverrideEntry_DoNotUseDefaultTypeInternal _RayCluster_ConfigOverrideEntry_DoNotUse_default_instance_; class RayJob; class RayJobDefaultTypeInternal; extern RayJobDefaultTypeInternal _RayJob_default_instance_; @@ -82,7 +79,6 @@ namespace protobuf { template<> ::flyteidl::plugins::HeadGroupSpec* Arena::CreateMaybeMessage<::flyteidl::plugins::HeadGroupSpec>(Arena*); template<> ::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::plugins::HeadGroupSpec_RayStartParamsEntry_DoNotUse>(Arena*); template<> ::flyteidl::plugins::RayCluster* Arena::CreateMaybeMessage<::flyteidl::plugins::RayCluster>(Arena*); -template<> ::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::plugins::RayCluster_ConfigOverrideEntry_DoNotUse>(Arena*); template<> ::flyteidl::plugins::RayJob* Arena::CreateMaybeMessage<::flyteidl::plugins::RayJob>(Arena*); template<> ::flyteidl::plugins::WorkerGroupSpec* Arena::CreateMaybeMessage<::flyteidl::plugins::WorkerGroupSpec>(Arena*); template<> ::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::plugins::WorkerGroupSpec_RayStartParamsEntry_DoNotUse>(Arena*); @@ -223,30 +219,6 @@ class RayJob final : }; // ------------------------------------------------------------------- -class RayCluster_ConfigOverrideEntry_DoNotUse : public ::google::protobuf::internal::MapEntry { -public: -#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER -static bool _ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); -#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER - typedef ::google::protobuf::internal::MapEntry SuperType; - RayCluster_ConfigOverrideEntry_DoNotUse(); - RayCluster_ConfigOverrideEntry_DoNotUse(::google::protobuf::Arena* arena); - void MergeFrom(const RayCluster_ConfigOverrideEntry_DoNotUse& other); - static const RayCluster_ConfigOverrideEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_RayCluster_ConfigOverrideEntry_DoNotUse_default_instance_); } - void MergeFrom(const ::google::protobuf::Message& other) final; - ::google::protobuf::Metadata GetMetadata() const; -}; - -// ------------------------------------------------------------------- - class RayCluster final : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.plugins.RayCluster) */ { public: @@ -285,7 +257,7 @@ class RayCluster final : &_RayCluster_default_instance_); } static constexpr int kIndexInFileMessages = - 2; + 1; void Swap(RayCluster* other); friend void swap(RayCluster& a, RayCluster& b) { @@ -340,7 +312,6 @@ class RayCluster final : // nested types ---------------------------------------------------- - // accessors ------------------------------------------------------- // repeated .flyteidl.plugins.WorkerGroupSpec worker_group_spec = 2; @@ -355,18 +326,9 @@ class RayCluster final : const ::google::protobuf::RepeatedPtrField< ::flyteidl::plugins::WorkerGroupSpec >& worker_group_spec() const; - // map config_override = 3; - int config_override_size() const; - void clear_config_override(); - static const int kConfigOverrideFieldNumber = 3; - const ::google::protobuf::Map< ::std::string, ::std::string >& - config_override() const; - ::google::protobuf::Map< ::std::string, ::std::string >* - mutable_config_override(); - - // string namespace = 4; + // string namespace = 3; void clear_namespace_(); - static const int kNamespaceFieldNumber = 4; + static const int kNamespaceFieldNumber = 3; const ::std::string& namespace_() const; void set_namespace_(const ::std::string& value); #if LANG_CXX11 @@ -378,9 +340,9 @@ class RayCluster final : ::std::string* release_namespace_(); void set_allocated_namespace_(::std::string* namespace_); - // string k8s_service_account = 5; + // string k8s_service_account = 4; void clear_k8s_service_account(); - static const int kK8SServiceAccountFieldNumber = 5; + static const int kK8SServiceAccountFieldNumber = 4; const ::std::string& k8s_service_account() const; void set_k8s_service_account(const ::std::string& value); #if LANG_CXX11 @@ -407,12 +369,6 @@ class RayCluster final : ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; ::google::protobuf::RepeatedPtrField< ::flyteidl::plugins::WorkerGroupSpec > worker_group_spec_; - ::google::protobuf::internal::MapField< - RayCluster_ConfigOverrideEntry_DoNotUse, - ::std::string, ::std::string, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - ::google::protobuf::internal::WireFormatLite::TYPE_STRING, - 0 > config_override_; ::google::protobuf::internal::ArenaStringPtr namespace__; ::google::protobuf::internal::ArenaStringPtr k8s_service_account_; ::flyteidl::plugins::HeadGroupSpec* head_group_spec_; @@ -483,7 +439,7 @@ class HeadGroupSpec final : &_HeadGroupSpec_default_instance_); } static constexpr int kIndexInFileMessages = - 4; + 3; void Swap(HeadGroupSpec* other); friend void swap(HeadGroupSpec& a, HeadGroupSpec& b) { @@ -638,7 +594,7 @@ class WorkerGroupSpec final : &_WorkerGroupSpec_default_instance_); } static constexpr int kIndexInFileMessages = - 6; + 5; void Swap(WorkerGroupSpec* other); friend void swap(WorkerGroupSpec& a, WorkerGroupSpec& b) { @@ -882,8 +838,6 @@ inline void RayJob::set_allocated_runtime_env(::std::string* runtime_env) { // ------------------------------------------------------------------- -// ------------------------------------------------------------------- - // RayCluster // .flyteidl.plugins.HeadGroupSpec head_group_spec = 1; @@ -967,25 +921,7 @@ RayCluster::worker_group_spec() const { return worker_group_spec_; } -// map config_override = 3; -inline int RayCluster::config_override_size() const { - return config_override_.size(); -} -inline void RayCluster::clear_config_override() { - config_override_.Clear(); -} -inline const ::google::protobuf::Map< ::std::string, ::std::string >& -RayCluster::config_override() const { - // @@protoc_insertion_point(field_map:flyteidl.plugins.RayCluster.config_override) - return config_override_.GetMap(); -} -inline ::google::protobuf::Map< ::std::string, ::std::string >* -RayCluster::mutable_config_override() { - // @@protoc_insertion_point(field_mutable_map:flyteidl.plugins.RayCluster.config_override) - return config_override_.MutableMap(); -} - -// string namespace = 4; +// string namespace = 3; inline void RayCluster::clear_namespace_() { namespace__.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -1038,7 +974,7 @@ inline void RayCluster::set_allocated_namespace_(::std::string* namespace_) { // @@protoc_insertion_point(field_set_allocated:flyteidl.plugins.RayCluster.namespace) } -// string k8s_service_account = 5; +// string k8s_service_account = 4; inline void RayCluster::clear_k8s_service_account() { k8s_service_account_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -1337,8 +1273,6 @@ inline void WorkerGroupSpec::set_allocated_resources(::flyteidl::core::Resources // ------------------------------------------------------------------- -// ------------------------------------------------------------------- - // @@protoc_insertion_point(namespace_scope) diff --git a/gen/pb-go/flyteidl/plugins/ray.pb.go b/gen/pb-go/flyteidl/plugins/ray.pb.go index 6dd6006e6..499023480 100644 --- a/gen/pb-go/flyteidl/plugins/ray.pb.go +++ b/gen/pb-go/flyteidl/plugins/ray.pb.go @@ -78,12 +78,10 @@ type RayCluster struct { HeadGroupSpec *HeadGroupSpec `protobuf:"bytes,1,opt,name=head_group_spec,json=headGroupSpec,proto3" json:"head_group_spec,omitempty"` // WorkerGroupSpecs are the specs for the worker pods WorkerGroupSpec []*WorkerGroupSpec `protobuf:"bytes,2,rep,name=worker_group_spec,json=workerGroupSpec,proto3" json:"worker_group_spec,omitempty"` - // Additional parameter overrides for ray cluster config - ConfigOverride map[string]string `protobuf:"bytes,3,rep,name=config_override,json=configOverride,proto3" json:"config_override,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Namespace used to create the ray cluster - Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"` + Namespace string `protobuf:"bytes,3,opt,name=namespace,proto3" json:"namespace,omitempty"` // Kubernetes service account used by the ray cluster - K8SServiceAccount string `protobuf:"bytes,5,opt,name=k8s_service_account,json=k8sServiceAccount,proto3" json:"k8s_service_account,omitempty"` + K8SServiceAccount string `protobuf:"bytes,4,opt,name=k8s_service_account,json=k8sServiceAccount,proto3" json:"k8s_service_account,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -128,13 +126,6 @@ func (m *RayCluster) GetWorkerGroupSpec() []*WorkerGroupSpec { return nil } -func (m *RayCluster) GetConfigOverride() map[string]string { - if m != nil { - return m.ConfigOverride - } - return nil -} - func (m *RayCluster) GetNamespace() string { if m != nil { return m.Namespace @@ -290,7 +281,6 @@ func (m *WorkerGroupSpec) GetResources() *core.Resources { func init() { proto.RegisterType((*RayJob)(nil), "flyteidl.plugins.RayJob") proto.RegisterType((*RayCluster)(nil), "flyteidl.plugins.RayCluster") - proto.RegisterMapType((map[string]string)(nil), "flyteidl.plugins.RayCluster.ConfigOverrideEntry") proto.RegisterType((*HeadGroupSpec)(nil), "flyteidl.plugins.HeadGroupSpec") proto.RegisterMapType((map[string]string)(nil), "flyteidl.plugins.HeadGroupSpec.RayStartParamsEntry") proto.RegisterType((*WorkerGroupSpec)(nil), "flyteidl.plugins.WorkerGroupSpec") @@ -300,39 +290,36 @@ func init() { func init() { proto.RegisterFile("flyteidl/plugins/ray.proto", fileDescriptor_b980f6d58c7489d7) } var fileDescriptor_b980f6d58c7489d7 = []byte{ - // 534 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0x95, 0x93, 0xa6, 0x22, 0x13, 0x4a, 0xd2, 0x2d, 0x07, 0x13, 0x15, 0x35, 0xcd, 0x29, 0x17, - 0x6c, 0xd4, 0x0a, 0x08, 0x48, 0x1c, 0x4a, 0x55, 0x15, 0x21, 0xf1, 0xa1, 0xcd, 0x01, 0x81, 0x84, - 0xac, 0xcd, 0x66, 0xea, 0x58, 0xb1, 0x77, 0xad, 0x5d, 0x3b, 0xad, 0xff, 0x05, 0x7f, 0x93, 0x0b, - 0xbf, 0x01, 0x79, 0xed, 0xda, 0x49, 0x1a, 0x51, 0x71, 0xe3, 0xb6, 0xfb, 0xde, 0x9b, 0x37, 0xda, - 0x37, 0xa3, 0x85, 0xfe, 0x55, 0x98, 0x25, 0x18, 0xcc, 0x42, 0x37, 0x0e, 0x53, 0x3f, 0x10, 0xda, - 0x55, 0x2c, 0x73, 0x62, 0x25, 0x13, 0x49, 0x7a, 0xb7, 0x9c, 0x53, 0x72, 0xfd, 0x27, 0x95, 0x9a, - 0x4b, 0x85, 0x6e, 0xc2, 0xf4, 0x42, 0x17, 0xe2, 0xe1, 0x1c, 0x76, 0x29, 0xcb, 0x3e, 0xc8, 0x29, - 0x79, 0x0b, 0x1d, 0xc5, 0x32, 0x8f, 0x87, 0xa9, 0x4e, 0x50, 0xd9, 0xd6, 0xc0, 0x1a, 0x75, 0x4e, - 0x0e, 0x9d, 0x4d, 0x33, 0x87, 0xb2, 0xec, 0xbc, 0xd0, 0x50, 0x50, 0xd5, 0x99, 0x1c, 0x41, 0x47, - 0xa5, 0x22, 0x09, 0x22, 0xf4, 0x50, 0x2c, 0xed, 0xc6, 0xc0, 0x1a, 0xb5, 0x29, 0x94, 0xd0, 0x85, - 0x58, 0x0e, 0x7f, 0x36, 0x01, 0xea, 0x5a, 0x72, 0x09, 0xdd, 0x39, 0xb2, 0x99, 0xe7, 0x2b, 0x99, - 0xc6, 0x9e, 0x8e, 0x91, 0x97, 0x2d, 0x8f, 0xee, 0xb6, 0x7c, 0x8f, 0x6c, 0x76, 0x99, 0xeb, 0x26, - 0x31, 0x72, 0xba, 0x37, 0x5f, 0xbd, 0x92, 0x8f, 0xb0, 0x7f, 0x2d, 0xd5, 0x02, 0xd5, 0xaa, 0x55, - 0x63, 0xd0, 0x1c, 0x75, 0x4e, 0x8e, 0xef, 0x5a, 0x7d, 0x35, 0xd2, 0xda, 0xac, 0x7b, 0xbd, 0x0e, - 0x90, 0x6f, 0xd0, 0xe5, 0x52, 0x5c, 0x05, 0xbe, 0x27, 0x97, 0xa8, 0x54, 0x30, 0x43, 0xbb, 0x69, - 0xcc, 0x9e, 0xff, 0x2d, 0x0a, 0xe7, 0xdc, 0xd4, 0x7c, 0x2e, 0x4b, 0x2e, 0x44, 0xa2, 0x32, 0xfa, - 0x88, 0xaf, 0x81, 0xe4, 0x10, 0xda, 0x82, 0x45, 0xa8, 0x63, 0xc6, 0xd1, 0xde, 0x31, 0x01, 0xd5, - 0x00, 0x71, 0xe0, 0x60, 0x31, 0xd6, 0x9e, 0x46, 0xb5, 0x0c, 0x38, 0x7a, 0x8c, 0x73, 0x99, 0x8a, - 0xc4, 0x6e, 0x19, 0xdd, 0xfe, 0x62, 0xac, 0x27, 0x05, 0x73, 0x56, 0x10, 0xfd, 0x33, 0x38, 0xd8, - 0xd2, 0x94, 0xf4, 0xa0, 0xb9, 0xc0, 0xcc, 0x64, 0xd9, 0xa6, 0xf9, 0x91, 0x3c, 0x86, 0xd6, 0x92, - 0x85, 0x29, 0x96, 0x33, 0x29, 0x2e, 0x6f, 0x1a, 0x63, 0x6b, 0xf8, 0xcb, 0x82, 0xbd, 0xb5, 0x6c, - 0xc9, 0x0f, 0xe8, 0xe5, 0x4b, 0xa0, 0x13, 0xa6, 0x12, 0x2f, 0x66, 0x8a, 0x45, 0xda, 0xb6, 0xcc, - 0xf3, 0x4f, 0xef, 0x19, 0x4b, 0x1e, 0xc6, 0x24, 0x2f, 0xfb, 0x62, 0xaa, 0xca, 0x04, 0xd4, 0x1a, - 0x48, 0x5e, 0x42, 0x5b, 0xa1, 0x96, 0xa9, 0xe2, 0xa8, 0xed, 0x5d, 0x33, 0x6e, 0xbb, 0xf6, 0xcd, - 0x97, 0xd3, 0xa1, 0xb7, 0x3c, 0xad, 0xa5, 0xf9, 0x5b, 0xb7, 0xd8, 0xff, 0xd3, 0x5b, 0x7f, 0x37, - 0xa0, 0xbb, 0x31, 0x7c, 0xf2, 0x14, 0xa0, 0xd8, 0x99, 0x7c, 0x0a, 0xa5, 0x4d, 0xdb, 0x20, 0x9f, - 0x58, 0x84, 0xa4, 0x0f, 0x0f, 0x14, 0xc6, 0x61, 0xc0, 0x99, 0x36, 0x7e, 0x2d, 0x5a, 0xdd, 0xc9, - 0x31, 0x3c, 0x8c, 0x02, 0xe1, 0x55, 0x7c, 0xd3, 0xf0, 0x9d, 0x28, 0x10, 0x74, 0x55, 0xc2, 0x6e, - 0x6a, 0xc9, 0x4e, 0x29, 0x61, 0x37, 0x95, 0xc4, 0xdb, 0x12, 0x77, 0xcb, 0xc4, 0xfd, 0xe2, 0xde, - 0xd5, 0xfd, 0xcf, 0x03, 0x7f, 0xf7, 0xfa, 0xfb, 0x2b, 0x3f, 0x48, 0xe6, 0xe9, 0xd4, 0xe1, 0x32, - 0x72, 0x4d, 0x4f, 0xa9, 0x7c, 0xb7, 0xfa, 0x8a, 0x7c, 0x14, 0x6e, 0x3c, 0x7d, 0xe6, 0x4b, 0x77, - 0xf3, 0x2f, 0x9b, 0xee, 0x9a, 0xbf, 0xe9, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x69, 0x08, - 0x72, 0x7d, 0xe6, 0x04, 0x00, 0x00, + // 495 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0x41, 0x6f, 0xd3, 0x3e, + 0x18, 0xc6, 0x95, 0x76, 0xad, 0xfe, 0x7d, 0xfb, 0x1f, 0xed, 0x3c, 0x0e, 0xa1, 0x1a, 0x5a, 0xd7, + 0x53, 0x2f, 0x24, 0xd2, 0x26, 0xa0, 0x20, 0x71, 0x18, 0x68, 0x1a, 0x42, 0x02, 0x21, 0xf7, 0x80, + 0x84, 0x84, 0x22, 0xd7, 0x7d, 0x49, 0xa3, 0x26, 0x76, 0x64, 0x3b, 0xdd, 0xf2, 0x91, 0xb9, 0x70, + 0xe0, 0x13, 0xa0, 0x38, 0x59, 0xd2, 0x76, 0x93, 0x76, 0xe5, 0x66, 0xbf, 0xcf, 0xcf, 0x8f, 0xed, + 0xe7, 0x8d, 0x03, 0xa3, 0x9f, 0x71, 0x6e, 0x30, 0x5a, 0xc6, 0x7e, 0x1a, 0x67, 0x61, 0x24, 0xb4, + 0xaf, 0x58, 0xee, 0xa5, 0x4a, 0x1a, 0x49, 0x86, 0x77, 0x9a, 0x57, 0x69, 0xa3, 0x67, 0x35, 0xcd, + 0xa5, 0x42, 0xdf, 0x30, 0xbd, 0xd6, 0x25, 0x3c, 0x59, 0x41, 0x97, 0xb2, 0xfc, 0x93, 0x5c, 0x90, + 0x77, 0xd0, 0x57, 0x2c, 0x0f, 0x78, 0x9c, 0x69, 0x83, 0xca, 0x75, 0xc6, 0xce, 0xb4, 0x7f, 0x7e, + 0xe2, 0xed, 0x9b, 0x79, 0x94, 0xe5, 0x1f, 0x4a, 0x86, 0x82, 0xaa, 0xc7, 0xe4, 0x14, 0xfa, 0x2a, + 0x13, 0x26, 0x4a, 0x30, 0x40, 0xb1, 0x71, 0x5b, 0x63, 0x67, 0xda, 0xa3, 0x50, 0x95, 0xae, 0xc4, + 0x66, 0xf2, 0xc7, 0x01, 0x68, 0xd6, 0x92, 0x6b, 0x18, 0xac, 0x90, 0x2d, 0x83, 0x50, 0xc9, 0x2c, + 0x0d, 0x74, 0x8a, 0xbc, 0xda, 0xf2, 0xf4, 0xfe, 0x96, 0x1f, 0x91, 0x2d, 0xaf, 0x0b, 0x6e, 0x9e, + 0x22, 0xa7, 0x87, 0xab, 0xed, 0x29, 0xf9, 0x0c, 0x47, 0x37, 0x52, 0xad, 0x51, 0x6d, 0x5b, 0xb5, + 0xc6, 0xed, 0x69, 0xff, 0xfc, 0xec, 0xbe, 0xd5, 0x37, 0x8b, 0x36, 0x66, 0x83, 0x9b, 0xdd, 0x02, + 0x39, 0x81, 0x9e, 0x60, 0x09, 0xea, 0x94, 0x71, 0x74, 0xdb, 0xf6, 0x16, 0x4d, 0x81, 0x78, 0x70, + 0xbc, 0x9e, 0xe9, 0x40, 0xa3, 0xda, 0x44, 0x1c, 0x03, 0xc6, 0xb9, 0xcc, 0x84, 0x71, 0x0f, 0x2c, + 0x77, 0xb4, 0x9e, 0xe9, 0x79, 0xa9, 0x5c, 0x96, 0xc2, 0xe4, 0x97, 0x03, 0x87, 0x3b, 0xa7, 0x27, + 0x3f, 0x60, 0x58, 0xc4, 0xac, 0x0d, 0x53, 0x26, 0x48, 0x99, 0x62, 0x89, 0x76, 0x1d, 0x7b, 0xda, + 0x8b, 0x47, 0x2e, 0x5e, 0x24, 0x3f, 0x2f, 0x96, 0x7d, 0xb5, 0xab, 0xae, 0x84, 0x51, 0x39, 0x7d, + 0xa2, 0x76, 0x8a, 0xe4, 0x15, 0xf4, 0x14, 0x6a, 0x99, 0x29, 0x8e, 0xda, 0xed, 0xda, 0x40, 0xdd, + 0xc6, 0xb7, 0x68, 0xbf, 0x47, 0xef, 0x74, 0xda, 0xa0, 0xa3, 0x4b, 0x38, 0x7e, 0xc0, 0x9e, 0x0c, + 0xa1, 0xbd, 0xc6, 0xdc, 0x76, 0xa6, 0x47, 0x8b, 0x21, 0x79, 0x0a, 0x9d, 0x0d, 0x8b, 0x33, 0xac, + 0x3a, 0x5c, 0x4e, 0xde, 0xb6, 0x66, 0xce, 0xe4, 0x77, 0x0b, 0x06, 0x7b, 0xf1, 0x92, 0xe7, 0x00, + 0x65, 0x57, 0x8a, 0x08, 0x2b, 0x9b, 0x9e, 0xad, 0x7c, 0x61, 0x09, 0x92, 0x11, 0xfc, 0xa7, 0x30, + 0x8d, 0x23, 0xce, 0xb4, 0xf5, 0xeb, 0xd0, 0x7a, 0x4e, 0xce, 0xe0, 0xff, 0x24, 0x12, 0x41, 0xad, + 0xb7, 0xad, 0xde, 0x4f, 0x22, 0x41, 0xb7, 0x11, 0x76, 0xdb, 0x20, 0x07, 0x15, 0xc2, 0x6e, 0x6b, + 0x24, 0x78, 0x20, 0xee, 0x8e, 0x8d, 0xfb, 0xe5, 0xa3, 0x1f, 0xc7, 0x3f, 0x1e, 0xf8, 0xfb, 0x37, + 0xdf, 0x5f, 0x87, 0x91, 0x59, 0x65, 0x0b, 0x8f, 0xcb, 0xc4, 0xb7, 0x7b, 0x4a, 0x15, 0xfa, 0xf5, + 0x63, 0x0f, 0x51, 0xf8, 0xe9, 0xe2, 0x45, 0x28, 0xfd, 0xfd, 0xbf, 0xc5, 0xa2, 0x6b, 0x5f, 0xff, + 0xc5, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x05, 0x89, 0x97, 0x08, 0x48, 0x04, 0x00, 0x00, } diff --git a/gen/pb-go/flyteidl/plugins/ray.pb.validate.go b/gen/pb-go/flyteidl/plugins/ray.pb.validate.go index 4cad6cb69..2a04e0d38 100644 --- a/gen/pb-go/flyteidl/plugins/ray.pb.validate.go +++ b/gen/pb-go/flyteidl/plugins/ray.pb.validate.go @@ -144,8 +144,6 @@ func (m *RayCluster) Validate() error { } - // no validation rules for ConfigOverride - // no validation rules for Namespace // no validation rules for K8SServiceAccount diff --git a/gen/pb-java/flyteidl/plugins/Ray.java b/gen/pb-java/flyteidl/plugins/Ray.java index db0c4c375..4b6c95141 100644 --- a/gen/pb-java/flyteidl/plugins/Ray.java +++ b/gen/pb-java/flyteidl/plugins/Ray.java @@ -943,66 +943,12 @@ public interface RayClusterOrBuilder extends flyteidl.plugins.Ray.WorkerGroupSpecOrBuilder getWorkerGroupSpecOrBuilder( int index); - /** - * 
-     * Additional parameter overrides for ray cluster config
-     *
- * - * map<string, string> config_override = 3; - */ - int getConfigOverrideCount(); - /** - * 
-     * Additional parameter overrides for ray cluster config
-     *
- * - * map<string, string> config_override = 3; - */ - boolean containsConfigOverride( - java.lang.String key); - /** - * Use {@link #getConfigOverrideMap()} instead. - */ - @java.lang.Deprecated - java.util.Map - getConfigOverride(); - /** - * 
-     * Additional parameter overrides for ray cluster config
-     *
- * - * map<string, string> config_override = 3; - */ - java.util.Map - getConfigOverrideMap(); - /** - * 
-     * Additional parameter overrides for ray cluster config
-     *
- * - * map<string, string> config_override = 3; - */ - - java.lang.String getConfigOverrideOrDefault( - java.lang.String key, - java.lang.String defaultValue); - /** - * 
-     * Additional parameter overrides for ray cluster config
-     *
- * - * map<string, string> config_override = 3; - */ - - java.lang.String getConfigOverrideOrThrow( - java.lang.String key); - /** * 
      * Namespace used to create the ray cluster
      *
* - * string namespace = 4; + * string namespace = 3; */ java.lang.String getNamespace(); /** @@ -1010,7 +956,7 @@ java.lang.String getConfigOverrideOrThrow( * Namespace used to create the ray cluster * * - * string namespace = 4; + * string namespace = 3; */ com.google.protobuf.ByteString getNamespaceBytes(); @@ -1020,7 +966,7 @@ java.lang.String getConfigOverrideOrThrow( * Kubernetes service account used by the ray cluster * * - * string k8s_service_account = 5; + * string k8s_service_account = 4; */ java.lang.String getK8SServiceAccount(); /** @@ -1028,7 +974,7 @@ java.lang.String getConfigOverrideOrThrow( * Kubernetes service account used by the ray cluster * * - * string k8s_service_account = 5; + * string k8s_service_account = 4; */ com.google.protobuf.ByteString getK8SServiceAccountBytes(); @@ -1102,25 +1048,12 @@ private RayCluster( break; } case 26: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - configOverride_ = com.google.protobuf.MapField.newMapField( - ConfigOverrideDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000004; - } - com.google.protobuf.MapEntry - configOverride__ = input.readMessage( - ConfigOverrideDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - configOverride_.getMutableMap().put( - configOverride__.getKey(), configOverride__.getValue()); - break; - } - case 34: { java.lang.String s = input.readStringRequireUtf8(); namespace_ = s; break; } - case 42: { + case 34: { java.lang.String s = input.readStringRequireUtf8(); k8SServiceAccount_ = s; @@ -1153,18 +1086,6 @@ private RayCluster( return flyteidl.plugins.Ray.internal_static_flyteidl_plugins_RayCluster_descriptor; } - @SuppressWarnings({"rawtypes"}) - @java.lang.Override - protected com.google.protobuf.MapField internalGetMapField( - int number) { - switch (number) { - case 3: - return internalGetConfigOverride(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { @@ -1262,106 +1183,14 @@ public flyteidl.plugins.Ray.WorkerGroupSpecOrBuilder getWorkerGroupSpecOrBuilder return workerGroupSpec_.get(index); } - public static final int CONFIG_OVERRIDE_FIELD_NUMBER = 3; - private static final class ConfigOverrideDefaultEntryHolder { - static final com.google.protobuf.MapEntry< - java.lang.String, java.lang.String> defaultEntry = - com.google.protobuf.MapEntry - .newDefaultInstance( - flyteidl.plugins.Ray.internal_static_flyteidl_plugins_RayCluster_ConfigOverrideEntry_descriptor, - com.google.protobuf.WireFormat.FieldType.STRING, - "", - com.google.protobuf.WireFormat.FieldType.STRING, - ""); - } - private com.google.protobuf.MapField< - java.lang.String, java.lang.String> configOverride_; - private com.google.protobuf.MapField - internalGetConfigOverride() { - if (configOverride_ == null) { - return com.google.protobuf.MapField.emptyMapField( - ConfigOverrideDefaultEntryHolder.defaultEntry); - } - return configOverride_; - } - - public int getConfigOverrideCount() { - return internalGetConfigOverride().getMap().size(); - } - /** - * 
-     * Additional parameter overrides for ray cluster config
-     *
- * - * map<string, string> config_override = 3; - */ - - public boolean containsConfigOverride( - java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } - return internalGetConfigOverride().getMap().containsKey(key); - } - /** - * Use {@link #getConfigOverrideMap()} instead. - */ - @java.lang.Deprecated - public java.util.Map getConfigOverride() { - return getConfigOverrideMap(); - } - /** - * 
-     * Additional parameter overrides for ray cluster config
-     *
- * - * map<string, string> config_override = 3; - */ - - public java.util.Map getConfigOverrideMap() { - return internalGetConfigOverride().getMap(); - } - /** - * 
-     * Additional parameter overrides for ray cluster config
-     *
- * - * map<string, string> config_override = 3; - */ - - public java.lang.String getConfigOverrideOrDefault( - java.lang.String key, - java.lang.String defaultValue) { - if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetConfigOverride().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; - } - /** - * 
-     * Additional parameter overrides for ray cluster config
-     *
- * - * map<string, string> config_override = 3; - */ - - public java.lang.String getConfigOverrideOrThrow( - java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetConfigOverride().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); - } - return map.get(key); - } - - public static final int NAMESPACE_FIELD_NUMBER = 4; + public static final int NAMESPACE_FIELD_NUMBER = 3; private volatile java.lang.Object namespace_; /** * 
      * Namespace used to create the ray cluster
      *
* - * string namespace = 4; + * string namespace = 3; */ public java.lang.String getNamespace() { java.lang.Object ref = namespace_; @@ -1380,7 +1209,7 @@ public java.lang.String getNamespace() { * Namespace used to create the ray cluster * * - * string namespace = 4; + * string namespace = 3; */ public com.google.protobuf.ByteString getNamespaceBytes() { @@ -1396,14 +1225,14 @@ public java.lang.String getNamespace() { } } - public static final int K8S_SERVICE_ACCOUNT_FIELD_NUMBER = 5; + public static final int K8S_SERVICE_ACCOUNT_FIELD_NUMBER = 4; private volatile java.lang.Object k8SServiceAccount_; /** * 
      * Kubernetes service account used by the ray cluster
      *
* - * string k8s_service_account = 5; + * string k8s_service_account = 4; */ public java.lang.String getK8SServiceAccount() { java.lang.Object ref = k8SServiceAccount_; @@ -1422,7 +1251,7 @@ public java.lang.String getK8SServiceAccount() { * Kubernetes service account used by the ray cluster * * - * string k8s_service_account = 5; + * string k8s_service_account = 4; */ public com.google.protobuf.ByteString getK8SServiceAccountBytes() { @@ -1458,17 +1287,11 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < workerGroupSpec_.size(); i++) { output.writeMessage(2, workerGroupSpec_.get(i)); } - com.google.protobuf.GeneratedMessageV3 - .serializeStringMapTo( - output, - internalGetConfigOverride(), - ConfigOverrideDefaultEntryHolder.defaultEntry, - 3); if (!getNamespaceBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 4, namespace_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, namespace_); } if (!getK8SServiceAccountBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 5, k8SServiceAccount_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, k8SServiceAccount_); } unknownFields.writeTo(output); } @@ -1487,21 +1310,11 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(2, workerGroupSpec_.get(i)); } - for (java.util.Map.Entry entry - : internalGetConfigOverride().getMap().entrySet()) { - com.google.protobuf.MapEntry - configOverride__ = ConfigOverrideDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, configOverride__); - } if (!getNamespaceBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, namespace_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, namespace_); } if (!getK8SServiceAccountBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, k8SServiceAccount_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, k8SServiceAccount_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -1525,8 +1338,6 @@ public boolean equals(final java.lang.Object obj) { } if (!getWorkerGroupSpecList() .equals(other.getWorkerGroupSpecList())) return false; - if (!internalGetConfigOverride().equals( - other.internalGetConfigOverride())) return false; if (!getNamespace() .equals(other.getNamespace())) return false; if (!getK8SServiceAccount() @@ -1550,10 +1361,6 @@ public int hashCode() { hash = (37 * hash) + WORKER_GROUP_SPEC_FIELD_NUMBER; hash = (53 * hash) + getWorkerGroupSpecList().hashCode(); } - if (!internalGetConfigOverride().getMap().isEmpty()) { - hash = (37 * hash) + CONFIG_OVERRIDE_FIELD_NUMBER; - hash = (53 * hash) + internalGetConfigOverride().hashCode(); - } hash = (37 * hash) + NAMESPACE_FIELD_NUMBER; hash = (53 * hash) + getNamespace().hashCode(); hash = (37 * hash) + K8S_SERVICE_ACCOUNT_FIELD_NUMBER; @@ -1669,28 +1476,6 @@ public static final class Builder extends return flyteidl.plugins.Ray.internal_static_flyteidl_plugins_RayCluster_descriptor; } - @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMapField( - int number) { - switch (number) { - case 3: - return internalGetConfigOverride(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } - @SuppressWarnings({"rawtypes"}) - protected com.google.protobuf.MapField internalGetMutableMapField( - int number) { - switch (number) { - case 3: - return internalGetMutableConfigOverride(); - default: - throw new RuntimeException( - "Invalid map field number: " + number); - } - } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { @@ -1730,7 +1515,6 @@ public Builder clear() { } else { workerGroupSpecBuilder_.clear(); } - internalGetMutableConfigOverride().clear(); namespace_ = ""; k8SServiceAccount_ = ""; @@ -1777,8 +1561,6 @@ public flyteidl.plugins.Ray.RayCluster buildPartial() { } else { result.workerGroupSpec_ = workerGroupSpecBuilder_.build(); } - result.configOverride_ = internalGetConfigOverride(); - result.configOverride_.makeImmutable(); result.namespace_ = namespace_; result.k8SServiceAccount_ = k8SServiceAccount_; result.bitField0_ = to_bitField0_; @@ -1859,8 +1641,6 @@ public Builder mergeFrom(flyteidl.plugins.Ray.RayCluster other) { } } } - internalGetMutableConfigOverride().mergeFrom( - other.internalGetConfigOverride()); if (!other.getNamespace().isEmpty()) { namespace_ = other.namespace_; onChanged(); @@ -2364,164 +2144,13 @@ public flyteidl.plugins.Ray.WorkerGroupSpec.Builder addWorkerGroupSpecBuilder( return workerGroupSpecBuilder_; } - private com.google.protobuf.MapField< - java.lang.String, java.lang.String> configOverride_; - private com.google.protobuf.MapField - internalGetConfigOverride() { - if (configOverride_ == null) { - return com.google.protobuf.MapField.emptyMapField( - ConfigOverrideDefaultEntryHolder.defaultEntry); - } - return configOverride_; - } - private com.google.protobuf.MapField - internalGetMutableConfigOverride() { - onChanged();; - if (configOverride_ == null) { - configOverride_ = com.google.protobuf.MapField.newMapField( - ConfigOverrideDefaultEntryHolder.defaultEntry); - } - if (!configOverride_.isMutable()) { - configOverride_ = configOverride_.copy(); - } - return configOverride_; - } - - public int getConfigOverrideCount() { - return internalGetConfigOverride().getMap().size(); - } - /** - * 
-       * Additional parameter overrides for ray cluster config
-       *
- * - * map<string, string> config_override = 3; - */ - - public boolean containsConfigOverride( - java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } - return internalGetConfigOverride().getMap().containsKey(key); - } - /** - * Use {@link #getConfigOverrideMap()} instead. - */ - @java.lang.Deprecated - public java.util.Map getConfigOverride() { - return getConfigOverrideMap(); - } - /** - * 
-       * Additional parameter overrides for ray cluster config
-       *
- * - * map<string, string> config_override = 3; - */ - - public java.util.Map getConfigOverrideMap() { - return internalGetConfigOverride().getMap(); - } - /** - * 
-       * Additional parameter overrides for ray cluster config
-       *
- * - * map<string, string> config_override = 3; - */ - - public java.lang.String getConfigOverrideOrDefault( - java.lang.String key, - java.lang.String defaultValue) { - if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetConfigOverride().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; - } - /** - * 
-       * Additional parameter overrides for ray cluster config
-       *
- * - * map<string, string> config_override = 3; - */ - - public java.lang.String getConfigOverrideOrThrow( - java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } - java.util.Map map = - internalGetConfigOverride().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); - } - return map.get(key); - } - - public Builder clearConfigOverride() { - internalGetMutableConfigOverride().getMutableMap() - .clear(); - return this; - } - /** - * 
-       * Additional parameter overrides for ray cluster config
-       *
- * - * map<string, string> config_override = 3; - */ - - public Builder removeConfigOverride( - java.lang.String key) { - if (key == null) { throw new java.lang.NullPointerException(); } - internalGetMutableConfigOverride().getMutableMap() - .remove(key); - return this; - } - /** - * Use alternate mutation accessors instead. - */ - @java.lang.Deprecated - public java.util.Map - getMutableConfigOverride() { - return internalGetMutableConfigOverride().getMutableMap(); - } - /** - * 
-       * Additional parameter overrides for ray cluster config
-       *
- * - * map<string, string> config_override = 3; - */ - public Builder putConfigOverride( - java.lang.String key, - java.lang.String value) { - if (key == null) { throw new java.lang.NullPointerException(); } - if (value == null) { throw new java.lang.NullPointerException(); } - internalGetMutableConfigOverride().getMutableMap() - .put(key, value); - return this; - } - /** - * 
-       * Additional parameter overrides for ray cluster config
-       *
- * - * map<string, string> config_override = 3; - */ - - public Builder putAllConfigOverride( - java.util.Map values) { - internalGetMutableConfigOverride().getMutableMap() - .putAll(values); - return this; - } - private java.lang.Object namespace_ = ""; /** * 
        * Namespace used to create the ray cluster
        *
* - * string namespace = 4; + * string namespace = 3; */ public java.lang.String getNamespace() { java.lang.Object ref = namespace_; @@ -2540,7 +2169,7 @@ public java.lang.String getNamespace() { * Namespace used to create the ray cluster * * - * string namespace = 4; + * string namespace = 3; */ public com.google.protobuf.ByteString getNamespaceBytes() { @@ -2560,7 +2189,7 @@ public java.lang.String getNamespace() { * Namespace used to create the ray cluster * * - * string namespace = 4; + * string namespace = 3; */ public Builder setNamespace( java.lang.String value) { @@ -2577,7 +2206,7 @@ public Builder setNamespace( * Namespace used to create the ray cluster * * - * string namespace = 4; + * string namespace = 3; */ public Builder clearNamespace() { @@ -2590,7 +2219,7 @@ public Builder clearNamespace() { * Namespace used to create the ray cluster * * - * string namespace = 4; + * string namespace = 3; */ public Builder setNamespaceBytes( com.google.protobuf.ByteString value) { @@ -2610,7 +2239,7 @@ public Builder setNamespaceBytes( * Kubernetes service account used by the ray cluster * * - * string k8s_service_account = 5; + * string k8s_service_account = 4; */ public java.lang.String getK8SServiceAccount() { java.lang.Object ref = k8SServiceAccount_; @@ -2629,7 +2258,7 @@ public java.lang.String getK8SServiceAccount() { * Kubernetes service account used by the ray cluster * * - * string k8s_service_account = 5; + * string k8s_service_account = 4; */ public com.google.protobuf.ByteString getK8SServiceAccountBytes() { @@ -2649,7 +2278,7 @@ public java.lang.String getK8SServiceAccount() { * Kubernetes service account used by the ray cluster * * - * string k8s_service_account = 5; + * string k8s_service_account = 4; */ public Builder setK8SServiceAccount( java.lang.String value) { @@ -2666,7 +2295,7 @@ public Builder setK8SServiceAccount( * Kubernetes service account used by the ray cluster * * - * string k8s_service_account = 5; + * string k8s_service_account = 4; */ public Builder clearK8SServiceAccount() { @@ -2679,7 +2308,7 @@ public Builder clearK8SServiceAccount() { * Kubernetes service account used by the ray cluster * * - * string k8s_service_account = 5; + * string k8s_service_account = 4; */ public Builder setK8SServiceAccountBytes( com.google.protobuf.ByteString value) { @@ -5306,11 +4935,6 @@ public flyteidl.plugins.Ray.WorkerGroupSpec getDefaultInstanceForType() { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_flyteidl_plugins_RayCluster_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_flyteidl_plugins_RayCluster_ConfigOverrideEntry_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_flyteidl_plugins_RayCluster_ConfigOverrideEntry_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_flyteidl_plugins_HeadGroupSpec_descriptor; private static final @@ -5343,29 +4967,26 @@ public flyteidl.plugins.Ray.WorkerGroupSpec getDefaultInstanceForType() { "\n\032flyteidl/plugins/ray.proto\022\020flyteidl.p" + "lugins\032\031flyteidl/core/tasks.proto\"P\n\006Ray" + "Job\0221\n\013ray_cluster\030\001 \001(\0132\034.flyteidl.plug" + - "ins.RayCluster\022\023\n\013runtime_env\030\002 \001(\t\"\266\002\n\n" + + "ins.RayCluster\022\023\n\013runtime_env\030\002 \001(\t\"\264\001\n\n" + "RayCluster\0228\n\017head_group_spec\030\001 \001(\0132\037.fl" + "yteidl.plugins.HeadGroupSpec\022<\n\021worker_g" + "roup_spec\030\002 \003(\0132!.flyteidl.plugins.Worke" + - "rGroupSpec\022I\n\017config_override\030\003 \003(\01320.fl" + - "yteidl.plugins.RayCluster.ConfigOverride" + - "Entry\022\021\n\tnamespace\030\004 \001(\t\022\033\n\023k8s_service_" + - "account\030\005 \001(\t\0325\n\023ConfigOverrideEntry\022\013\n\003" + - "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\302\001\n\rHeadGro" + - "upSpec\022M\n\020ray_start_params\030\001 \003(\01323.flyte" + - "idl.plugins.HeadGroupSpec.RayStartParams" + - "Entry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.core" + - ".Resources\0325\n\023RayStartParamsEntry\022\013\n\003key" + - "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\230\002\n\017WorkerGrou" + - "pSpec\022\022\n\ngroup_name\030\001 \001(\t\022\020\n\010replicas\030\002 " + - "\001(\005\022\024\n\014min_replicas\030\003 \001(\005\022\024\n\014max_replica" + - "s\030\004 \001(\005\022O\n\020ray_start_params\030\005 \003(\01325.flyt" + - "eidl.plugins.WorkerGroupSpec.RayStartPar" + - "amsEntry\022+\n\tresources\030\006 \001(\0132\030.flyteidl.c" + - "ore.Resources\0325\n\023RayStartParamsEntry\022\013\n\003" + - "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B9Z7github.c" + - "om/flyteorg/flyteidl/gen/pb-go/flyteidl/" + - "pluginsb\006proto3" + "rGroupSpec\022\021\n\tnamespace\030\003 \001(\t\022\033\n\023k8s_ser" + + "vice_account\030\004 \001(\t\"\302\001\n\rHeadGroupSpec\022M\n\020" + + "ray_start_params\030\001 \003(\01323.flyteidl.plugin" + + "s.HeadGroupSpec.RayStartParamsEntry\022+\n\tr" + + "esources\030\006 \001(\0132\030.flyteidl.core.Resources" + + "\0325\n\023RayStartParamsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" + + "value\030\002 \001(\t:\0028\001\"\230\002\n\017WorkerGroupSpec\022\022\n\ng" + + "roup_name\030\001 \001(\t\022\020\n\010replicas\030\002 \001(\005\022\024\n\014min" + + "_replicas\030\003 \001(\005\022\024\n\014max_replicas\030\004 \001(\005\022O\n" + + "\020ray_start_params\030\005 \003(\01325.flyteidl.plugi" + + "ns.WorkerGroupSpec.RayStartParamsEntry\022+" + + "\n\tresources\030\006 \001(\0132\030.flyteidl.core.Resour" + + "ces\0325\n\023RayStartParamsEntry\022\013\n\003key\030\001 \001(\t\022" + + "\r\n\005value\030\002 \001(\t:\0028\001B9Z7github.com/flyteor" + + "g/flyteidl/gen/pb-go/flyteidl/pluginsb\006p" + + "roto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -5391,13 +5012,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_plugins_RayCluster_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_plugins_RayCluster_descriptor, - new java.lang.String[] { "HeadGroupSpec", "WorkerGroupSpec", "ConfigOverride", "Namespace", "K8SServiceAccount", }); - internal_static_flyteidl_plugins_RayCluster_ConfigOverrideEntry_descriptor = - internal_static_flyteidl_plugins_RayCluster_descriptor.getNestedTypes().get(0); - internal_static_flyteidl_plugins_RayCluster_ConfigOverrideEntry_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_flyteidl_plugins_RayCluster_ConfigOverrideEntry_descriptor, - new java.lang.String[] { "Key", "Value", }); + new java.lang.String[] { "HeadGroupSpec", "WorkerGroupSpec", "Namespace", "K8SServiceAccount", }); internal_static_flyteidl_plugins_HeadGroupSpec_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_flyteidl_plugins_HeadGroupSpec_fieldAccessorTable = new diff --git a/gen/pb_python/flyteidl/plugins/ray_pb2.py b/gen/pb_python/flyteidl/plugins/ray_pb2.py index 0adebc9c7..83a30be73 100644 --- a/gen/pb_python/flyteidl/plugins/ray_pb2.py +++ b/gen/pb_python/flyteidl/plugins/ray_pb2.py @@ -14,7 +14,7 @@ from flyteidl.core import tasks_pb2 as flyteidl_dot_core_dot_tasks__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/plugins/ray.proto\x12\x10\x66lyteidl.plugins\x1a\x19\x66lyteidl/core/tasks.proto\"h\n\x06RayJob\x12=\n\x0bray_cluster\x18\x01 \x01(\x0b\x32\x1c.flyteidl.plugins.RayClusterR\nrayCluster\x12\x1f\n\x0bruntime_env\x18\x02 \x01(\tR\nruntimeEnv\"\x90\x03\n\nRayCluster\x12G\n\x0fhead_group_spec\x18\x01 \x01(\x0b\x32\x1f.flyteidl.plugins.HeadGroupSpecR\rheadGroupSpec\x12M\n\x11worker_group_spec\x18\x02 \x03(\x0b\x32!.flyteidl.plugins.WorkerGroupSpecR\x0fworkerGroupSpec\x12Y\n\x0f\x63onfig_override\x18\x03 \x03(\x0b\x32\x30.flyteidl.plugins.RayCluster.ConfigOverrideEntryR\x0e\x63onfigOverride\x12\x1c\n\tnamespace\x18\x04 \x01(\tR\tnamespace\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x1a\x41\n\x13\x43onfigOverrideEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xe9\x01\n\rHeadGroupSpec\x12]\n\x10ray_start_params\x18\x01 \x03(\x0b\x32\x33.flyteidl.plugins.HeadGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xee\x02\n\x0fWorkerGroupSpec\x12\x1d\n\ngroup_name\x18\x01 \x01(\tR\tgroupName\x12\x1a\n\x08replicas\x18\x02 \x01(\x05R\x08replicas\x12!\n\x0cmin_replicas\x18\x03 \x01(\x05R\x0bminReplicas\x12!\n\x0cmax_replicas\x18\x04 \x01(\x05R\x0bmaxReplicas\x12_\n\x10ray_start_params\x18\x05 \x03(\x0b\x32\x35.flyteidl.plugins.WorkerGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\xba\x01\n\x14\x63om.flyteidl.pluginsB\x08RayProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins\xa2\x02\x03\x46PX\xaa\x02\x10\x46lyteidl.Plugins\xca\x02\x10\x46lyteidl\\Plugins\xe2\x02\x1c\x46lyteidl\\Plugins\\GPBMetadata\xea\x02\x11\x46lyteidl::Pluginsb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/plugins/ray.proto\x12\x10\x66lyteidl.plugins\x1a\x19\x66lyteidl/core/tasks.proto\"h\n\x06RayJob\x12=\n\x0bray_cluster\x18\x01 \x01(\x0b\x32\x1c.flyteidl.plugins.RayClusterR\nrayCluster\x12\x1f\n\x0bruntime_env\x18\x02 \x01(\tR\nruntimeEnv\"\xf2\x01\n\nRayCluster\x12G\n\x0fhead_group_spec\x18\x01 \x01(\x0b\x32\x1f.flyteidl.plugins.HeadGroupSpecR\rheadGroupSpec\x12M\n\x11worker_group_spec\x18\x02 \x03(\x0b\x32!.flyteidl.plugins.WorkerGroupSpecR\x0fworkerGroupSpec\x12\x1c\n\tnamespace\x18\x03 \x01(\tR\tnamespace\x12.\n\x13k8s_service_account\x18\x04 \x01(\tR\x11k8sServiceAccount\"\xe9\x01\n\rHeadGroupSpec\x12]\n\x10ray_start_params\x18\x01 \x03(\x0b\x32\x33.flyteidl.plugins.HeadGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xee\x02\n\x0fWorkerGroupSpec\x12\x1d\n\ngroup_name\x18\x01 \x01(\tR\tgroupName\x12\x1a\n\x08replicas\x18\x02 \x01(\x05R\x08replicas\x12!\n\x0cmin_replicas\x18\x03 \x01(\x05R\x0bminReplicas\x12!\n\x0cmax_replicas\x18\x04 \x01(\x05R\x0bmaxReplicas\x12_\n\x10ray_start_params\x18\x05 \x03(\x0b\x32\x35.flyteidl.plugins.WorkerGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\xba\x01\n\x14\x63om.flyteidl.pluginsB\x08RayProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins\xa2\x02\x03\x46PX\xaa\x02\x10\x46lyteidl.Plugins\xca\x02\x10\x46lyteidl\\Plugins\xe2\x02\x1c\x46lyteidl\\Plugins\\GPBMetadata\xea\x02\x11\x46lyteidl::Pluginsb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -23,8 +23,6 @@ DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\024com.flyteidl.pluginsB\010RayProtoP\001Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins\242\002\003FPX\252\002\020Flyteidl.Plugins\312\002\020Flyteidl\\Plugins\342\002\034Flyteidl\\Plugins\\GPBMetadata\352\002\021Flyteidl::Plugins' - _RAYCLUSTER_CONFIGOVERRIDEENTRY._options = None - _RAYCLUSTER_CONFIGOVERRIDEENTRY._serialized_options = b'8\001' _HEADGROUPSPEC_RAYSTARTPARAMSENTRY._options = None _HEADGROUPSPEC_RAYSTARTPARAMSENTRY._serialized_options = b'8\001' _WORKERGROUPSPEC_RAYSTARTPARAMSENTRY._options = None @@ -32,15 +30,13 @@ _globals['_RAYJOB']._serialized_start=75 _globals['_RAYJOB']._serialized_end=179 _globals['_RAYCLUSTER']._serialized_start=182 - _globals['_RAYCLUSTER']._serialized_end=582 - _globals['_RAYCLUSTER_CONFIGOVERRIDEENTRY']._serialized_start=517 - _globals['_RAYCLUSTER_CONFIGOVERRIDEENTRY']._serialized_end=582 - _globals['_HEADGROUPSPEC']._serialized_start=585 - _globals['_HEADGROUPSPEC']._serialized_end=818 - _globals['_HEADGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_start=753 - _globals['_HEADGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_end=818 - _globals['_WORKERGROUPSPEC']._serialized_start=821 - _globals['_WORKERGROUPSPEC']._serialized_end=1187 - _globals['_WORKERGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_start=753 - _globals['_WORKERGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_end=818 + _globals['_RAYCLUSTER']._serialized_end=424 + _globals['_HEADGROUPSPEC']._serialized_start=427 + _globals['_HEADGROUPSPEC']._serialized_end=660 + _globals['_HEADGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_start=595 + _globals['_HEADGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_end=660 + _globals['_WORKERGROUPSPEC']._serialized_start=663 + _globals['_WORKERGROUPSPEC']._serialized_end=1029 + _globals['_WORKERGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_start=595 + _globals['_WORKERGROUPSPEC_RAYSTARTPARAMSENTRY']._serialized_end=660 # @@protoc_insertion_point(module_scope) diff --git a/gen/pb_python/flyteidl/plugins/ray_pb2.pyi b/gen/pb_python/flyteidl/plugins/ray_pb2.pyi index 9daf39a40..e6dae6ce8 100644 --- a/gen/pb_python/flyteidl/plugins/ray_pb2.pyi +++ b/gen/pb_python/flyteidl/plugins/ray_pb2.pyi @@ -15,25 +15,16 @@ class RayJob(_message.Message): def __init__(self, ray_cluster: _Optional[_Union[RayCluster, _Mapping]] = ..., runtime_env: _Optional[str] = ...) -> None: ... class RayCluster(_message.Message): - __slots__ = ["head_group_spec", "worker_group_spec", "config_override", "namespace", "k8s_service_account"] - class ConfigOverrideEntry(_message.Message): - __slots__ = ["key", "value"] - KEY_FIELD_NUMBER: _ClassVar[int] - VALUE_FIELD_NUMBER: _ClassVar[int] - key: str - value: str - def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ... + __slots__ = ["head_group_spec", "worker_group_spec", "namespace", "k8s_service_account"] HEAD_GROUP_SPEC_FIELD_NUMBER: _ClassVar[int] WORKER_GROUP_SPEC_FIELD_NUMBER: _ClassVar[int] - CONFIG_OVERRIDE_FIELD_NUMBER: _ClassVar[int] NAMESPACE_FIELD_NUMBER: _ClassVar[int] K8S_SERVICE_ACCOUNT_FIELD_NUMBER: _ClassVar[int] head_group_spec: HeadGroupSpec worker_group_spec: _containers.RepeatedCompositeFieldContainer[WorkerGroupSpec] - config_override: _containers.ScalarMap[str, str] namespace: str k8s_service_account: str - def __init__(self, head_group_spec: _Optional[_Union[HeadGroupSpec, _Mapping]] = ..., worker_group_spec: _Optional[_Iterable[_Union[WorkerGroupSpec, _Mapping]]] = ..., config_override: _Optional[_Mapping[str, str]] = ..., namespace: _Optional[str] = ..., k8s_service_account: _Optional[str] = ...) -> None: ... + def __init__(self, head_group_spec: _Optional[_Union[HeadGroupSpec, _Mapping]] = ..., worker_group_spec: _Optional[_Iterable[_Union[WorkerGroupSpec, _Mapping]]] = ..., namespace: _Optional[str] = ..., k8s_service_account: _Optional[str] = ...) -> None: ... class HeadGroupSpec(_message.Message): __slots__ = ["ray_start_params", "resources"] diff --git a/gen/pb_rust/flyteidl.plugins.rs b/gen/pb_rust/flyteidl.plugins.rs index 273a05e7c..c57c540f5 100644 --- a/gen/pb_rust/flyteidl.plugins.rs +++ b/gen/pb_rust/flyteidl.plugins.rs @@ -186,14 +186,11 @@ pub struct RayCluster { /// WorkerGroupSpecs are the specs for the worker pods #[prost(message, repeated, tag="2")] pub worker_group_spec: ::prost::alloc::vec::Vec, - /// Additional parameter overrides for ray cluster config - #[prost(map="string, string", tag="3")] - pub config_override: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>, /// Namespace used to create the ray cluster - #[prost(string, tag="4")] + #[prost(string, tag="3")] pub namespace: ::prost::alloc::string::String, /// Kubernetes service account used by the ray cluster - #[prost(string, tag="5")] + #[prost(string, tag="4")] pub k8s_service_account: ::prost::alloc::string::String, } /// HeadGroupSpec are the spec for the head pod diff --git a/protos/flyteidl/plugins/ray.proto b/protos/flyteidl/plugins/ray.proto index d53ebf796..9821d429d 100644 --- a/protos/flyteidl/plugins/ray.proto +++ b/protos/flyteidl/plugins/ray.proto @@ -21,12 +21,10 @@ message RayCluster { HeadGroupSpec head_group_spec = 1; // WorkerGroupSpecs are the specs for the worker pods repeated WorkerGroupSpec worker_group_spec = 2; - // Additional parameter overrides for ray cluster config - map config_override = 3; // Namespace used to create the ray cluster - string namespace = 4; + string namespace = 3; // Kubernetes service account used by the ray cluster - string k8s_service_account = 5; + string k8s_service_account = 4; } // HeadGroupSpec are the spec for the head pod From 8724b7f64402db92075f12c4a34c9520d680aed8 Mon Sep 17 00:00:00 2001 From: Guozhen La <68618788+guozhen-la@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:58:28 -0400 Subject: [PATCH 8/9] Update protos/flyteidl/plugins/ray.proto Co-authored-by: Kevin Su Signed-off-by: Guozhen La <68618788+guozhen-la@users.noreply.github.com> --- protos/flyteidl/plugins/ray.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/flyteidl/plugins/ray.proto b/protos/flyteidl/plugins/ray.proto index 9821d429d..899594423 100644 --- a/protos/flyteidl/plugins/ray.proto +++ b/protos/flyteidl/plugins/ray.proto @@ -33,7 +33,7 @@ message HeadGroupSpec { // Refer to https://docs.ray.io/en/latest/ray-core/package-ref.html#ray-start map ray_start_params = 1; // Resource specification for ray head pod - core.Resources resources = 6; + core.Resources resources = 2; } // WorkerGroupSpec are the specs for the worker pods From 12cd0c86ce99a97c997367d99e63fc0841755d1d Mon Sep 17 00:00:00 2001 From: Guozhen La Date: Wed, 9 Aug 2023 17:28:24 -0400 Subject: [PATCH 9/9] generate Signed-off-by: Guozhen La --- gen/pb-cpp/flyteidl/plugins/ray.pb.cc | 24 ++++---- gen/pb-cpp/flyteidl/plugins/ray.pb.h | 6 +- gen/pb-go/flyteidl/plugins/ray.pb.go | 67 ++++++++++++----------- gen/pb-java/flyteidl/plugins/Ray.java | 40 +++++++------- gen/pb_python/flyteidl/plugins/ray_pb2.py | 2 +- gen/pb_rust/flyteidl.plugins.rs | 2 +- 6 files changed, 71 insertions(+), 70 deletions(-) diff --git a/gen/pb-cpp/flyteidl/plugins/ray.pb.cc b/gen/pb-cpp/flyteidl/plugins/ray.pb.cc index 16f9d137b..1eebe5a61 100644 --- a/gen/pb-cpp/flyteidl/plugins/ray.pb.cc +++ b/gen/pb-cpp/flyteidl/plugins/ray.pb.cc @@ -242,7 +242,7 @@ const char descriptor_table_protodef_flyteidl_2fplugins_2fray_2eproto[] = "vice_account\030\004 \001(\t\"\302\001\n\rHeadGroupSpec\022M\n\020" "ray_start_params\030\001 \003(\01323.flyteidl.plugin" "s.HeadGroupSpec.RayStartParamsEntry\022+\n\tr" - "esources\030\006 \001(\0132\030.flyteidl.core.Resources" + "esources\030\002 \001(\0132\030.flyteidl.core.Resources" "\0325\n\023RayStartParamsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" "value\030\002 \001(\t:\0028\001\"\230\002\n\017WorkerGroupSpec\022\022\n\ng" "roup_name\030\001 \001(\t\022\020\n\010replicas\030\002 \001(\005\022\024\n\014min" @@ -1290,9 +1290,9 @@ const char* HeadGroupSpec::_InternalParse(const char* begin, const char* end, vo } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 10 && (ptr += 1)); break; } - // .flyteidl.core.Resources resources = 6; - case 6: { - if (static_cast<::google::protobuf::uint8>(tag) != 50) goto handle_unusual; + // .flyteidl.core.Resources resources = 2; + case 2: { + if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); parser_till_end = ::flyteidl::core::Resources::_InternalParse; @@ -1359,9 +1359,9 @@ bool HeadGroupSpec::MergePartialFromCodedStream( break; } - // .flyteidl.core.Resources resources = 6; - case 6: { - if (static_cast< ::google::protobuf::uint8>(tag) == (50 & 0xFF)) { + // .flyteidl.core.Resources resources = 2; + case 2: { + if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, mutable_resources())); } else { @@ -1446,10 +1446,10 @@ void HeadGroupSpec::SerializeWithCachedSizes( } } - // .flyteidl.core.Resources resources = 6; + // .flyteidl.core.Resources resources = 2; if (this->has_resources()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 6, HasBitSetters::resources(this), output); + 2, HasBitSetters::resources(this), output); } if (_internal_metadata_.have_unknown_fields()) { @@ -1514,11 +1514,11 @@ ::google::protobuf::uint8* HeadGroupSpec::InternalSerializeWithCachedSizesToArra } } - // .flyteidl.core.Resources resources = 6; + // .flyteidl.core.Resources resources = 2; if (this->has_resources()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 6, HasBitSetters::resources(this), target); + 2, HasBitSetters::resources(this), target); } if (_internal_metadata_.have_unknown_fields()) { @@ -1556,7 +1556,7 @@ size_t HeadGroupSpec::ByteSizeLong() const { } } - // .flyteidl.core.Resources resources = 6; + // .flyteidl.core.Resources resources = 2; if (this->has_resources()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize( diff --git a/gen/pb-cpp/flyteidl/plugins/ray.pb.h b/gen/pb-cpp/flyteidl/plugins/ray.pb.h index e94127b3a..747b51e74 100644 --- a/gen/pb-cpp/flyteidl/plugins/ray.pb.h +++ b/gen/pb-cpp/flyteidl/plugins/ray.pb.h @@ -506,10 +506,10 @@ class HeadGroupSpec final : ::google::protobuf::Map< ::std::string, ::std::string >* mutable_ray_start_params(); - // .flyteidl.core.Resources resources = 6; + // .flyteidl.core.Resources resources = 2; bool has_resources() const; void clear_resources(); - static const int kResourcesFieldNumber = 6; + static const int kResourcesFieldNumber = 2; const ::flyteidl::core::Resources& resources() const; ::flyteidl::core::Resources* release_resources(); ::flyteidl::core::Resources* mutable_resources(); @@ -1051,7 +1051,7 @@ HeadGroupSpec::mutable_ray_start_params() { return ray_start_params_.MutableMap(); } -// .flyteidl.core.Resources resources = 6; +// .flyteidl.core.Resources resources = 2; inline bool HeadGroupSpec::has_resources() const { return this != internal_default_instance() && resources_ != nullptr; } diff --git a/gen/pb-go/flyteidl/plugins/ray.pb.go b/gen/pb-go/flyteidl/plugins/ray.pb.go index 499023480..1d3ccfa29 100644 --- a/gen/pb-go/flyteidl/plugins/ray.pb.go +++ b/gen/pb-go/flyteidl/plugins/ray.pb.go @@ -146,7 +146,7 @@ type HeadGroupSpec struct { // Refer to https://docs.ray.io/en/latest/ray-core/package-ref.html#ray-start RayStartParams map[string]string `protobuf:"bytes,1,rep,name=ray_start_params,json=rayStartParams,proto3" json:"ray_start_params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Resource specification for ray head pod - Resources *core.Resources `protobuf:"bytes,6,opt,name=resources,proto3" json:"resources,omitempty"` + Resources *core.Resources `protobuf:"bytes,2,opt,name=resources,proto3" json:"resources,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -290,36 +290,37 @@ func init() { func init() { proto.RegisterFile("flyteidl/plugins/ray.proto", fileDescriptor_b980f6d58c7489d7) } var fileDescriptor_b980f6d58c7489d7 = []byte{ - // 495 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0x41, 0x6f, 0xd3, 0x3e, - 0x18, 0xc6, 0x95, 0x76, 0xad, 0xfe, 0x7d, 0xfb, 0x1f, 0xed, 0x3c, 0x0e, 0xa1, 0x1a, 0x5a, 0xd7, - 0x53, 0x2f, 0x24, 0xd2, 0x26, 0xa0, 0x20, 0x71, 0x18, 0x68, 0x1a, 0x42, 0x02, 0x21, 0xf7, 0x80, - 0x84, 0x84, 0x22, 0xd7, 0x7d, 0x49, 0xa3, 0x26, 0x76, 0x64, 0x3b, 0xdd, 0xf2, 0x91, 0xb9, 0x70, - 0xe0, 0x13, 0xa0, 0x38, 0x59, 0xd2, 0x76, 0x93, 0x76, 0xe5, 0x66, 0xbf, 0xcf, 0xcf, 0x8f, 0xed, - 0xe7, 0x8d, 0x03, 0xa3, 0x9f, 0x71, 0x6e, 0x30, 0x5a, 0xc6, 0x7e, 0x1a, 0x67, 0x61, 0x24, 0xb4, - 0xaf, 0x58, 0xee, 0xa5, 0x4a, 0x1a, 0x49, 0x86, 0x77, 0x9a, 0x57, 0x69, 0xa3, 0x67, 0x35, 0xcd, - 0xa5, 0x42, 0xdf, 0x30, 0xbd, 0xd6, 0x25, 0x3c, 0x59, 0x41, 0x97, 0xb2, 0xfc, 0x93, 0x5c, 0x90, - 0x77, 0xd0, 0x57, 0x2c, 0x0f, 0x78, 0x9c, 0x69, 0x83, 0xca, 0x75, 0xc6, 0xce, 0xb4, 0x7f, 0x7e, - 0xe2, 0xed, 0x9b, 0x79, 0x94, 0xe5, 0x1f, 0x4a, 0x86, 0x82, 0xaa, 0xc7, 0xe4, 0x14, 0xfa, 0x2a, - 0x13, 0x26, 0x4a, 0x30, 0x40, 0xb1, 0x71, 0x5b, 0x63, 0x67, 0xda, 0xa3, 0x50, 0x95, 0xae, 0xc4, - 0x66, 0xf2, 0xc7, 0x01, 0x68, 0xd6, 0x92, 0x6b, 0x18, 0xac, 0x90, 0x2d, 0x83, 0x50, 0xc9, 0x2c, - 0x0d, 0x74, 0x8a, 0xbc, 0xda, 0xf2, 0xf4, 0xfe, 0x96, 0x1f, 0x91, 0x2d, 0xaf, 0x0b, 0x6e, 0x9e, - 0x22, 0xa7, 0x87, 0xab, 0xed, 0x29, 0xf9, 0x0c, 0x47, 0x37, 0x52, 0xad, 0x51, 0x6d, 0x5b, 0xb5, - 0xc6, 0xed, 0x69, 0xff, 0xfc, 0xec, 0xbe, 0xd5, 0x37, 0x8b, 0x36, 0x66, 0x83, 0x9b, 0xdd, 0x02, - 0x39, 0x81, 0x9e, 0x60, 0x09, 0xea, 0x94, 0x71, 0x74, 0xdb, 0xf6, 0x16, 0x4d, 0x81, 0x78, 0x70, - 0xbc, 0x9e, 0xe9, 0x40, 0xa3, 0xda, 0x44, 0x1c, 0x03, 0xc6, 0xb9, 0xcc, 0x84, 0x71, 0x0f, 0x2c, - 0x77, 0xb4, 0x9e, 0xe9, 0x79, 0xa9, 0x5c, 0x96, 0xc2, 0xe4, 0x97, 0x03, 0x87, 0x3b, 0xa7, 0x27, - 0x3f, 0x60, 0x58, 0xc4, 0xac, 0x0d, 0x53, 0x26, 0x48, 0x99, 0x62, 0x89, 0x76, 0x1d, 0x7b, 0xda, - 0x8b, 0x47, 0x2e, 0x5e, 0x24, 0x3f, 0x2f, 0x96, 0x7d, 0xb5, 0xab, 0xae, 0x84, 0x51, 0x39, 0x7d, - 0xa2, 0x76, 0x8a, 0xe4, 0x15, 0xf4, 0x14, 0x6a, 0x99, 0x29, 0x8e, 0xda, 0xed, 0xda, 0x40, 0xdd, - 0xc6, 0xb7, 0x68, 0xbf, 0x47, 0xef, 0x74, 0xda, 0xa0, 0xa3, 0x4b, 0x38, 0x7e, 0xc0, 0x9e, 0x0c, - 0xa1, 0xbd, 0xc6, 0xdc, 0x76, 0xa6, 0x47, 0x8b, 0x21, 0x79, 0x0a, 0x9d, 0x0d, 0x8b, 0x33, 0xac, - 0x3a, 0x5c, 0x4e, 0xde, 0xb6, 0x66, 0xce, 0xe4, 0x77, 0x0b, 0x06, 0x7b, 0xf1, 0x92, 0xe7, 0x00, - 0x65, 0x57, 0x8a, 0x08, 0x2b, 0x9b, 0x9e, 0xad, 0x7c, 0x61, 0x09, 0x92, 0x11, 0xfc, 0xa7, 0x30, - 0x8d, 0x23, 0xce, 0xb4, 0xf5, 0xeb, 0xd0, 0x7a, 0x4e, 0xce, 0xe0, 0xff, 0x24, 0x12, 0x41, 0xad, - 0xb7, 0xad, 0xde, 0x4f, 0x22, 0x41, 0xb7, 0x11, 0x76, 0xdb, 0x20, 0x07, 0x15, 0xc2, 0x6e, 0x6b, - 0x24, 0x78, 0x20, 0xee, 0x8e, 0x8d, 0xfb, 0xe5, 0xa3, 0x1f, 0xc7, 0x3f, 0x1e, 0xf8, 0xfb, 0x37, - 0xdf, 0x5f, 0x87, 0x91, 0x59, 0x65, 0x0b, 0x8f, 0xcb, 0xc4, 0xb7, 0x7b, 0x4a, 0x15, 0xfa, 0xf5, - 0x63, 0x0f, 0x51, 0xf8, 0xe9, 0xe2, 0x45, 0x28, 0xfd, 0xfd, 0xbf, 0xc5, 0xa2, 0x6b, 0x5f, 0xff, - 0xc5, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x05, 0x89, 0x97, 0x08, 0x48, 0x04, 0x00, 0x00, + // 497 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xc1, 0x6e, 0xd3, 0x40, + 0x10, 0x95, 0x93, 0x26, 0x22, 0x63, 0x4a, 0xd2, 0x2d, 0x07, 0x13, 0x15, 0x35, 0xcd, 0x29, 0x17, + 0x6c, 0x29, 0x15, 0x10, 0x90, 0x38, 0x14, 0x54, 0x15, 0x21, 0x81, 0xd0, 0xe6, 0x80, 0x84, 0x84, + 0xac, 0xcd, 0x66, 0x70, 0xac, 0xd8, 0x5e, 0x6b, 0x77, 0x9d, 0xd6, 0x9f, 0xcc, 0x85, 0x03, 0x5f, + 0x80, 0xbc, 0x76, 0xed, 0x24, 0xad, 0x54, 0x71, 0xe1, 0xb6, 0x33, 0xef, 0xcd, 0x9b, 0xd9, 0x37, + 0x5e, 0xc3, 0xf0, 0x67, 0x94, 0x6b, 0x0c, 0x97, 0x91, 0x97, 0x46, 0x59, 0x10, 0x26, 0xca, 0x93, + 0x2c, 0x77, 0x53, 0x29, 0xb4, 0x20, 0x83, 0x5b, 0xcc, 0xad, 0xb0, 0xe1, 0xb3, 0x9a, 0xcd, 0x85, + 0x44, 0x4f, 0x33, 0xb5, 0x56, 0x25, 0x79, 0xbc, 0x82, 0x2e, 0x65, 0xf9, 0x27, 0xb1, 0x20, 0xef, + 0xc0, 0x96, 0x2c, 0xf7, 0x79, 0x94, 0x29, 0x8d, 0xd2, 0xb1, 0x46, 0xd6, 0xc4, 0x9e, 0x9e, 0xb8, + 0xfb, 0x62, 0x2e, 0x65, 0xf9, 0x87, 0x92, 0x43, 0x41, 0xd6, 0x67, 0x72, 0x0a, 0xb6, 0xcc, 0x12, + 0x1d, 0xc6, 0xe8, 0x63, 0xb2, 0x71, 0x5a, 0x23, 0x6b, 0xd2, 0xa3, 0x50, 0xa5, 0x2e, 0x93, 0xcd, + 0xf8, 0x8f, 0x05, 0xd0, 0xd4, 0x92, 0x2b, 0xe8, 0xaf, 0x90, 0x2d, 0xfd, 0x40, 0x8a, 0x2c, 0xf5, + 0x55, 0x8a, 0xbc, 0x6a, 0x79, 0x7a, 0xb7, 0xe5, 0x47, 0x64, 0xcb, 0xab, 0x82, 0x37, 0x4f, 0x91, + 0xd3, 0xc3, 0xd5, 0x76, 0x48, 0x3e, 0xc3, 0xd1, 0xb5, 0x90, 0x6b, 0x94, 0xdb, 0x52, 0xad, 0x51, + 0x7b, 0x62, 0x4f, 0xcf, 0xee, 0x4a, 0x7d, 0x33, 0xd4, 0x46, 0xac, 0x7f, 0xbd, 0x9b, 0x20, 0x27, + 0xd0, 0x4b, 0x58, 0x8c, 0x2a, 0x65, 0x1c, 0x9d, 0xb6, 0xb9, 0x45, 0x93, 0x20, 0x2e, 0x1c, 0xaf, + 0x67, 0xca, 0x57, 0x28, 0x37, 0x21, 0x47, 0x9f, 0x71, 0x2e, 0xb2, 0x44, 0x3b, 0x07, 0x86, 0x77, + 0xb4, 0x9e, 0xa9, 0x79, 0x89, 0x5c, 0x94, 0xc0, 0xf8, 0x97, 0x05, 0x87, 0x3b, 0xd3, 0x93, 0x1f, + 0x30, 0x28, 0x6c, 0x56, 0x9a, 0x49, 0xed, 0xa7, 0x4c, 0xb2, 0x58, 0x39, 0x96, 0x99, 0xf6, 0xfc, + 0x81, 0x8b, 0x17, 0xce, 0xcf, 0x8b, 0xb2, 0xaf, 0xa6, 0xea, 0x32, 0xd1, 0x32, 0xa7, 0x4f, 0xe4, + 0x4e, 0x92, 0xbc, 0x82, 0x9e, 0x44, 0x25, 0x32, 0xc9, 0x51, 0x99, 0x25, 0xd8, 0x53, 0xa7, 0xd1, + 0x2d, 0xd6, 0xef, 0xd2, 0x5b, 0x9c, 0x36, 0xd4, 0xe1, 0x05, 0x1c, 0xdf, 0x23, 0x4f, 0x06, 0xd0, + 0x5e, 0x63, 0x6e, 0x36, 0xd3, 0xa3, 0xc5, 0x91, 0x3c, 0x85, 0xce, 0x86, 0x45, 0x19, 0x56, 0x1b, + 0x2e, 0x83, 0xb7, 0xad, 0x99, 0x35, 0xfe, 0xdd, 0x82, 0xfe, 0x9e, 0xbd, 0xe4, 0x39, 0x40, 0xb9, + 0x95, 0xc2, 0xc2, 0x4a, 0xa6, 0x67, 0x32, 0x5f, 0x58, 0x8c, 0x64, 0x08, 0x8f, 0x24, 0xa6, 0x51, + 0xc8, 0x59, 0x39, 0x6c, 0x87, 0xd6, 0x31, 0x39, 0x83, 0xc7, 0x71, 0x98, 0xf8, 0x35, 0xde, 0x36, + 0xb8, 0x1d, 0x87, 0x09, 0xdd, 0xa6, 0xb0, 0x9b, 0x86, 0x72, 0x50, 0x51, 0xd8, 0x4d, 0x4d, 0xf1, + 0xef, 0xb1, 0xbb, 0x63, 0xec, 0x7e, 0xf9, 0xe0, 0xc7, 0xf1, 0xef, 0x86, 0x77, 0xff, 0xa7, 0xe1, + 0xef, 0xdf, 0x7c, 0x7f, 0x1d, 0x84, 0x7a, 0x95, 0x2d, 0x5c, 0x2e, 0x62, 0xcf, 0xf4, 0x14, 0x32, + 0xf0, 0xea, 0xc7, 0x1e, 0x60, 0xe2, 0xa5, 0x8b, 0x17, 0x81, 0xf0, 0xf6, 0xff, 0x16, 0x8b, 0xae, + 0x79, 0xfd, 0xe7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x01, 0xe1, 0x4a, 0x94, 0x48, 0x04, 0x00, + 0x00, } diff --git a/gen/pb-java/flyteidl/plugins/Ray.java b/gen/pb-java/flyteidl/plugins/Ray.java index 4b6c95141..de61db654 100644 --- a/gen/pb-java/flyteidl/plugins/Ray.java +++ b/gen/pb-java/flyteidl/plugins/Ray.java @@ -2442,7 +2442,7 @@ java.lang.String getRayStartParamsOrThrow( * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ boolean hasResources(); /** @@ -2450,7 +2450,7 @@ java.lang.String getRayStartParamsOrThrow( * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ flyteidl.core.Tasks.Resources getResources(); /** @@ -2458,7 +2458,7 @@ java.lang.String getRayStartParamsOrThrow( * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ flyteidl.core.Tasks.ResourcesOrBuilder getResourcesOrBuilder(); } @@ -2518,7 +2518,7 @@ private HeadGroupSpec( rayStartParams__.getKey(), rayStartParams__.getValue()); break; } - case 50: { + case 18: { flyteidl.core.Tasks.Resources.Builder subBuilder = null; if (resources_ != null) { subBuilder = resources_.toBuilder(); @@ -2672,14 +2672,14 @@ public java.lang.String getRayStartParamsOrThrow( return map.get(key); } - public static final int RESOURCES_FIELD_NUMBER = 6; + public static final int RESOURCES_FIELD_NUMBER = 2; private flyteidl.core.Tasks.Resources resources_; /** * 
      * Resource specification for ray head pod
      *
* - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ public boolean hasResources() { return resources_ != null; @@ -2689,7 +2689,7 @@ public boolean hasResources() { * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ public flyteidl.core.Tasks.Resources getResources() { return resources_ == null ? flyteidl.core.Tasks.Resources.getDefaultInstance() : resources_; @@ -2699,7 +2699,7 @@ public flyteidl.core.Tasks.Resources getResources() { * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ public flyteidl.core.Tasks.ResourcesOrBuilder getResourcesOrBuilder() { return getResources(); @@ -2726,7 +2726,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) RayStartParamsDefaultEntryHolder.defaultEntry, 1); if (resources_ != null) { - output.writeMessage(6, getResources()); + output.writeMessage(2, getResources()); } unknownFields.writeTo(output); } @@ -2749,7 +2749,7 @@ public int getSerializedSize() { } if (resources_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getResources()); + .computeMessageSize(2, getResources()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -3243,7 +3243,7 @@ public Builder putAllRayStartParams( * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ public boolean hasResources() { return resourcesBuilder_ != null || resources_ != null; @@ -3253,7 +3253,7 @@ public boolean hasResources() { * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ public flyteidl.core.Tasks.Resources getResources() { if (resourcesBuilder_ == null) { @@ -3267,7 +3267,7 @@ public flyteidl.core.Tasks.Resources getResources() { * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ public Builder setResources(flyteidl.core.Tasks.Resources value) { if (resourcesBuilder_ == null) { @@ -3287,7 +3287,7 @@ public Builder setResources(flyteidl.core.Tasks.Resources value) { * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ public Builder setResources( flyteidl.core.Tasks.Resources.Builder builderForValue) { @@ -3305,7 +3305,7 @@ public Builder setResources( * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ public Builder mergeResources(flyteidl.core.Tasks.Resources value) { if (resourcesBuilder_ == null) { @@ -3327,7 +3327,7 @@ public Builder mergeResources(flyteidl.core.Tasks.Resources value) { * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ public Builder clearResources() { if (resourcesBuilder_ == null) { @@ -3345,7 +3345,7 @@ public Builder clearResources() { * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ public flyteidl.core.Tasks.Resources.Builder getResourcesBuilder() { @@ -3357,7 +3357,7 @@ public flyteidl.core.Tasks.Resources.Builder getResourcesBuilder() { * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ public flyteidl.core.Tasks.ResourcesOrBuilder getResourcesOrBuilder() { if (resourcesBuilder_ != null) { @@ -3372,7 +3372,7 @@ public flyteidl.core.Tasks.ResourcesOrBuilder getResourcesOrBuilder() { * Resource specification for ray head pod * * - * .flyteidl.core.Resources resources = 6; + * .flyteidl.core.Resources resources = 2; */ private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.Tasks.Resources, flyteidl.core.Tasks.Resources.Builder, flyteidl.core.Tasks.ResourcesOrBuilder> @@ -4975,7 +4975,7 @@ public flyteidl.plugins.Ray.WorkerGroupSpec getDefaultInstanceForType() { "vice_account\030\004 \001(\t\"\302\001\n\rHeadGroupSpec\022M\n\020" + "ray_start_params\030\001 \003(\01323.flyteidl.plugin" + "s.HeadGroupSpec.RayStartParamsEntry\022+\n\tr" + - "esources\030\006 \001(\0132\030.flyteidl.core.Resources" + + "esources\030\002 \001(\0132\030.flyteidl.core.Resources" + "\0325\n\023RayStartParamsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005" + "value\030\002 \001(\t:\0028\001\"\230\002\n\017WorkerGroupSpec\022\022\n\ng" + "roup_name\030\001 \001(\t\022\020\n\010replicas\030\002 \001(\005\022\024\n\014min" + diff --git a/gen/pb_python/flyteidl/plugins/ray_pb2.py b/gen/pb_python/flyteidl/plugins/ray_pb2.py index 83a30be73..f5772c292 100644 --- a/gen/pb_python/flyteidl/plugins/ray_pb2.py +++ b/gen/pb_python/flyteidl/plugins/ray_pb2.py @@ -14,7 +14,7 @@ from flyteidl.core import tasks_pb2 as flyteidl_dot_core_dot_tasks__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/plugins/ray.proto\x12\x10\x66lyteidl.plugins\x1a\x19\x66lyteidl/core/tasks.proto\"h\n\x06RayJob\x12=\n\x0bray_cluster\x18\x01 \x01(\x0b\x32\x1c.flyteidl.plugins.RayClusterR\nrayCluster\x12\x1f\n\x0bruntime_env\x18\x02 \x01(\tR\nruntimeEnv\"\xf2\x01\n\nRayCluster\x12G\n\x0fhead_group_spec\x18\x01 \x01(\x0b\x32\x1f.flyteidl.plugins.HeadGroupSpecR\rheadGroupSpec\x12M\n\x11worker_group_spec\x18\x02 \x03(\x0b\x32!.flyteidl.plugins.WorkerGroupSpecR\x0fworkerGroupSpec\x12\x1c\n\tnamespace\x18\x03 \x01(\tR\tnamespace\x12.\n\x13k8s_service_account\x18\x04 \x01(\tR\x11k8sServiceAccount\"\xe9\x01\n\rHeadGroupSpec\x12]\n\x10ray_start_params\x18\x01 \x03(\x0b\x32\x33.flyteidl.plugins.HeadGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xee\x02\n\x0fWorkerGroupSpec\x12\x1d\n\ngroup_name\x18\x01 \x01(\tR\tgroupName\x12\x1a\n\x08replicas\x18\x02 \x01(\x05R\x08replicas\x12!\n\x0cmin_replicas\x18\x03 \x01(\x05R\x0bminReplicas\x12!\n\x0cmax_replicas\x18\x04 \x01(\x05R\x0bmaxReplicas\x12_\n\x10ray_start_params\x18\x05 \x03(\x0b\x32\x35.flyteidl.plugins.WorkerGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\xba\x01\n\x14\x63om.flyteidl.pluginsB\x08RayProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins\xa2\x02\x03\x46PX\xaa\x02\x10\x46lyteidl.Plugins\xca\x02\x10\x46lyteidl\\Plugins\xe2\x02\x1c\x46lyteidl\\Plugins\\GPBMetadata\xea\x02\x11\x46lyteidl::Pluginsb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/plugins/ray.proto\x12\x10\x66lyteidl.plugins\x1a\x19\x66lyteidl/core/tasks.proto\"h\n\x06RayJob\x12=\n\x0bray_cluster\x18\x01 \x01(\x0b\x32\x1c.flyteidl.plugins.RayClusterR\nrayCluster\x12\x1f\n\x0bruntime_env\x18\x02 \x01(\tR\nruntimeEnv\"\xf2\x01\n\nRayCluster\x12G\n\x0fhead_group_spec\x18\x01 \x01(\x0b\x32\x1f.flyteidl.plugins.HeadGroupSpecR\rheadGroupSpec\x12M\n\x11worker_group_spec\x18\x02 \x03(\x0b\x32!.flyteidl.plugins.WorkerGroupSpecR\x0fworkerGroupSpec\x12\x1c\n\tnamespace\x18\x03 \x01(\tR\tnamespace\x12.\n\x13k8s_service_account\x18\x04 \x01(\tR\x11k8sServiceAccount\"\xe9\x01\n\rHeadGroupSpec\x12]\n\x10ray_start_params\x18\x01 \x03(\x0b\x32\x33.flyteidl.plugins.HeadGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x02 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\xee\x02\n\x0fWorkerGroupSpec\x12\x1d\n\ngroup_name\x18\x01 \x01(\tR\tgroupName\x12\x1a\n\x08replicas\x18\x02 \x01(\x05R\x08replicas\x12!\n\x0cmin_replicas\x18\x03 \x01(\x05R\x0bminReplicas\x12!\n\x0cmax_replicas\x18\x04 \x01(\x05R\x0bmaxReplicas\x12_\n\x10ray_start_params\x18\x05 \x03(\x0b\x32\x35.flyteidl.plugins.WorkerGroupSpec.RayStartParamsEntryR\x0erayStartParams\x12\x36\n\tresources\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x1a\x41\n\x13RayStartParamsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\xba\x01\n\x14\x63om.flyteidl.pluginsB\x08RayProtoP\x01Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins\xa2\x02\x03\x46PX\xaa\x02\x10\x46lyteidl.Plugins\xca\x02\x10\x46lyteidl\\Plugins\xe2\x02\x1c\x46lyteidl\\Plugins\\GPBMetadata\xea\x02\x11\x46lyteidl::Pluginsb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) diff --git a/gen/pb_rust/flyteidl.plugins.rs b/gen/pb_rust/flyteidl.plugins.rs index 457082633..2f0a176e8 100644 --- a/gen/pb_rust/flyteidl.plugins.rs +++ b/gen/pb_rust/flyteidl.plugins.rs @@ -202,7 +202,7 @@ pub struct HeadGroupSpec { #[prost(map="string, string", tag="1")] pub ray_start_params: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>, /// Resource specification for ray head pod - #[prost(message, optional, tag="6")] + #[prost(message, optional, tag="2")] pub resources: ::core::option::Option, } /// WorkerGroupSpec are the specs for the worker pods