Skip to content

Commit

Permalink
Update images
Browse files Browse the repository at this point in the history
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
  • Loading branch information
tolusha committed Aug 24, 2022
1 parent fd6bee1 commit 508b8de
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 49 deletions.
4 changes: 2 additions & 2 deletions api/v1/checluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions api/v2/checluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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: <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
Expand Down Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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`.
Expand Down Expand Up @@ -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: <username>-che
secondsOfInactivityBeforeIdling: 1800
Expand All @@ -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
Expand Down Expand Up @@ -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://`.
Expand Down
12 changes: 6 additions & 6 deletions config/crd/bases/org.eclipse.che_checlusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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`.
Expand Down Expand Up @@ -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: <username>-che
secondsOfInactivityBeforeIdling: 1800
Expand All @@ -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
Expand Down Expand Up @@ -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://`.
Expand Down
12 changes: 6 additions & 6 deletions deploy/deployment/kubernetes/combined.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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: <username>-che
secondsOfInactivityBeforeIdling: 1800
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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: <username>-che
secondsOfInactivityBeforeIdling: 1800
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions deploy/deployment/openshift/combined.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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: <username>-che
secondsOfInactivityBeforeIdling: 1800
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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: <username>-che
secondsOfInactivityBeforeIdling: 1800
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading

0 comments on commit 508b8de

Please sign in to comment.