Fix role error

Signed-off-by: kerthcet <[email protected]>

Author: kerthcet

Makefile

@@ -2,7 +2,6 @@ include Makefile-deps.mk
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.32.0
-ENVTEST_LWS_VERSION = v0.5.1
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -84,9 +83,7 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 		rbac:roleName=manager-role output:rbac:artifacts:config=config/rbac \
 		crd:generateEmbeddedObjectMeta=true output:crd:artifacts:config=config/crd/bases \
 		webhook output:webhook:artifacts:config=config/webhook \
-		paths="./cmd/..."
-		paths="./api/..."
-		paths="./pkg/..."
+		paths="./api/...;./pkg/...;./cmd/..."
 
 .PHONY: generate
 generate: controller-gen code-generator ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -136,7 +133,7 @@ test-integration: manifests fmt vet envtest ginkgo ## Run integration tests.
 
 .PHONY: test-e2e
 test-e2e: kustomize manifests fmt vet envtest ginkgo kind-image-build
-	E2E_KIND_NODE_VERSION=$(E2E_KIND_NODE_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) KUBECTL=$(KUBECTL) KUSTOMIZE=$(KUSTOMIZE) GINKGO=$(GINKGO) USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(IMG) ENVTEST_LWS_VERSION=$(ENVTEST_LWS_VERSION) ./hack/e2e-test.sh
+	E2E_KIND_NODE_VERSION=$(E2E_KIND_NODE_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) KUBECTL=$(KUBECTL) KUSTOMIZE=$(KUSTOMIZE) GINKGO=$(GINKGO) USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(IMG) ./hack/e2e-test.sh
 
 test-deploy-with-helm: kind-image-build
 	E2E_KIND_NODE_VERSION=$(E2E_KIND_NODE_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) KUBECTL=$(KUBECTL) USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(IMG) TAG=$(GIT_TAG) ./hack/test-deploy-with-helm.sh

api/core/v1alpha1/model_types.go

@@ -71,11 +71,6 @@ type ModelHub struct {
 // URIProtocol represents the protocol of the URI.
 type URIProtocol string
 
-// Add roles for operating leaderWorkerSet.
-//
-// +kubebuilder:rbac:groups=leaderworkerset.x-k8s.io,resources=leaderworkersets,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=leaderworkerset.x-k8s.io,resources=leaderworkersets/status,verbs=get;update;patch
-
 // ModelSource represents the source of the model.
 // Only one model source will be used.
 type ModelSource struct {

config/crd/bases/inference.llmaz.io_playgrounds.yaml

@@ -897,7 +897,7 @@ spec:
                     description: |-
                       InferenceFlavors represents a list of flavor names with fungibility supported
                       to serve the model.
-                      - If not set, always apply with the 0-index model by default.
+                      - If not set, will employ the model configured flavors by default.
                       - If set, will lookup the flavor names following the model orders.
                     items:
                       type: string

config/crd/bases/inference.llmaz.io_services.yaml

@@ -52,7 +52,7 @@ spec:
                     description: |-
                       InferenceFlavors represents a list of flavor names with fungibility supported
                       to serve the model.
-                      - If not set, always apply with the 0-index model by default.
+                      - If not set, will employ the model configured flavors by default.
                       - If set, will lookup the flavor names following the model orders.
                     items:
                       type: string

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: inftyai/llmaz
-  newTag: v0.1.3
+  newTag: main

config/rbac/role.yaml

@@ -4,6 +4,13 @@ kind: ClusterRole
 metadata:
   name: manager-role
 rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
 - apiGroups:
   - ""
   resources:

hack/e2e-test.sh

@@ -40,7 +40,7 @@ function deploy {
     $KUSTOMIZE build $CWD/test/e2e/config | $KUBECTL apply --server-side -f -
 }
 function deploy_lws {
-    $KUBECTL apply --server-side -f https://github.com/kubernetes-sigs/lws/releases/download/$ENVTEST_LWS_VERSION/manifests.yaml
+    $KUBECTL apply --server-side -f $CWD/test/config/lws/
 }
 trap cleanup EXIT
 startup

pkg/controller/inference/service_controller.go

@@ -69,6 +69,8 @@ func NewServiceReconciler(client client.Client, scheme *runtime.Scheme, record r
 //+kubebuilder:rbac:groups=inference.llmaz.io,resources=services/finalizers,verbs=update
 //+kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups="",resources=configmaps,verbs=get;list
+//+kubebuilder:rbac:groups=leaderworkerset.x-k8s.io,resources=leaderworkersets,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=leaderworkerset.x-k8s.io,resources=leaderworkersets/status,verbs=get;update;patch
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.