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: set default components container image and default editor (#1486) 

* feat: set default components container image and default editor

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
pull/1488/head
Anatolii Bazko 2022-08-25 12:13:16 +03:00 committed by GitHub
parent 7d6dcbd914
commit 9d4f072023
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 112 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/v1/checluster_types.go
View File

@ -361,10 +361,12 @@ type CheClusterSpecServer struct {
// The plugin ID must have `publisher/plugin/version`.
// The URI must start from `http`.
// +optional
// +kubebuilder:default:=eclipse/che-theia/latest
WorkspaceDefaultEditor string `json:"workspaceDefaultEditor,omitempty"`
// Default components applied to DevWorkspaces.
// These default components are meant to be used when a Devfile does not contain any components.
// +optional
// +kubebuilder:default:={{name: universal-developer-image, container: {image: "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}}
WorkspaceDefaultComponents []devfile.Component `json:"workspaceDefaultComponents,omitempty"`
// List of environment variables to set in the Che server container.
// +optional

4
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:={storage: {pvcStrategy: common}, defaultNamespace: {template: <username>-che}, secondsOfInactivityBeforeIdling:1800, secondsOfRunBeforeIdling:-1}
// +kubebuilder:default:={defaultComponents: {{name: universal-developer-image, container: {image: "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}}, defaultEditor: eclipse/che-theia/latest, storage: {pvcStrategy: common}, defaultNamespace: {template: <username>-che}, secondsOfInactivityBeforeIdling:1800, secondsOfRunBeforeIdling:-1}
DevEnvironments CheClusterDevEnvironments `json:"devEnvironments"`
// Che components configuration.
// +optional
@ -85,10 +85,12 @@ type CheClusterDevEnvironments struct {
// The plugin ID must have `publisher/plugin/version` format.
// The URI must start from `http://` or `https://`.
// +optional
// +kubebuilder:default:=eclipse/che-theia/latest
DefaultEditor string `json:"defaultEditor,omitempty"`
// Default components applied to DevWorkspaces.
// These default components are meant to be used when a Devfile, that does not contain any components.
// +optional
// +kubebuilder:default:={{name: universal-developer-image, container: {image: "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}}
DefaultComponents []devfile.Component `json:"defaultComponents,omitempty"`
// Idle timeout for workspaces in seconds.
// This timeout is the duration after which a workspace will be idled if there is no activity.

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

@ -76,7 +76,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-preview-openshift.v7.53.0-650.next
name: eclipse-che-preview-openshift.v7.53.0-662.next
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -1389,7 +1389,7 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.53.0-650.next
version: 7.53.0-662.next
webhookdefinitions:
- admissionReviewVersions:
- v1

15
bundle/next/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml
View File

@ -2199,6 +2199,10 @@ spec:
description: Deprecated in favor of `disableInternalClusterSVCNames`.
type: boolean
workspaceDefaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These
default components are meant to be used when a Devfile does
not contain any components.
@ -3700,6 +3704,7 @@ spec:
type: object
type: array
workspaceDefaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It
could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`.
The URI must start from `http`.
@ -5521,6 +5526,11 @@ spec:
type: object
devEnvironments:
default:
defaultComponents:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
defaultEditor: eclipse/che-theia/latest
defaultNamespace:
template: <username>-che
secondsOfInactivityBeforeIdling: 1800
@ -5530,6 +5540,10 @@ spec:
description: Development environment default configuration options.
properties:
defaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These
default components are meant to be used when a Devfile, that
does not contain any components.
@ -7031,6 +7045,7 @@ spec:
type: object
type: array
defaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It
could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`
format. The URI must start from `http://` or `https://`.

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

@ -2135,6 +2135,10 @@ spec:
description: Deprecated in favor of `disableInternalClusterSVCNames`.
type: boolean
workspaceDefaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These
default components are meant to be used when a Devfile does
not contain any components.
@ -3586,6 +3590,7 @@ spec:
type: object
type: array
workspaceDefaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It could
be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`.
The URI must start from `http`.
@ -5378,6 +5383,11 @@ spec:
type: object
devEnvironments:
default:
defaultComponents:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
defaultEditor: eclipse/che-theia/latest
defaultNamespace:
template: <username>-che
secondsOfInactivityBeforeIdling: 1800
@ -5387,6 +5397,10 @@ spec:
description: Development environment default configuration options.
properties:
defaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These
default components are meant to be used when a Devfile, that
does not contain any components.
@ -6838,6 +6852,7 @@ spec:
type: object
type: array
defaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It could
be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`
format. The URI must start from `http://` or `https://`.

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

@ -1449,6 +1449,10 @@ spec:
description: Deprecated in favor of `disableInternalClusterSVCNames`.
type: boolean
workspaceDefaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile does not contain any components.
items:
properties:
@ -2368,6 +2372,7 @@ spec:
type: object
type: array
workspaceDefaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`. The URI must start from `http`.
type: string
workspaceNamespaceDefault:
@ -3689,6 +3694,11 @@ spec:
type: object
devEnvironments:
default:
defaultComponents:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
defaultEditor: eclipse/che-theia/latest
defaultNamespace:
template: <username>-che
secondsOfInactivityBeforeIdling: 1800
@ -3698,6 +3708,10 @@ spec:
description: Development environment default configuration options.
properties:
defaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile, that does not contain any components.
items:
properties:
@ -4617,6 +4631,7 @@ spec:
type: object
type: array
defaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version` format. The URI must start from `http://` or `https://`.
type: string
defaultNamespace:

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

@ -1444,6 +1444,10 @@ spec:
description: Deprecated in favor of `disableInternalClusterSVCNames`.
type: boolean
workspaceDefaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile does not contain any components.
items:
properties:
@ -2363,6 +2367,7 @@ spec:
type: object
type: array
workspaceDefaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`. The URI must start from `http`.
type: string
workspaceNamespaceDefault:
@ -3684,6 +3689,11 @@ spec:
type: object
devEnvironments:
default:
defaultComponents:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
defaultEditor: eclipse/che-theia/latest
defaultNamespace:
template: <username>-che
secondsOfInactivityBeforeIdling: 1800
@ -3693,6 +3703,10 @@ spec:
description: Development environment default configuration options.
properties:
defaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile, that does not contain any components.
items:
properties:
@ -4612,6 +4626,7 @@ spec:
type: object
type: array
defaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version` format. The URI must start from `http://` or `https://`.
type: string
defaultNamespace:

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

@ -1449,6 +1449,10 @@ spec:
description: Deprecated in favor of `disableInternalClusterSVCNames`.
type: boolean
workspaceDefaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile does not contain any components.
items:
properties:
@ -2368,6 +2372,7 @@ spec:
type: object
type: array
workspaceDefaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`. The URI must start from `http`.
type: string
workspaceNamespaceDefault:
@ -3689,6 +3694,11 @@ spec:
type: object
devEnvironments:
default:
defaultComponents:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
defaultEditor: eclipse/che-theia/latest
defaultNamespace:
template: <username>-che
secondsOfInactivityBeforeIdling: 1800
@ -3698,6 +3708,10 @@ spec:
description: Development environment default configuration options.
properties:
defaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile, that does not contain any components.
items:
properties:
@ -4617,6 +4631,7 @@ spec:
type: object
type: array
defaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version` format. The URI must start from `http://` or `https://`.
type: string
defaultNamespace:

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

@ -1444,6 +1444,10 @@ spec:
description: Deprecated in favor of `disableInternalClusterSVCNames`.
type: boolean
workspaceDefaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile does not contain any components.
items:
properties:
@ -2363,6 +2367,7 @@ spec:
type: object
type: array
workspaceDefaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`. The URI must start from `http`.
type: string
workspaceNamespaceDefault:
@ -3684,6 +3689,11 @@ spec:
type: object
devEnvironments:
default:
defaultComponents:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
defaultEditor: eclipse/che-theia/latest
defaultNamespace:
template: <username>-che
secondsOfInactivityBeforeIdling: 1800
@ -3693,6 +3703,10 @@ spec:
description: Development environment default configuration options.
properties:
defaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile, that does not contain any components.
items:
properties:
@ -4612,6 +4626,7 @@ spec:
type: object
type: array
defaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version` format. The URI must start from `http://` or `https://`.
type: string
defaultNamespace:

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

@ -1444,6 +1444,10 @@ spec:
description: Deprecated in favor of `disableInternalClusterSVCNames`.
type: boolean
workspaceDefaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile does not contain any components.
items:
properties:
@ -2363,6 +2367,7 @@ spec:
type: object
type: array
workspaceDefaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version`. The URI must start from `http`.
type: string
workspaceNamespaceDefault:
@ -3684,6 +3689,11 @@ spec:
type: object
devEnvironments:
default:
defaultComponents:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
defaultEditor: eclipse/che-theia/latest
defaultNamespace:
template: <username>-che
secondsOfInactivityBeforeIdling: 1800
@ -3693,6 +3703,10 @@ spec:
description: Development environment default configuration options.
properties:
defaultComponents:
default:
- container:
image: quay.io/devfile/universal-developer-image:ubi8-38da5c2
name: universal-developer-image
description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile, that does not contain any components.
items:
properties:
@ -4612,6 +4626,7 @@ spec:
type: object
type: array
defaultEditor:
default: eclipse/che-theia/latest
description: The default editor to workspace create with. It could be a plugin ID or a URI. The plugin ID must have `publisher/plugin/version` format. The URI must start from `http://` or `https://`.
type: string
defaultNamespace: