feat: Restrict the total number of 'Running' workspaces on a cluster (#…

…1888) Signed-off-by: Anatolii Bazko <[email protected]>
eclipse-che · Aug 21, 2024 · 5b644d5 · 5b644d5
1 parent 145a76e
commit 5b644d5
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 2 deletions.
diff --git a/api/v2/checluster_types.go b/api/v2/checluster_types.go
@@ -182,6 +182,12 @@ type CheClusterDevEnvironments struct {
 	// +kubebuilder:validation:Minimum:=-1
 	// +optional
 	MaxNumberOfRunningWorkspacesPerUser *int64 `json:"maxNumberOfRunningWorkspacesPerUser,omitempty"`
+	// The maximum number of concurrently running workspaces across the entire Kubernetes cluster.
+	// This applies to all users in the system. If the value is set to -1, it means there is
+	// no limit on the number of running workspaces.
+	// +kubebuilder:validation:Minimum:=-1
+	// +optional
+	MaxNumberOfRunningWorkspacesPerCluster *int64 `json:"maxNumberOfRunningWorkspacesPerCluster,omitempty"`
 	// User configuration.
 	// +optional
 	User *UserConfiguration `json:"user,omitempty"`

diff --git a/api/v2/zz_generated.deepcopy.go b/api/v2/zz_generated.deepcopy.go
diff --git a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml
@@ -104,7 +104,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/eclipse-che/che-operator
     support: Eclipse Foundation
-  name: eclipse-che.v7.90.0-879.next
+  name: eclipse-che.v7.91.0-880.next
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1035,7 +1035,7 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: Eclipse Foundation
-  version: 7.90.0-879.next
+  version: 7.91.0-880.next
   webhookdefinitions:
     - admissionReviewVersions:
         - v1

diff --git a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
@@ -7028,6 +7028,14 @@ spec:
                         - IfNotPresent
                         - Never
                       type: string
+                    maxNumberOfRunningWorkspacesPerCluster:
+                      description: |-
+                        The maximum number of concurrently running workspaces across the entire Kubernetes cluster.
+                        This applies to all users in the system. If the value is set to -1, it means there is
+                        no limit on the number of running workspaces.
+                      format: int64
+                      minimum: -1
+                      type: integer
                     maxNumberOfRunningWorkspacesPerUser:
                       description: |-
                         The maximum number of running workspaces per user.

diff --git a/config/crd/bases/org.eclipse.che_checlusters.yaml b/config/crd/bases/org.eclipse.che_checlusters.yaml
@@ -6981,6 +6981,14 @@ spec:
                     - IfNotPresent
                     - Never
                     type: string
+                  maxNumberOfRunningWorkspacesPerCluster:
+                    description: |-
+                      The maximum number of concurrently running workspaces across the entire Kubernetes cluster.
+                      This applies to all users in the system. If the value is set to -1, it means there is
+                      no limit on the number of running workspaces.
+                    format: int64
+                    minimum: -1
+                    type: integer
                   maxNumberOfRunningWorkspacesPerUser:
                     description: |-
                       The maximum number of running workspaces per user.

diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml
@@ -7002,6 +7002,14 @@ spec:
                     - IfNotPresent
                     - Never
                     type: string
+                  maxNumberOfRunningWorkspacesPerCluster:
+                    description: |-
+                      The maximum number of concurrently running workspaces across the entire Kubernetes cluster.
+                      This applies to all users in the system. If the value is set to -1, it means there is
+                      no limit on the number of running workspaces.
+                    format: int64
+                    minimum: -1
+                    type: integer
                   maxNumberOfRunningWorkspacesPerUser:
                     description: |-
                       The maximum number of running workspaces per user.

diff --git a/...y/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/...y/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
@@ -6997,6 +6997,14 @@ spec:
                     - IfNotPresent
                     - Never
                     type: string
+                  maxNumberOfRunningWorkspacesPerCluster:
+                    description: |-
+                      The maximum number of concurrently running workspaces across the entire Kubernetes cluster.
+                      This applies to all users in the system. If the value is set to -1, it means there is
+                      no limit on the number of running workspaces.
+                    format: int64
+                    minimum: -1
+                    type: integer
                   maxNumberOfRunningWorkspacesPerUser:
                     description: |-
                       The maximum number of running workspaces per user.

diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml
@@ -7002,6 +7002,14 @@ spec:
                     - IfNotPresent
                     - Never
                     type: string
+                  maxNumberOfRunningWorkspacesPerCluster:
+                    description: |-
+                      The maximum number of concurrently running workspaces across the entire Kubernetes cluster.
+                      This applies to all users in the system. If the value is set to -1, it means there is
+                      no limit on the number of running workspaces.
+                    format: int64
+                    minimum: -1
+                    type: integer
                   maxNumberOfRunningWorkspacesPerUser:
                     description: |-
                       The maximum number of running workspaces per user.

diff --git a/...oy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/...oy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
@@ -6997,6 +6997,14 @@ spec:
                     - IfNotPresent
                     - Never
                     type: string
+                  maxNumberOfRunningWorkspacesPerCluster:
+                    description: |-
+                      The maximum number of concurrently running workspaces across the entire Kubernetes cluster.
+                      This applies to all users in the system. If the value is set to -1, it means there is
+                      no limit on the number of running workspaces.
+                    format: int64
+                    minimum: -1
+                    type: integer
                   maxNumberOfRunningWorkspacesPerUser:
                     description: |-
                       The maximum number of running workspaces per user.

diff --git a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
@@ -6997,6 +6997,14 @@ spec:
                     - IfNotPresent
                     - Never
                     type: string
+                  maxNumberOfRunningWorkspacesPerCluster:
+                    description: |-
+                      The maximum number of concurrently running workspaces across the entire Kubernetes cluster.
+                      This applies to all users in the system. If the value is set to -1, it means there is
+                      no limit on the number of running workspaces.
+                    format: int64
+                    minimum: -1
+                    type: integer
                   maxNumberOfRunningWorkspacesPerUser:
                     description: |-
                       The maximum number of running workspaces per user.