[BugFix] fix lora controller reconcile logic (#565)

* [CI] Add prefix aware routing test

Signed-off-by: Rui Zhang <[email protected]>

* [ci] refactor k8s discovery e2e test

Signed-off-by: Rui Zhang <[email protected]>

* [CI] Refactor static discovery testing so that it can support multiple logic

Signed-off-by: Rui Zhang <[email protected]>

* [CI] Add static e2e test for prefixaware

Signed-off-by: Rui Zhang <[email protected]>

* refactor the code

Signed-off-by: Rui Zhang <[email protected]>

* [CI] refactor

Signed-off-by: Rui Zhang <[email protected]>

* [CI] Add multiple routing logic test

Signed-off-by: Rui Zhang <[email protected]>

* [CI] fix bug

Signed-off-by: Rui Zhang <[email protected]>

* modify

Signed-off-by: Rui Zhang <[email protected]>

* modify docker file

Signed-off-by: Rui Zhang <[email protected]>

---------

Signed-off-by: Rui Zhang <[email protected]>

Author: zerofishnoodles

operator/Dockerfile

@@ -23,11 +23,12 @@ COPY internal/ internal/
 # by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
 RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o manager cmd/main.go
 
-# Use distroless as minimal base image to package the manager binary
-# Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM gcr.io/distroless/static:nonroot
+# Use python as minimal base image to package the manager binary
+FROM python:3.11-slim
 WORKDIR /
 COPY --from=builder /workspace/manager .
+RUN pip install --no-cache-dir huggingface_hub[cli]
+
 USER 65532:65532
 
 ENTRYPOINT ["/manager"]

operator/api/v1alpha1/loraadapter_types.go

@@ -34,7 +34,7 @@ type LoraAdapterSpec struct {
 	// DeploymentConfig defines how the adapter should be deployed
 	LoraAdapterDeploymentConfig LoraAdapterDeploymentConfig `json:"loraAdapterDeploymentConfig,omitempty"`
 	// VLLMApiKey defines the configuration for vLLM API key authentication
-	VLLMApiKey *VLLMApiKeyConfig `json:"vllmApiKey,omitempty"`
+	VLLMApiKey *VLLMApiKeySecretRef `json:"vllmApiKey,omitempty"`
 }
 
 type AdapterSource struct {
@@ -59,8 +59,12 @@ type AdapterSource struct {
 
 // +mapType=atomic
 type SecretRef struct {
-	// Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?
-	Name string `json:"name,omitempty"`
+	// Name of the secret
+	// +kubebuilder:validation:Required
+	Name string `json:"name"`
+	// Key in the secret containing the value
+	// +kubebuilder:validation:Required
+	Key string `json:"key"`
 }
 
 type LoraAdapterDeploymentConfig struct {
@@ -74,16 +78,6 @@ type LoraAdapterDeploymentConfig struct {
 	Replicas *int32 `json:"replicas,omitempty"`
 }
 
-// VLLMApiKeyConfig defines how to obtain the vLLM API key
-type VLLMApiKeyConfig struct {
-	// Direct API key value
-	// +optional
-	Value string `json:"value,omitempty"`
-	// Reference to a secret containing the API key
-	// +optional
-	SecretRef *VLLMApiKeySecretRef `json:"secretRef,omitempty"`
-}
-
 // VLLMApiKeySecretRef defines the reference to a secret containing the API key
 type VLLMApiKeySecretRef struct {
 	// Name of the secret
@@ -122,7 +116,6 @@ type Condition struct {
 	// Reason is a brief reason for the condition's current status.
 	// +kubebuilder:validation:MaxLength=1024
 	// +kubebuilder:validation:MinLength=1
-	// +kubebuilder:validation:Pattern=`^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$`
 	// +kubebuilder:validation:Required
 	Reason string `json:"reason"`
 	// Status is the status of the condition.

operator/api/v1alpha1/zz_generated.deepcopy.go

@@ -62,10 +62,15 @@ spec:
                     description: CredentialsSecretRef references a secret containing
                       storage credentials.
                     properties:
+                      key:
+                        description: Key in the secret containing the value
+                        type: string
                       name:
-                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                          TODO: Add other useful fields. apiVersion, kind, uid?'
+                        description: Name of the secret
                         type: string
+                    required:
+                    - key
+                    - name
                     type: object
                     x-kubernetes-map-type: atomic
                   maxAdapters:
@@ -121,22 +126,15 @@ spec:
                 description: VLLMApiKey defines the configuration for vLLM API key
                   authentication
                 properties:
-                  secretRef:
-                    description: Reference to a secret containing the API key
-                    properties:
-                      secretKey:
-                        description: Key in the secret containing the API key
-                        type: string
-                      secretName:
-                        description: Name of the secret
-                        type: string
-                    required:
-                    - secretKey
-                    - secretName
-                    type: object
-                  value:
-                    description: Direct API key value
+                  secretKey:
+                    description: Key in the secret containing the API key
                     type: string
+                  secretName:
+                    description: Name of the secret
+                    type: string
+                required:
+                - secretKey
+                - secretName
                 type: object
             required:
             - adapterSource
@@ -167,7 +165,6 @@ spec:
                         status.
                       maxLength: 1024
                       minLength: 1
-                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
                       type: string
                     status:
                       description: Status is the status of the condition.