From 508b8de6d4c47f76bc27d55abb8725f6f862801e Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Wed, 24 Aug 2022 17:35:03 +0300 Subject: [PATCH] Update images Signed-off-by: Anatolii Bazko --- api/v1/checluster_types.go | 4 ++-- api/v2/checluster_types.go | 6 +++--- .../che-operator.clusterserviceversion.yaml | 4 ++-- .../manifests/org.eclipse.che_checlusters.yaml | 12 ++++++------ config/crd/bases/org.eclipse.che_checlusters.yaml | 12 ++++++------ deploy/deployment/kubernetes/combined.yaml | 12 ++++++------ ...ers.org.eclipse.che.CustomResourceDefinition.yaml | 12 ++++++------ deploy/deployment/openshift/combined.yaml | 12 ++++++------ ...ers.org.eclipse.che.CustomResourceDefinition.yaml | 12 ++++++------ ...ers.org.eclipse.che.CustomResourceDefinition.yaml | 12 ++++++------ 10 files changed, 49 insertions(+), 49 deletions(-) diff --git a/api/v1/checluster_types.go b/api/v1/checluster_types.go index bd4744a934..770f16898b 100644 --- a/api/v1/checluster_types.go +++ b/api/v1/checluster_types.go @@ -361,12 +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 + // +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-latest"}}} + // +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 diff --git a/api/v2/checluster_types.go b/api/v2/checluster_types.go index cc01a3e0cc..7540ce45f2 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:={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} + // +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: -che}, secondsOfInactivityBeforeIdling:1800, secondsOfRunBeforeIdling:-1} DevEnvironments CheClusterDevEnvironments `json:"devEnvironments"` // Che components configuration. // +optional @@ -85,12 +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 + // +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-latest"}}} + // +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. 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 86db8bfbce..c3385f1afd 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-661.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-661.next + version: 7.53.0-662.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 0b3fb10d59..bbfbd518b0 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 @@ -2201,7 +2201,7 @@ spec: workspaceDefaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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 @@ -3704,7 +3704,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + 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`. @@ -5528,9 +5528,9 @@ spec: default: defaultComponents: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: eclipse/che-theia/latest defaultNamespace: template: -che secondsOfInactivityBeforeIdling: 1800 @@ -5542,7 +5542,7 @@ spec: defaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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 @@ -7045,7 +7045,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + 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://`. diff --git a/config/crd/bases/org.eclipse.che_checlusters.yaml b/config/crd/bases/org.eclipse.che_checlusters.yaml index 0bba6e4187..4032a03913 100644 --- a/config/crd/bases/org.eclipse.che_checlusters.yaml +++ b/config/crd/bases/org.eclipse.che_checlusters.yaml @@ -2137,7 +2137,7 @@ spec: workspaceDefaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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 @@ -3590,7 +3590,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + 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`. @@ -5385,9 +5385,9 @@ spec: default: defaultComponents: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: eclipse/che-theia/latest defaultNamespace: template: -che secondsOfInactivityBeforeIdling: 1800 @@ -5399,7 +5399,7 @@ spec: defaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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 @@ -6852,7 +6852,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + 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://`. diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index 1050aaa26e..97b587ca12 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -1451,7 +1451,7 @@ spec: workspaceDefaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: @@ -2372,7 +2372,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + 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: @@ -3696,9 +3696,9 @@ spec: default: defaultComponents: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: eclipse/che-theia/latest defaultNamespace: template: -che secondsOfInactivityBeforeIdling: 1800 @@ -3710,7 +3710,7 @@ spec: defaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: @@ -4631,7 +4631,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + 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: 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 08d9e4921f..bcf0185952 100644 --- a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -1446,7 +1446,7 @@ spec: workspaceDefaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: @@ -2367,7 +2367,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + 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: @@ -3691,9 +3691,9 @@ spec: default: defaultComponents: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: eclipse/che-theia/latest defaultNamespace: template: -che secondsOfInactivityBeforeIdling: 1800 @@ -3705,7 +3705,7 @@ spec: defaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: @@ -4626,7 +4626,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + 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: diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index ba93f44c75..2ab7ff5839 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -1451,7 +1451,7 @@ spec: workspaceDefaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: @@ -2372,7 +2372,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + 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: @@ -3696,9 +3696,9 @@ spec: default: defaultComponents: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: eclipse/che-theia/latest defaultNamespace: template: -che secondsOfInactivityBeforeIdling: 1800 @@ -3710,7 +3710,7 @@ spec: defaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: @@ -4631,7 +4631,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + 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: 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 63738b4540..f54f1073cb 100644 --- a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -1446,7 +1446,7 @@ spec: workspaceDefaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: @@ -2367,7 +2367,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + 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: @@ -3691,9 +3691,9 @@ spec: default: defaultComponents: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: eclipse/che-theia/latest defaultNamespace: template: -che secondsOfInactivityBeforeIdling: 1800 @@ -3705,7 +3705,7 @@ spec: defaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: @@ -4626,7 +4626,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + 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: diff --git a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index 08d9e4921f..bcf0185952 100644 --- a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -1446,7 +1446,7 @@ spec: workspaceDefaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: @@ -2367,7 +2367,7 @@ spec: type: object type: array workspaceDefaultEditor: - default: che-incubator/che-code/insiders + 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: @@ -3691,9 +3691,9 @@ spec: default: defaultComponents: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 name: universal-developer-image - defaultEditor: che-incubator/che-code/insiders + defaultEditor: eclipse/che-theia/latest defaultNamespace: template: -che secondsOfInactivityBeforeIdling: 1800 @@ -3705,7 +3705,7 @@ spec: defaultComponents: default: - container: - image: quay.io/devfile/universal-developer-image:ubi8-latest + 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: @@ -4626,7 +4626,7 @@ spec: type: object type: array defaultEditor: - default: che-incubator/che-code/insiders + 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: