From cbf068fa32caa392fbd3ea7b0a94f7386dba48d6 Mon Sep 17 00:00:00 2001 From: Andrew Obuchowicz Date: Mon, 24 Jul 2023 15:26:45 +0000 Subject: [PATCH] chore: update dev resources for persistUserHome Che Cluster CR field Signed-off-by: Andrew Obuchowicz --- api/v2/checluster_types.go | 10 ++++---- api/v2/zz_generated.deepcopy.go | 25 +++++++++++++++++++ .../che-operator.clusterserviceversion.yaml | 4 +-- .../org.eclipse.che_checlusters.yaml | 11 ++++++++ .../bases/org.eclipse.che_checlusters.yaml | 11 ++++++++ deploy/deployment/kubernetes/combined.yaml | 11 ++++++++ ....eclipse.che.CustomResourceDefinition.yaml | 11 ++++++++ deploy/deployment/openshift/combined.yaml | 11 ++++++++ ....eclipse.che.CustomResourceDefinition.yaml | 11 ++++++++ ....eclipse.che.CustomResourceDefinition.yaml | 11 ++++++++ 10 files changed, 109 insertions(+), 7 deletions(-) diff --git a/api/v2/checluster_types.go b/api/v2/checluster_types.go index 3f318193f8..61313d33df 100644 --- a/api/v2/checluster_types.go +++ b/api/v2/checluster_types.go @@ -442,11 +442,11 @@ type WorkspaceStorage struct { } type PersistentHomeConfig struct { - // Determines whether the user home directory in workspaces should persist between - // workspace shutdown and startup. - // Must be used with the 'per-user' or 'per-workspace' PVC strategy in order to take effect. - // Disabled by default. - Enabled *bool `json:"enabled,omitempty"` + // Determines whether the user home directory in workspaces should persist between + // workspace shutdown and startup. + // Must be used with the 'per-user' or 'per-workspace' PVC strategy in order to take effect. + // Disabled by default. + Enabled *bool `json:"enabled,omitempty"` } type WorkspaceDefaultPlugins struct { diff --git a/api/v2/zz_generated.deepcopy.go b/api/v2/zz_generated.deepcopy.go index eda72b2cb4..3eabf49a2c 100644 --- a/api/v2/zz_generated.deepcopy.go +++ b/api/v2/zz_generated.deepcopy.go @@ -178,6 +178,11 @@ func (in *CheClusterDevEnvironments) DeepCopyInto(out *CheClusterDevEnvironments (*in).DeepCopyInto(*out) } in.Storage.DeepCopyInto(&out.Storage) + if in.PersistUserHome != nil { + in, out := &in.PersistUserHome, &out.PersistUserHome + *out = new(PersistentHomeConfig) + (*in).DeepCopyInto(*out) + } if in.DefaultPlugins != nil { in, out := &in.DefaultPlugins, &out.DefaultPlugins *out = make([]WorkspaceDefaultPlugins, len(*in)) @@ -757,6 +762,26 @@ func (in *PVC) DeepCopy() *PVC { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *PersistentHomeConfig) DeepCopyInto(out *PersistentHomeConfig) { + *out = *in + if in.Enabled != nil { + in, out := &in.Enabled, &out.Enabled + *out = new(bool) + **out = **in + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PersistentHomeConfig. +func (in *PersistentHomeConfig) DeepCopy() *PersistentHomeConfig { + if in == nil { + return nil + } + out := new(PersistentHomeConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PluginRegistry) DeepCopyInto(out *PluginRegistry) { *out = *in diff --git a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml index 60346eff15..db04e7306d 100644 --- a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml +++ b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml @@ -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.71.0-804.next + name: eclipse-che.v7.72.0-805.next namespace: placeholder spec: apiservicedefinitions: {} @@ -1231,7 +1231,7 @@ spec: minKubeVersion: 1.19.0 provider: name: Eclipse Foundation - version: 7.71.0-804.next + version: 7.72.0-805.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 index ecde1055a4..ddbf8f5f12 100644 --- a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml +++ b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml @@ -7012,6 +7012,17 @@ spec: description: The node selector limits the nodes that can run the workspace pods. type: object + persistUserHome: + description: PersistUserHome defines configuration options for + persisting the user home directory in workspaces. + properties: + enabled: + description: Determines whether the user home directory + in workspaces should persist between workspace shutdown + and startup. Must be used with the 'per-user' or 'per-workspace' + PVC strategy in order to take effect. Disabled by default. + type: boolean + type: object podSchedulerName: description: Pod scheduler for the workspace pods. If not specified, the pod scheduler is set to the default scheduler on the cluster. diff --git a/config/crd/bases/org.eclipse.che_checlusters.yaml b/config/crd/bases/org.eclipse.che_checlusters.yaml index 2d8f923f00..c938e25247 100644 --- a/config/crd/bases/org.eclipse.che_checlusters.yaml +++ b/config/crd/bases/org.eclipse.che_checlusters.yaml @@ -6815,6 +6815,17 @@ spec: description: The node selector limits the nodes that can run the workspace pods. type: object + persistUserHome: + description: PersistUserHome defines configuration options for + persisting the user home directory in workspaces. + properties: + enabled: + description: Determines whether the user home directory in + workspaces should persist between workspace shutdown and + startup. Must be used with the 'per-user' or 'per-workspace' + PVC strategy in order to take effect. Disabled by default. + type: boolean + type: object podSchedulerName: description: Pod scheduler for the workspace pods. If not specified, the pod scheduler is set to the default scheduler on the cluster. diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index bc722e7a32..40486e30fa 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -6834,6 +6834,17 @@ spec: description: The node selector limits the nodes that can run the workspace pods. type: object + persistUserHome: + description: PersistUserHome defines configuration options for + persisting the user home directory in workspaces. + properties: + enabled: + description: Determines whether the user home directory in + workspaces should persist between workspace shutdown and + startup. Must be used with the 'per-user' or 'per-workspace' + PVC strategy in order to take effect. Disabled by default. + type: boolean + type: object podSchedulerName: description: Pod scheduler for the workspace pods. If not specified, the pod scheduler is set to the default scheduler on the cluster. diff --git a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index 22033546ab..a5c33846d0 100644 --- a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -6829,6 +6829,17 @@ spec: description: The node selector limits the nodes that can run the workspace pods. type: object + persistUserHome: + description: PersistUserHome defines configuration options for + persisting the user home directory in workspaces. + properties: + enabled: + description: Determines whether the user home directory in + workspaces should persist between workspace shutdown and + startup. Must be used with the 'per-user' or 'per-workspace' + PVC strategy in order to take effect. Disabled by default. + type: boolean + type: object podSchedulerName: description: Pod scheduler for the workspace pods. If not specified, the pod scheduler is set to the default scheduler on the cluster. diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index 6e72e60616..be00e9f235 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -6834,6 +6834,17 @@ spec: description: The node selector limits the nodes that can run the workspace pods. type: object + persistUserHome: + description: PersistUserHome defines configuration options for + persisting the user home directory in workspaces. + properties: + enabled: + description: Determines whether the user home directory in + workspaces should persist between workspace shutdown and + startup. Must be used with the 'per-user' or 'per-workspace' + PVC strategy in order to take effect. Disabled by default. + type: boolean + type: object podSchedulerName: description: Pod scheduler for the workspace pods. If not specified, the pod scheduler is set to the default scheduler on the cluster. diff --git a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index f5119c1a03..025e79b373 100644 --- a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -6829,6 +6829,17 @@ spec: description: The node selector limits the nodes that can run the workspace pods. type: object + persistUserHome: + description: PersistUserHome defines configuration options for + persisting the user home directory in workspaces. + properties: + enabled: + description: Determines whether the user home directory in + workspaces should persist between workspace shutdown and + startup. Must be used with the 'per-user' or 'per-workspace' + PVC strategy in order to take effect. Disabled by default. + type: boolean + type: object podSchedulerName: description: Pod scheduler for the workspace pods. If not specified, the pod scheduler is set to the default scheduler on the cluster. diff --git a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index 22033546ab..a5c33846d0 100644 --- a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -6829,6 +6829,17 @@ spec: description: The node selector limits the nodes that can run the workspace pods. type: object + persistUserHome: + description: PersistUserHome defines configuration options for + persisting the user home directory in workspaces. + properties: + enabled: + description: Determines whether the user home directory in + workspaces should persist between workspace shutdown and + startup. Must be used with the 'per-user' or 'per-workspace' + PVC strategy in order to take effect. Disabled by default. + type: boolean + type: object podSchedulerName: description: Pod scheduler for the workspace pods. If not specified, the pod scheduler is set to the default scheduler on the cluster.