seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: limit the number of workspaces per user (#1585) 

* feat: limit the number of workspaces per user

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
pull/1600/head
Anatolii Bazko 2023-01-13 14:07:36 +02:00 committed by GitHub
parent 4e75590a11
commit 397c97c675
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 160 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/checluster_conversion_from_test.go
View File

@ -301,9 +301,6 @@ func TestConvertFrom(t *testing.T) {
CredentialsSecretName: "ProxyCredentialsSecretName",
},
},
DevWorkspace: chev2.DevWorkspace{
RunningLimit: "RunningLimit",
},
},
Networking: chev2.CheClusterSpecNetworking{
Auth: chev2.Auth{
@ -399,8 +396,9 @@ func TestConvertFrom(t *testing.T) {
Value: "Value",
Effect: "Effect",
}},
SecondsOfInactivityBeforeIdling: pointer.Int32Ptr(1800),
SecondsOfRunBeforeIdling: pointer.Int32Ptr(-1),
SecondsOfInactivityBeforeIdling: pointer.Int32Ptr(1800),
SecondsOfRunBeforeIdling: pointer.Int32Ptr(-1),
MaxNumberOfRunningWorkspacesPerUser: pointer.Int64Ptr(10),
},
ContainerRegistry: chev2.CheClusterContainerRegistry{
Hostname: "AirGapContainerRegistryHostname",
@ -487,7 +485,7 @@ func TestConvertFrom(t *testing.T) {
assert.Equal(t, checlusterv1.Spec.Database.PostgresEnv[0].Name, "database-name")
assert.Equal(t, checlusterv1.Spec.Database.PostgresEnv[0].Value, "database-value")
assert.Equal(t, checlusterv1.Spec.DevWorkspace.RunningLimit, "RunningLimit")
assert.Equal(t, checlusterv1.Spec.DevWorkspace.RunningLimit, "10")
assert.Equal(t, checlusterv1.Spec.DevWorkspace.SecondsOfInactivityBeforeIdling, pointer.Int32Ptr(1800))
assert.Equal(t, checlusterv1.Spec.DevWorkspace.SecondsOfRunBeforeIdling, pointer.Int32Ptr(-1))
assert.True(t, checlusterv1.Spec.DevWorkspace.Enable)

5
api/checluster_conversion_to_test.go
View File

@ -334,7 +334,7 @@ func TestConvertTo(t *testing.T) {
},
DevWorkspace: chev1.CheClusterSpecDevWorkspace{
Enable: true,
RunningLimit: "RunningLimit",
RunningLimit: "10",
SecondsOfInactivityBeforeIdling: pointer.Int32Ptr(1800),
SecondsOfRunBeforeIdling: pointer.Int32Ptr(-1),
},
@ -473,8 +473,6 @@ func TestConvertTo(t *testing.T) {
assert.Equal(t, checlusterv2.Spec.Components.Database.Pvc.ClaimSize, "DatabasePvcClaimSize")
assert.Equal(t, checlusterv2.Spec.Components.Database.Pvc.StorageClass, "PostgresPVCStorageClassName")
assert.Equal(t, checlusterv2.Spec.Components.DevWorkspace.RunningLimit, "RunningLimit")
assert.Equal(t, checlusterv2.Spec.Components.ImagePuller.Enable, true)
assert.Equal(t, checlusterv2.Spec.Components.Metrics.Enable, true)
@ -516,6 +514,7 @@ func TestConvertTo(t *testing.T) {
assert.Equal(t, checlusterv2.Spec.DevEnvironments.Storage.PvcStrategy, "PvcStrategy")
assert.Equal(t, checlusterv2.Spec.DevEnvironments.SecondsOfInactivityBeforeIdling, pointer.Int32Ptr(1800))
assert.Equal(t, checlusterv2.Spec.DevEnvironments.SecondsOfRunBeforeIdling, pointer.Int32Ptr(-1))
assert.Equal(t, checlusterv2.Spec.DevEnvironments.MaxNumberOfRunningWorkspacesPerUser, pointer.Int64Ptr(10))
assert.Equal(t, checlusterv2.Status.CheURL, "CheURL")
assert.Equal(t, checlusterv2.Status.CheVersion, "CheVersion")

4
api/checluster_round_conversion_test.go
View File

@ -236,9 +236,6 @@ func TestRoundConvertCheClusterV2(t *testing.T) {
CredentialsSecretName: "ProxyCredentialsSecretName",
},
},
DevWorkspace: chev2.DevWorkspace{
RunningLimit: "RunningLimit",
},
},
Networking: chev2.CheClusterSpecNetworking{
TlsSecretName: "che-tls",
@ -308,6 +305,7 @@ func TestRoundConvertCheClusterV2(t *testing.T) {
Value: "Value",
Effect: "Effect",
}},
MaxNumberOfRunningWorkspacesPerUser: pointer.Int64Ptr(10),
},
ContainerRegistry: chev2.CheClusterContainerRegistry{
Hostname: "AirGapContainerRegistryHostname",

4
api/v1/checluster_conversion_from.go
View File

@ -385,7 +385,9 @@ func (dst *CheCluster) convertFrom_Database(src *chev2.CheCluster) error {
}
func (dst *CheCluster) convertFrom_DevWorkspace(src *chev2.CheCluster) error {
dst.Spec.DevWorkspace.RunningLimit = src.Spec.Components.DevWorkspace.RunningLimit
if src.Spec.DevEnvironments.MaxNumberOfRunningWorkspacesPerUser != nil {
dst.Spec.DevWorkspace.RunningLimit = strconv.FormatInt(*src.Spec.DevEnvironments.MaxNumberOfRunningWorkspacesPerUser, 10)
}
dst.Spec.DevWorkspace.SecondsOfInactivityBeforeIdling = src.Spec.DevEnvironments.SecondsOfInactivityBeforeIdling
dst.Spec.DevWorkspace.SecondsOfRunBeforeIdling = src.Spec.DevEnvironments.SecondsOfRunBeforeIdling
dst.Spec.DevWorkspace.Enable = true

6
api/v1/checluster_conversion_to.go
View File

@ -290,7 +290,11 @@ func (src *CheCluster) convertTo_Components(dst *chev2.CheCluster) error {
}
func (src *CheCluster) convertTo_Components_DevWorkspace(dst *chev2.CheCluster) error {
dst.Spec.Components.DevWorkspace.RunningLimit = src.Spec.DevWorkspace.RunningLimit
if src.Spec.DevWorkspace.RunningLimit != "" {
runningLimit, err := strconv.ParseInt(src.Spec.DevWorkspace.RunningLimit, 10, 64)
dst.Spec.DevEnvironments.MaxNumberOfRunningWorkspacesPerUser = pointer.Int64Ptr(runningLimit)
return err
}
return nil
}

14
api/v2/checluster_types.go
View File

@ -37,7 +37,7 @@ type CheClusterSpec struct {
// +optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Development environments"
// +kubebuilder:default:={disableContainerBuildCapabilities: true, defaultComponents: {{name: universal-developer-image, container: {image: "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}}, defaultEditor: che-incubator/che-code/insiders, storage: {pvcStrategy: per-user}, defaultNamespace: {template: <username>-che, autoProvision: true}, secondsOfInactivityBeforeIdling:1800, secondsOfRunBeforeIdling:-1, startTimeoutSeconds:300}
// +kubebuilder:default:={disableContainerBuildCapabilities: true, defaultComponents: {{name: universal-developer-image, container: {image: "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}}, defaultEditor: che-incubator/che-code/insiders, storage: {pvcStrategy: per-user}, defaultNamespace: {template: <username>-che, autoProvision: true}, secondsOfInactivityBeforeIdling:1800, secondsOfRunBeforeIdling:-1, startTimeoutSeconds:300, maxNumberOfWorkspacesPerUser:-1}
DevEnvironments CheClusterDevEnvironments `json:"devEnvironments"`
// Che components configuration.
// +optional
@ -130,6 +130,17 @@ type CheClusterDevEnvironments struct {
// +kubebuilder:validation:Minimum:=1
// +kubebuilder:default:=300
StartTimeoutSeconds *int32 `json:"startTimeoutSeconds,omitempty"`
// Total number of workspaces, both stopped and running, that a user can keep.
// The value, -1, allows users to keep an unlimited number of workspaces.
// +kubebuilder:validation:Minimum:=-1
// +kubebuilder:default:=-1
// +optional
MaxNumberOfWorkspacesPerUser *int64 `json:"maxNumberOfWorkspacesPerUser,omitempty"`
// The maximum number of running workspaces per user.
// The value, -1, allows users to run an unlimited number of workspaces.
// +kubebuilder:validation:Minimum:=-1
// +optional
MaxNumberOfRunningWorkspacesPerUser *int64 `json:"maxNumberOfRunningWorkspacesPerUser,omitempty"`
}
// Che components configuration.
@ -360,6 +371,7 @@ type ImagePuller struct {
// See https://github.com/devfile/devworkspace-operator
// +k8s:openapi-gen=true
type DevWorkspace struct {
// Deprecated in favor of `MaxNumberOfRunningWorkspacesPerUser`
// The maximum number of running workspaces per user.
// +optional
RunningLimit string `json:"runningLimit,omitempty"`

10
api/v2/zz_generated.deepcopy.go
View File

@ -192,6 +192,16 @@ func (in *CheClusterDevEnvironments) DeepCopyInto(out *CheClusterDevEnvironments
*out = new(int32)
**out = **in
}
if in.MaxNumberOfWorkspacesPerUser != nil {
in, out := &in.MaxNumberOfWorkspacesPerUser, &out.MaxNumberOfWorkspacesPerUser
*out = new(int64)
**out = **in
}
if in.MaxNumberOfRunningWorkspacesPerUser != nil {
in, out := &in.MaxNumberOfRunningWorkspacesPerUser, &out.MaxNumberOfRunningWorkspacesPerUser
*out = new(int64)
**out = **in
}
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CheClusterDevEnvironments.

4
bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml
View File

@ -77,7 +77,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.59.0-745.next
name: eclipse-che.v7.60.0-755.next
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -1233,7 +1233,7 @@ spec:
minKubeVersion: 1.19.0
provider:
name: Eclipse Foundation
version: 7.59.0-745.next
version: 7.60.0-755.next
webhookdefinitions:
- admissionReviewVersions:
- v1

20
bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml
View File

@ -4846,8 +4846,8 @@ spec:
description: DevWorkspace Operator configuration.
properties:
runningLimit:
description: The maximum number of running workspaces per
user.
description: Deprecated in favor of `MaxNumberOfRunningWorkspacesPerUser`
The maximum number of running workspaces per user.
type: string
type: object
devfileRegistry:
@ -5408,6 +5408,7 @@ spec:
autoProvision: true
template: <username>-che
disableContainerBuildCapabilities: true
maxNumberOfWorkspacesPerUser: -1
secondsOfInactivityBeforeIdling: 1800
secondsOfRunBeforeIdling: -1
startTimeoutSeconds: 300
@ -6975,6 +6976,21 @@ spec:
default: true
description: Disables the container build capabilities.
type: boolean
maxNumberOfRunningWorkspacesPerUser:
description: The maximum number of running workspaces per user.
The value, -1, allows users to run an unlimited number of
workspaces.
format: int64
minimum: -1
type: integer
maxNumberOfWorkspacesPerUser:
default: -1
description: Total number of workspaces, both stopped and running,
that a user can keep. The value, -1, allows users to keep
an unlimited number of workspaces.
format: int64
minimum: -1
type: integer
nodeSelector:
additionalProperties:
type: string

19
config/crd/bases/org.eclipse.che_checlusters.yaml
View File

@ -4715,8 +4715,8 @@ spec:
description: DevWorkspace Operator configuration.
properties:
runningLimit:
description: The maximum number of running workspaces per
user.
description: Deprecated in favor of `MaxNumberOfRunningWorkspacesPerUser`
The maximum number of running workspaces per user.
type: string
type: object
devfileRegistry:
@ -5269,6 +5269,7 @@ spec:
autoProvision: true
template: <username>-che
disableContainerBuildCapabilities: true
maxNumberOfWorkspacesPerUser: -1
secondsOfInactivityBeforeIdling: 1800
secondsOfRunBeforeIdling: -1
startTimeoutSeconds: 300
@ -6785,6 +6786,20 @@ spec:
default: true
description: Disables the container build capabilities.
type: boolean
maxNumberOfRunningWorkspacesPerUser:
description: The maximum number of running workspaces per user.
The value, -1, allows users to run an unlimited number of workspaces.
format: int64
minimum: -1
type: integer
maxNumberOfWorkspacesPerUser:
default: -1
description: Total number of workspaces, both stopped and running,
that a user can keep. The value, -1, allows users to keep an
unlimited number of workspaces.
format: int64
minimum: -1
type: integer
nodeSelector:
additionalProperties:
type: string

19
deploy/deployment/kubernetes/combined.yaml
View File

@ -4734,8 +4734,8 @@ spec:
description: DevWorkspace Operator configuration.
properties:
runningLimit:
description: The maximum number of running workspaces per
user.
description: Deprecated in favor of `MaxNumberOfRunningWorkspacesPerUser`
The maximum number of running workspaces per user.
type: string
type: object
devfileRegistry:
@ -5288,6 +5288,7 @@ spec:
autoProvision: true
template: <username>-che
disableContainerBuildCapabilities: true
maxNumberOfWorkspacesPerUser: -1
secondsOfInactivityBeforeIdling: 1800
secondsOfRunBeforeIdling: -1
startTimeoutSeconds: 300
@ -6804,6 +6805,20 @@ spec:
default: true
description: Disables the container build capabilities.
type: boolean
maxNumberOfRunningWorkspacesPerUser:
description: The maximum number of running workspaces per user.
The value, -1, allows users to run an unlimited number of workspaces.
format: int64
minimum: -1
type: integer
maxNumberOfWorkspacesPerUser:
default: -1
description: Total number of workspaces, both stopped and running,
that a user can keep. The value, -1, allows users to keep an
unlimited number of workspaces.
format: int64
minimum: -1
type: integer
nodeSelector:
additionalProperties:
type: string

19
deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
View File

@ -4729,8 +4729,8 @@ spec:
description: DevWorkspace Operator configuration.
properties:
runningLimit:
description: The maximum number of running workspaces per
user.
description: Deprecated in favor of `MaxNumberOfRunningWorkspacesPerUser`
The maximum number of running workspaces per user.
type: string
type: object
devfileRegistry:
@ -5283,6 +5283,7 @@ spec:
autoProvision: true
template: <username>-che
disableContainerBuildCapabilities: true
maxNumberOfWorkspacesPerUser: -1
secondsOfInactivityBeforeIdling: 1800
secondsOfRunBeforeIdling: -1
startTimeoutSeconds: 300
@ -6799,6 +6800,20 @@ spec:
default: true
description: Disables the container build capabilities.
type: boolean
maxNumberOfRunningWorkspacesPerUser:
description: The maximum number of running workspaces per user.
The value, -1, allows users to run an unlimited number of workspaces.
format: int64
minimum: -1
type: integer
maxNumberOfWorkspacesPerUser:
default: -1
description: Total number of workspaces, both stopped and running,
that a user can keep. The value, -1, allows users to keep an
unlimited number of workspaces.
format: int64
minimum: -1
type: integer
nodeSelector:
additionalProperties:
type: string

19
deploy/deployment/openshift/combined.yaml
View File

@ -4734,8 +4734,8 @@ spec:
description: DevWorkspace Operator configuration.
properties:
runningLimit:
description: The maximum number of running workspaces per
user.
description: Deprecated in favor of `MaxNumberOfRunningWorkspacesPerUser`
The maximum number of running workspaces per user.
type: string
type: object
devfileRegistry:
@ -5288,6 +5288,7 @@ spec:
autoProvision: true
template: <username>-che
disableContainerBuildCapabilities: true
maxNumberOfWorkspacesPerUser: -1
secondsOfInactivityBeforeIdling: 1800
secondsOfRunBeforeIdling: -1
startTimeoutSeconds: 300
@ -6804,6 +6805,20 @@ spec:
default: true
description: Disables the container build capabilities.
type: boolean
maxNumberOfRunningWorkspacesPerUser:
description: The maximum number of running workspaces per user.
The value, -1, allows users to run an unlimited number of workspaces.
format: int64
minimum: -1
type: integer
maxNumberOfWorkspacesPerUser:
default: -1
description: Total number of workspaces, both stopped and running,
that a user can keep. The value, -1, allows users to keep an
unlimited number of workspaces.
format: int64
minimum: -1
type: integer
nodeSelector:
additionalProperties:
type: string

19
deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
View File

@ -4729,8 +4729,8 @@ spec:
description: DevWorkspace Operator configuration.
properties:
runningLimit:
description: The maximum number of running workspaces per
user.
description: Deprecated in favor of `MaxNumberOfRunningWorkspacesPerUser`
The maximum number of running workspaces per user.
type: string
type: object
devfileRegistry:
@ -5283,6 +5283,7 @@ spec:
autoProvision: true
template: <username>-che
disableContainerBuildCapabilities: true
maxNumberOfWorkspacesPerUser: -1
secondsOfInactivityBeforeIdling: 1800
secondsOfRunBeforeIdling: -1
startTimeoutSeconds: 300
@ -6799,6 +6800,20 @@ spec:
default: true
description: Disables the container build capabilities.
type: boolean
maxNumberOfRunningWorkspacesPerUser:
description: The maximum number of running workspaces per user.
The value, -1, allows users to run an unlimited number of workspaces.
format: int64
minimum: -1
type: integer
maxNumberOfWorkspacesPerUser:
default: -1
description: Total number of workspaces, both stopped and running,
that a user can keep. The value, -1, allows users to keep an
unlimited number of workspaces.
format: int64
minimum: -1
type: integer
nodeSelector:
additionalProperties:
type: string

19
helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
View File

@ -4729,8 +4729,8 @@ spec:
description: DevWorkspace Operator configuration.
properties:
runningLimit:
description: The maximum number of running workspaces per
user.
description: Deprecated in favor of `MaxNumberOfRunningWorkspacesPerUser`
The maximum number of running workspaces per user.
type: string
type: object
devfileRegistry:
@ -5283,6 +5283,7 @@ spec:
autoProvision: true
template: <username>-che
disableContainerBuildCapabilities: true
maxNumberOfWorkspacesPerUser: -1
secondsOfInactivityBeforeIdling: 1800
secondsOfRunBeforeIdling: -1
startTimeoutSeconds: 300
@ -6799,6 +6800,20 @@ spec:
default: true
description: Disables the container build capabilities.
type: boolean
maxNumberOfRunningWorkspacesPerUser:
description: The maximum number of running workspaces per user.
The value, -1, allows users to run an unlimited number of workspaces.
format: int64
minimum: -1
type: integer
maxNumberOfWorkspacesPerUser:
default: -1
description: Total number of workspaces, both stopped and running,
that a user can keep. The value, -1, allows users to keep an
unlimited number of workspaces.
format: int64
minimum: -1
type: integer
nodeSelector:
additionalProperties:
type: string