manifests

Author: shengnuo

api/apps/v1alpha1/nimservice_types.go

@@ -61,6 +61,7 @@ const (
 )
 
 // NIMServiceSpec defines the desired state of NIMService.
+// +kubebuilder:validation:XValidation:rule="!has(self.multiNode) || !self.scale.enabled", message="scale.enabled must be false when multiNode is not nil"
 type NIMServiceSpec struct {
 	Image   Image           `json:"image"`
 	Command []string        `json:"command,omitempty"`
@@ -85,12 +86,13 @@ type NIMServiceSpec struct {
 	Metrics        Metrics                      `json:"metrics,omitempty"`
 	// +kubebuilder:validation:Minimum=1
 	// +kubebuilder:default:=1
-	Replicas         int                        `json:"replicas,omitempty"`
-	UserID           *int64                     `json:"userID,omitempty"`
-	GroupID          *int64                     `json:"groupID,omitempty"`
-	RuntimeClassName string                     `json:"runtimeClassName,omitempty"`
-	Proxy            *ProxySpec                 `json:"proxy,omitempty"`
-	MultiNode        *NimServiceMultiNodeConfig `json:"multiNode,omitempty"`
+	Replicas         int        `json:"replicas,omitempty"`
+	UserID           *int64     `json:"userID,omitempty"`
+	GroupID          *int64     `json:"groupID,omitempty"`
+	RuntimeClassName string     `json:"runtimeClassName,omitempty"`
+	Proxy            *ProxySpec `json:"proxy,omitempty"`
+	// MultiNode config for NIMService using LeaderWorkerSet
+	MultiNode *NimServiceMultiNodeConfig `json:"multiNode,omitempty"`
 }
 
 // NimServiceMultiNodeConfig defines the configuration for multi-node NIMService.

bundle/manifests/apps.nvidia.com_nimpipelines.yaml

@@ -798,10 +798,6 @@ spec:
                           required:
                           - clusterStartTimeout
                           type: object
-                          x-kubernetes-validations:
-                          - message: scale.enabled must be false when multiNode is
-                              not nil
-                            rule: '!has(self.multiNode) || !self.scale.enabled'
                         nodeSelector:
                           additionalProperties:
                             type: string
@@ -2315,6 +2311,10 @@ spec:
                       - authSecret
                       - image
                       type: object
+                      x-kubernetes-validations:
+                      - message: scale.enabled must be false when multiNode is not
+                          nil
+                        rule: '!has(self.multiNode) || !self.scale.enabled'
                   type: object
                 type: array
             type: object

bundle/manifests/apps.nvidia.com_nimservices.yaml

@@ -744,9 +744,6 @@ spec:
                 required:
                 - clusterStartTimeout
                 type: object
-                x-kubernetes-validations:
-                - message: scale.enabled must be false when multiNode is not nil
-                  rule: '!has(self.multiNode) || !self.scale.enabled'
               nodeSelector:
                 additionalProperties:
                   type: string
@@ -2227,6 +2224,9 @@ spec:
             - authSecret
             - image
             type: object
+            x-kubernetes-validations:
+            - message: scale.enabled must be false when multiNode is not nil
+              rule: '!has(self.multiNode) || !self.scale.enabled'
           status:
             description: NIMServiceStatus defines the observed state of NIMService.
             properties:

config/crd/bases/apps.nvidia.com_nimpipelines.yaml

@@ -798,10 +798,6 @@ spec:
                           required:
                           - clusterStartTimeout
                           type: object
-                          x-kubernetes-validations:
-                          - message: scale.enabled must be false when multiNode is
-                              not nil
-                            rule: '!has(self.multiNode) || !self.scale.enabled'
                         nodeSelector:
                           additionalProperties:
                             type: string
@@ -2315,6 +2311,10 @@ spec:
                       - authSecret
                       - image
                       type: object
+                      x-kubernetes-validations:
+                      - message: scale.enabled must be false when multiNode is not
+                          nil
+                        rule: '!has(self.multiNode) || !self.scale.enabled'
                   type: object
                 type: array
             type: object

config/crd/bases/apps.nvidia.com_nimservices.yaml

@@ -744,9 +744,6 @@ spec:
                 required:
                 - clusterStartTimeout
                 type: object
-                x-kubernetes-validations:
-                - message: scale.enabled must be false when multiNode is not nil
-                  rule: '!has(self.multiNode) || !self.scale.enabled'
               nodeSelector:
                 additionalProperties:
                   type: string
@@ -2227,6 +2224,9 @@ spec:
             - authSecret
             - image
             type: object
+            x-kubernetes-validations:
+            - message: scale.enabled must be false when multiNode is not nil
+              rule: '!has(self.multiNode) || !self.scale.enabled'
           status:
             description: NIMServiceStatus defines the observed state of NIMService.
             properties:

deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nimpipelines.yaml

@@ -798,10 +798,6 @@ spec:
                           required:
                           - clusterStartTimeout
                           type: object
-                          x-kubernetes-validations:
-                          - message: scale.enabled must be false when multiNode is
-                              not nil
-                            rule: '!has(self.multiNode) || !self.scale.enabled'
                         nodeSelector:
                           additionalProperties:
                             type: string
@@ -2315,6 +2311,10 @@ spec:
                       - authSecret
                       - image
                       type: object
+                      x-kubernetes-validations:
+                      - message: scale.enabled must be false when multiNode is not
+                          nil
+                        rule: '!has(self.multiNode) || !self.scale.enabled'
                   type: object
                 type: array
             type: object

deployments/helm/k8s-nim-operator/crds/apps.nvidia.com_nimservices.yaml

@@ -744,9 +744,6 @@ spec:
                 required:
                 - clusterStartTimeout
                 type: object
-                x-kubernetes-validations:
-                - message: scale.enabled must be false when multiNode is not nil
-                  rule: '!has(self.multiNode) || !self.scale.enabled'
               nodeSelector:
                 additionalProperties:
                   type: string
@@ -2227,6 +2224,9 @@ spec:
             - authSecret
             - image
             type: object
+            x-kubernetes-validations:
+            - message: scale.enabled must be false when multiNode is not nil
+              rule: '!has(self.multiNode) || !self.scale.enabled'
           status:
             description: NIMServiceStatus defines the observed state of NIMService.
             properties: