From cad72eb0122ccb61f98fe51c5e9c19e1e67ad9ae Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Thu, 9 Feb 2023 16:57:00 +0200 Subject: [PATCH] chore: set che-incubator/che-code/latest as a default editor (#1614) Signed-off-by: Valerii Svydenko --- api/v1/checluster_types.go | 2 +- api/v2/checluster_types.go | 4 ++-- .../manifests/che-operator.clusterserviceversion.yaml | 4 ++-- .../eclipse-che/manifests/org.eclipse.che_checlusters.yaml | 6 +++--- config/crd/bases/org.eclipse.che_checlusters.yaml | 6 +++--- deploy/deployment/kubernetes/combined.yaml | 6 +++--- ...heclusters.org.eclipse.che.CustomResourceDefinition.yaml | 6 +++--- deploy/deployment/openshift/combined.yaml | 6 +++--- ...heclusters.org.eclipse.che.CustomResourceDefinition.yaml | 6 +++--- ...heclusters.org.eclipse.che.CustomResourceDefinition.yaml | 6 +++--- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/api/v1/checluster_types.go b/api/v1/checluster_types.go index cdc5356fb..1ee3b1064 100644 --- a/api/v1/checluster_types.go +++ b/api/v1/checluster_types.go @@ -368,7 +368,7 @@ 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 + // +kubebuilder:default:=che-incubator/che-code/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. diff --git a/api/v2/checluster_types.go b/api/v2/checluster_types.go index 7a7dd701a..31e1ab409 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:={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: -che, autoProvision: true}, secondsOfInactivityBeforeIdling:1800, secondsOfRunBeforeIdling:-1, startTimeoutSeconds:300, maxNumberOfWorkspacesPerUser:-1} + // +kubebuilder:default:={disableContainerBuildCapabilities: true, defaultComponents: {{name: universal-developer-image, container: {image: "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}}, defaultEditor: che-incubator/che-code/latest, storage: {pvcStrategy: per-user}, defaultNamespace: {template: -che, autoProvision: true}, secondsOfInactivityBeforeIdling:1800, secondsOfRunBeforeIdling:-1, startTimeoutSeconds:300, maxNumberOfWorkspacesPerUser:-1} DevEnvironments CheClusterDevEnvironments `json:"devEnvironments"` // Che components configuration. // +optional @@ -90,7 +90,7 @@ 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 + // +kubebuilder:default:=che-incubator/che-code/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. diff --git a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml index d3da51fab..e7d41eb6e 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.61.0-760.next + name: eclipse-che.v7.61.0-761.next namespace: placeholder spec: apiservicedefinitions: {} @@ -1221,7 +1221,7 @@ spec: minKubeVersion: 1.19.0 provider: name: Eclipse Foundation - version: 7.61.0-760.next + version: 7.61.0-761.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 1d4f48db1..577f96cc1 100644 --- a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml +++ b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml @@ -3778,7 +3778,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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`. @@ -5397,7 +5397,7 @@ spec: - container: image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: che-incubator/che-code/latest defaultNamespace: autoProvision: true template: -che @@ -6925,7 +6925,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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://`. diff --git a/config/crd/bases/org.eclipse.che_checlusters.yaml b/config/crd/bases/org.eclipse.che_checlusters.yaml index 309f3f092..743b6b700 100644 --- a/config/crd/bases/org.eclipse.che_checlusters.yaml +++ b/config/crd/bases/org.eclipse.che_checlusters.yaml @@ -3664,7 +3664,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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`. @@ -5258,7 +5258,7 @@ spec: - container: image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: che-incubator/che-code/latest defaultNamespace: autoProvision: true template: -che @@ -6736,7 +6736,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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://`. diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index a87d11eb3..8962adcd9 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -3683,7 +3683,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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`. @@ -5277,7 +5277,7 @@ spec: - container: image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: che-incubator/che-code/latest defaultNamespace: autoProvision: true template: -che @@ -6755,7 +6755,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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://`. 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 4c7f3c7b4..ba102cd5e 100644 --- a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -3678,7 +3678,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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`. @@ -5272,7 +5272,7 @@ spec: - container: image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: che-incubator/che-code/latest defaultNamespace: autoProvision: true template: -che @@ -6750,7 +6750,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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://`. diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index 87a913cd2..4fb5ece3b 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -3683,7 +3683,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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`. @@ -5277,7 +5277,7 @@ spec: - container: image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: che-incubator/che-code/latest defaultNamespace: autoProvision: true template: -che @@ -6755,7 +6755,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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://`. 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 f81bb610a..6d0212a3d 100644 --- a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -3678,7 +3678,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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`. @@ -5272,7 +5272,7 @@ spec: - container: image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: che-incubator/che-code/latest defaultNamespace: autoProvision: true template: -che @@ -6750,7 +6750,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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://`. diff --git a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index 4c7f3c7b4..ba102cd5e 100644 --- a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -3678,7 +3678,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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`. @@ -5272,7 +5272,7 @@ spec: - container: image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: che-incubator/che-code/latest defaultNamespace: autoProvision: true template: -che @@ -6750,7 +6750,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + default: che-incubator/che-code/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://`.