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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions charts/ome-resources/templates/ome-controller/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -288,3 +288,24 @@ rules:
- get
- patch
- update
- apiGroups:
- workloads.x-k8s.io
resources:
- rolebasedgroups
- rolebasedgroups/finalizers
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- workloads.x-k8s.io
resources:
- rolebasedgroups/status
verbs:
- get
- patch
- update
2 changes: 2 additions & 0 deletions cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
kueuev1beta1 "sigs.k8s.io/kueue/apis/kueue/v1beta1"
lws "sigs.k8s.io/lws/api/leaderworkerset/v1"
rbgv1alpha2 "sigs.k8s.io/rbgs/api/workloads/v1alpha2"
schedulerpluginsv1alpha1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
volcanobatch "volcano.sh/apis/pkg/apis/batch/v1alpha1"
volcano "volcano.sh/apis/pkg/apis/scheduling/v1beta1"
Expand Down Expand Up @@ -220,6 +221,7 @@ func main() {
{ray.SchemeGroupVersion, constants.RayClusterKind, ray.AddToScheme},
{knservingv1.SchemeGroupVersion, constants.KnativeServiceKind, knservingv1.AddToScheme},
{lws.SchemeGroupVersion, constants.LWSKind, lws.AddToScheme},
{rbgv1alpha2.GroupVersion, constants.RoleBasedGroupKind, rbgv1alpha2.AddToScheme},
{volcano.SchemeGroupVersion, constants.VolcanoQueueKind, volcano.AddToScheme},
{volcanobatch.SchemeGroupVersion, constants.VolcanoJobKind, volcanobatch.AddToScheme},
{kedav1.SchemeGroupVersion, constants.KEDAScaledObjectKind, kedav1.AddToScheme},
Expand Down
21 changes: 21 additions & 0 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -288,3 +288,24 @@ rules:
- get
- patch
- update
- apiGroups:
- workloads.x-k8s.io
resources:
- rolebasedgroups
- rolebasedgroups/finalizers
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- workloads.x-k8s.io
resources:
- rolebasedgroups/status
verbs:
- get
- patch
- update
19 changes: 11 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/aws/smithy-go v1.24.0
github.com/fsnotify/fsnotify v1.9.0
github.com/gin-gonic/gin v1.10.0
github.com/go-logr/logr v1.4.2
github.com/go-logr/logr v1.4.3
github.com/go-playground/validator/v10 v10.20.0
github.com/google/go-cmp v0.7.0
github.com/google/uuid v1.6.0
Expand All @@ -33,7 +33,7 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/spf13/afero v1.15.0
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/spf13/pflag v1.0.10
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.10.0
go.uber.org/fx v1.22.2
Expand All @@ -52,18 +52,21 @@ require (
k8s.io/client-go v0.33.7
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
k8s.io/utils v0.0.0-20241210054802-24370beab758
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
knative.dev/pkg v0.0.0-20231115001034-97c7258e3a98
knative.dev/serving v0.39.3
sigs.k8s.io/controller-runtime v0.19.7
sigs.k8s.io/gateway-api v1.2.1
sigs.k8s.io/kueue v0.10.6
sigs.k8s.io/lws v0.5.1
sigs.k8s.io/rbgs/api v0.0.0-00010101000000-000000000000
sigs.k8s.io/scheduler-plugins v0.30.12
sigs.k8s.io/yaml v1.4.0
volcano.sh/apis v1.9.0
)

replace sigs.k8s.io/rbgs/api => github.com/sgl-project/rbg-api v0.7.0-alpha.3

require (
cel.dev/expr v0.20.0 // indirect
cloud.google.com/go/auth v0.16.1 // indirect
Expand Down Expand Up @@ -149,7 +152,7 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/openzipkin/zipkin-go v0.4.2 // indirect
Expand Down Expand Up @@ -188,11 +191,11 @@ require (
go.uber.org/dig v1.18.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/crypto v0.40.0 // indirect
golang.org/x/crypto v0.41.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.42.0 // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/term v0.33.0 // indirect
golang.org/x/term v0.34.0 // indirect
golang.org/x/text v0.28.0 // indirect
golang.org/x/time v0.11.0 // indirect
golang.org/x/tools v0.35.0 // indirect
Expand All @@ -209,7 +212,7 @@ require (
k8s.io/component-base v0.33.7 // indirect
knative.dev/networking v0.0.0-20231115015815-3af9769712cd // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
)
32 changes: 18 additions & 14 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KE
github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
Expand Down Expand Up @@ -402,8 +402,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
Expand Down Expand Up @@ -489,6 +490,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/sgl-project/rbg-api v0.7.0-alpha.3 h1:IQ3/IhfuRHKHXHYZpNZGMv3iogPP77k2lS3RKW6BQJE=
github.com/sgl-project/rbg-api v0.7.0-alpha.3/go.mod h1:rxajGPZkFonk2zkcadmBJrTBwH45AWlAmHKknzb8ThQ=
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=
Expand All @@ -506,8 +509,9 @@ github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
Expand Down Expand Up @@ -620,8 +624,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
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.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
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=
Expand Down Expand Up @@ -691,8 +695,8 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
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=
Expand Down Expand Up @@ -766,8 +770,8 @@ golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
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=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand Down Expand Up @@ -981,8 +985,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/networking v0.0.0-20231115015815-3af9769712cd h1:VDtYz+hybqIAEp8NM2tAi2QV4D8Cc5DWLoXLi5IcZjE=
knative.dev/networking v0.0.0-20231115015815-3af9769712cd/go.mod h1:HQ3rA7qrKVWvZUl6GGQefn/PzNXlX4e94KpbwBEjFcQ=
knative.dev/pkg v0.0.0-20231115001034-97c7258e3a98 h1:uvOLwp5Ar7oJlaYEszh51CemuZc1sRRI14xzKhUEF3U=
Expand All @@ -1000,8 +1004,8 @@ sigs.k8s.io/controller-runtime v0.19.7 h1:DLABZfMr20A+AwCZOHhcbcu+TqBXnJZaVBri9K
sigs.k8s.io/controller-runtime v0.19.7/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
sigs.k8s.io/gateway-api v1.2.1 h1:fZZ/+RyRb+Y5tGkwxFKuYuSRQHu9dZtbjenblleOLHM=
sigs.k8s.io/gateway-api v1.2.1/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
sigs.k8s.io/kueue v0.10.6 h1:r/ULCI0wXYvkbl0vliq8aS+AvOVhW2dlxzpRMudhNJ8=
sigs.k8s.io/kueue v0.10.6/go.mod h1:3yzOvGI0sPOC3VL1ihVIrzc8mkSyCVTL+SrouewwRWw=
sigs.k8s.io/lws v0.5.1 h1:eaeMNkP0manRluQZLN32atoULaGrzP611gSLdFaHZs4=
Expand Down
4 changes: 3 additions & 1 deletion pkg/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -444,12 +444,13 @@ const (
PDDisaggregated DeploymentModeType = "PDDisaggregated"
MultiNode DeploymentModeType = "MultiNode"
VirtualDeployment DeploymentModeType = "VirtualDeployment"
RoleBasedGroup DeploymentModeType = "RoleBasedGroup"
)

// IsValid checks if the deployment mode is valid
func (d DeploymentModeType) IsValid() bool {
switch d {
case Serverless, RawDeployment, MultiNodeRayVLLM, MultiNode, VirtualDeployment:
case Serverless, RawDeployment, MultiNodeRayVLLM, MultiNode, VirtualDeployment, RoleBasedGroup:
return true
default:
return false
Expand Down Expand Up @@ -485,6 +486,7 @@ const (
LWSKind = "LeaderWorkerSet"
GatewayKind = "Gateway"
ServiceKind = "Service"
RoleBasedGroupKind = "RoleBasedGroup"
)

// Volcano Job Labels
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/v1beta1/inferenceservice/cleanup.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ func (r *InferenceServiceReconciler) getAvailableResourceTypes() ([]schema.Group
{gvk: schema.GroupVersionKind{Group: "leaderworkerset.x-k8s.io", Version: "v1", Kind: "LeaderWorkerSet"}},
{gvk: schema.GroupVersionKind{Group: "keda.sh", Version: "v1alpha1", Kind: "ScaledObject"}},
{gvk: schema.GroupVersionKind{Group: "networking.istio.io", Version: "v1beta1", Kind: "VirtualService"}},
{gvk: schema.GroupVersionKind{Group: "workloads.x-k8s.io", Version: "v1alpha2", Kind: "RoleBasedGroup"}},
}

for _, res := range optionals {
Expand Down
54 changes: 54 additions & 0 deletions pkg/controller/v1beta1/inferenceservice/components/decoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -403,3 +403,57 @@ func (d *Decoder) ValidateSpec() error {
// Add more validation logic as needed
return nil
}

// ExtractRoleConfig implements RoleConfigExtractor by reusing the same
// metadata and pod spec building helpers used during single-component
// reconciliation. It does not create or update Kubernetes resources.
func (d *Decoder) ExtractRoleConfig(isvc *v1beta1.InferenceService) (*RoleConfig, error) {
if d.decoderSpec == nil {
return nil, errors.New("decoder spec is nil")
}

if isvc.Spec.Model != nil && len(isvc.Spec.Model.FineTunedWeights) > 0 {
if err := ReconcileFineTunedWeights(&d.BaseComponentFields, isvc); err != nil {
return nil, errors.Wrap(err, "failed to reconcile fine-tuned weights")
}
}

objectMeta, err := d.reconcileObjectMeta(isvc)
if err != nil {
return nil, errors.Wrap(err, "failed to reconcile object metadata")
}

podSpec, err := d.reconcilePodSpec(isvc, &objectMeta)
if err != nil {
return nil, errors.Wrap(err, "failed to reconcile pod spec")
}

workerPodSpec, err := d.reconcileWorkerPodSpec(isvc, &objectMeta)
if err != nil {
return nil, errors.Wrap(err, "failed to reconcile worker pod spec")
}

cfg := &RoleConfig{
ComponentType: v1beta1.DecoderComponent,
DeploymentMode: d.DeploymentMode,
PodSpec: podSpec,
ComponentExtensionSpec: &d.decoderSpec.ComponentExtensionSpec,
ObjectMeta: objectMeta,
}
if d.DeploymentMode == constants.MultiNode {
cfg.LeaderPodSpec = podSpec
cfg.WorkerPodSpec = workerPodSpec
cfg.WorkerSize = d.getWorkerSize()
}
return cfg, nil
}

// UpdateStatus propagates decoder readiness and model status into the
// InferenceService without performing a full resource reconciliation.
func (d *Decoder) UpdateStatus(isvc *v1beta1.InferenceService) error {
objectMeta, err := d.reconcileObjectMeta(isvc)
if err != nil {
return errors.Wrap(err, "failed to reconcile decoder object metadata for status")
}
return d.updateDecoderStatus(isvc, objectMeta)
}
54 changes: 54 additions & 0 deletions pkg/controller/v1beta1/inferenceservice/components/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -398,3 +398,57 @@ func (e *Engine) ValidateSpec() error {
// Add more validation logic as needed
return nil
}

// ExtractRoleConfig implements RoleConfigExtractor by reusing the same
// metadata and pod spec building helpers used during single-component
// reconciliation. It does not create or update Kubernetes resources.
func (e *Engine) ExtractRoleConfig(isvc *v1beta1.InferenceService) (*RoleConfig, error) {
if e.engineSpec == nil {
return nil, errors.New("engine spec is nil")
}

if isvc.Spec.Model != nil && len(isvc.Spec.Model.FineTunedWeights) > 0 {
if err := ReconcileFineTunedWeights(&e.BaseComponentFields, isvc); err != nil {
return nil, errors.Wrap(err, "failed to reconcile fine-tuned weights")
}
}

objectMeta, err := e.reconcileObjectMeta(isvc)
if err != nil {
return nil, errors.Wrap(err, "failed to reconcile object metadata")
}

podSpec, err := e.reconcilePodSpec(isvc, &objectMeta)
if err != nil {
return nil, errors.Wrap(err, "failed to reconcile pod spec")
}

workerPodSpec, err := e.reconcileWorkerPodSpec(isvc, &objectMeta)
if err != nil {
return nil, errors.Wrap(err, "failed to reconcile worker pod spec")
}

cfg := &RoleConfig{
ComponentType: v1beta1.EngineComponent,
DeploymentMode: e.DeploymentMode,
PodSpec: podSpec,
ComponentExtensionSpec: &e.engineSpec.ComponentExtensionSpec,
ObjectMeta: objectMeta,
}
if e.DeploymentMode == constants.MultiNode {
cfg.LeaderPodSpec = podSpec
cfg.WorkerPodSpec = workerPodSpec
cfg.WorkerSize = e.getWorkerSize()
}
return cfg, nil
}

// UpdateStatus propagates engine readiness and model status into the
// InferenceService without performing a full resource reconciliation.
func (e *Engine) UpdateStatus(isvc *v1beta1.InferenceService) error {
objectMeta, err := e.reconcileObjectMeta(isvc)
if err != nil {
return errors.Wrap(err, "failed to reconcile engine object metadata for status")
}
return e.updateEngineStatus(isvc, objectMeta)
}
Loading