diff --git a/api/v1/checluster_types.go b/api/v1/checluster_types.go index 4976e68414..bd4744a934 100644 --- a/api/v1/checluster_types.go +++ b/api/v1/checluster_types.go @@ -361,10 +361,12 @@ type CheClusterSpecServer struct { // The plugin ID must have `publisher/plugin/version`. // The URI must start from `http`. // +optional + // +kubebuilder:default:=che-incubator/che-code/insiders 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-latest"}}} WorkspaceDefaultComponents []devfile.Component `json:"workspaceDefaultComponents,omitempty"` // List of environment variables to set in the Che server container. // +optional diff --git a/api/v2/checluster_types.go b/api/v2/checluster_types.go index 69b4d1ba42..cc01a3e0cc 100644 --- a/api/v2/checluster_types.go +++ b/api/v2/checluster_types.go @@ -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: -che}, secondsOfInactivityBeforeIdling:1800, secondsOfRunBeforeIdling:-1} + // +kubebuilder:default:={defaultComponents: {{name: universal-developer-image, container: {image: "quay.io/devfile/universal-developer-image:ubi8-latest"}}}, defaultEditor: che-incubator/che-code/insiders, storage: {pvcStrategy: common}, defaultNamespace: {template: -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:=che-incubator/che-code/insiders 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-latest"}}} 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. diff --git a/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml index ccb44fe67d..86db8bfbce 100644 --- a/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml +++ b/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml @@ -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-661.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-661.next webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/next/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml b/bundle/next/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml index 905775f259..0b3fb10d59 100644 --- a/bundle/next/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml +++ b/bundle/next/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml @@ -2199,6 +2199,10 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: + default: + - container: + image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: che-incubator/che-code/insiders 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-latest + name: universal-developer-image + defaultEditor: che-incubator/che-code/insiders defaultNamespace: template: -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-latest + 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: che-incubator/che-code/insiders 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://`. diff --git a/config/crd/bases/org.eclipse.che_checlusters.yaml b/config/crd/bases/org.eclipse.che_checlusters.yaml index b23b6f74e2..0bba6e4187 100644 --- a/config/crd/bases/org.eclipse.che_checlusters.yaml +++ b/config/crd/bases/org.eclipse.che_checlusters.yaml @@ -2135,6 +2135,10 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: + default: + - container: + image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: che-incubator/che-code/insiders 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-latest + name: universal-developer-image + defaultEditor: che-incubator/che-code/insiders defaultNamespace: template: -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-latest + 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: che-incubator/che-code/insiders 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://`. diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index c4ed383d8f..1050aaa26e 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -1449,6 +1449,10 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: + default: + - container: + image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: che-incubator/che-code/insiders 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-latest + name: universal-developer-image + defaultEditor: che-incubator/che-code/insiders defaultNamespace: template: -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-latest + 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: che-incubator/che-code/insiders 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: 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 a54d29594c..08d9e4921f 100644 --- a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -1444,6 +1444,10 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: + default: + - container: + image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: che-incubator/che-code/insiders 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-latest + name: universal-developer-image + defaultEditor: che-incubator/che-code/insiders defaultNamespace: template: -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-latest + 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: che-incubator/che-code/insiders 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: diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index 66713d9770..ba93f44c75 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -1449,6 +1449,10 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: + default: + - container: + image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: che-incubator/che-code/insiders 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-latest + name: universal-developer-image + defaultEditor: che-incubator/che-code/insiders defaultNamespace: template: -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-latest + 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: che-incubator/che-code/insiders 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: 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 ca2eeddfad..63738b4540 100644 --- a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -1444,6 +1444,10 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: + default: + - container: + image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: che-incubator/che-code/insiders 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-latest + name: universal-developer-image + defaultEditor: che-incubator/che-code/insiders defaultNamespace: template: -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-latest + 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: che-incubator/che-code/insiders 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: diff --git a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index a54d29594c..08d9e4921f 100644 --- a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -1444,6 +1444,10 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: + default: + - container: + image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: che-incubator/che-code/insiders 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-latest + name: universal-developer-image + defaultEditor: che-incubator/che-code/insiders defaultNamespace: template: -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-latest + 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: che-incubator/che-code/insiders 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: