diff --git a/api/v2/checluster_types.go b/api/v2/checluster_types.go index e6f1875128..c5ea2974f2 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} + // +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, startTimeout:"5m"} DevEnvironments CheClusterDevEnvironments `json:"devEnvironments"` // Che components configuration. // +optional @@ -126,7 +126,9 @@ type CheClusterDevEnvironments struct { // StartTimeout determines the maximum duration a workspace can take to start // before it is automatically failed. // Duration should be specified in a format parseable by Go's time package, e.g. - // "15m", "20s", "1h30m", etc. If not specified, the default value of "5m" is used. + // "15m", "20s", "1h30m", etc. + // +optional + // +kubebuilder:default:="5m" StartTimeout string `json:"startTimeout,omitempty"` } diff --git a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml index 4109d9f4f0..5cb266f8b9 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.59.0-741.next + name: eclipse-che.v7.59.0-742.next namespace: placeholder spec: apiservicedefinitions: {} @@ -1233,7 +1233,7 @@ spec: minKubeVersion: 1.19.0 provider: name: Eclipse Foundation - version: 7.59.0-741.next + version: 7.59.0-742.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 8ac7c7814d..381a5b04af 100644 --- a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml +++ b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml @@ -5410,6 +5410,7 @@ spec: disableContainerBuildCapabilities: true secondsOfInactivityBeforeIdling: 1800 secondsOfRunBeforeIdling: -1 + startTimeout: 5m storage: pvcStrategy: per-user description: Development environment default configuration options. @@ -7006,11 +7007,11 @@ spec: pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string startTimeout: + default: 5m description: StartTimeout determines the maximum duration a workspace can take to start before it is automatically failed. Duration should be specified in a format parseable by Go's - time package, e.g. "15m", "20s", "1h30m", etc. If not specified, - the default value of "5m" is used. + time package, e.g. "15m", "20s", "1h30m", etc. type: string storage: default: diff --git a/config/crd/bases/org.eclipse.che_checlusters.yaml b/config/crd/bases/org.eclipse.che_checlusters.yaml index e6973a5974..817f11ddab 100644 --- a/config/crd/bases/org.eclipse.che_checlusters.yaml +++ b/config/crd/bases/org.eclipse.che_checlusters.yaml @@ -5271,6 +5271,7 @@ spec: disableContainerBuildCapabilities: true secondsOfInactivityBeforeIdling: 1800 secondsOfRunBeforeIdling: -1 + startTimeout: 5m storage: pvcStrategy: per-user description: Development environment default configuration options. @@ -6816,11 +6817,11 @@ spec: pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string startTimeout: + default: 5m description: StartTimeout determines the maximum duration a workspace can take to start before it is automatically failed. Duration should be specified in a format parseable by Go's time package, - e.g. "15m", "20s", "1h30m", etc. If not specified, the default - value of "5m" is used. + e.g. "15m", "20s", "1h30m", etc. type: string storage: default: diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index 8c261d34e0..8103587243 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -5290,6 +5290,7 @@ spec: disableContainerBuildCapabilities: true secondsOfInactivityBeforeIdling: 1800 secondsOfRunBeforeIdling: -1 + startTimeout: 5m storage: pvcStrategy: per-user description: Development environment default configuration options. @@ -6835,11 +6836,11 @@ spec: pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string startTimeout: + default: 5m description: StartTimeout determines the maximum duration a workspace can take to start before it is automatically failed. Duration should be specified in a format parseable by Go's time package, - e.g. "15m", "20s", "1h30m", etc. If not specified, the default - value of "5m" is used. + e.g. "15m", "20s", "1h30m", etc. type: string storage: default: 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 45ca5f5795..2a1fc8e394 100644 --- a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -5285,6 +5285,7 @@ spec: disableContainerBuildCapabilities: true secondsOfInactivityBeforeIdling: 1800 secondsOfRunBeforeIdling: -1 + startTimeout: 5m storage: pvcStrategy: per-user description: Development environment default configuration options. @@ -6830,11 +6831,11 @@ spec: pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string startTimeout: + default: 5m description: StartTimeout determines the maximum duration a workspace can take to start before it is automatically failed. Duration should be specified in a format parseable by Go's time package, - e.g. "15m", "20s", "1h30m", etc. If not specified, the default - value of "5m" is used. + e.g. "15m", "20s", "1h30m", etc. type: string storage: default: diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index cb478882e5..68da9cc3bc 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -5290,6 +5290,7 @@ spec: disableContainerBuildCapabilities: true secondsOfInactivityBeforeIdling: 1800 secondsOfRunBeforeIdling: -1 + startTimeout: 5m storage: pvcStrategy: per-user description: Development environment default configuration options. @@ -6835,11 +6836,11 @@ spec: pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string startTimeout: + default: 5m description: StartTimeout determines the maximum duration a workspace can take to start before it is automatically failed. Duration should be specified in a format parseable by Go's time package, - e.g. "15m", "20s", "1h30m", etc. If not specified, the default - value of "5m" is used. + e.g. "15m", "20s", "1h30m", etc. type: string storage: default: 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 e729815154..361f7d7136 100644 --- a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -5285,6 +5285,7 @@ spec: disableContainerBuildCapabilities: true secondsOfInactivityBeforeIdling: 1800 secondsOfRunBeforeIdling: -1 + startTimeout: 5m storage: pvcStrategy: per-user description: Development environment default configuration options. @@ -6830,11 +6831,11 @@ spec: pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string startTimeout: + default: 5m description: StartTimeout determines the maximum duration a workspace can take to start before it is automatically failed. Duration should be specified in a format parseable by Go's time package, - e.g. "15m", "20s", "1h30m", etc. If not specified, the default - value of "5m" is used. + e.g. "15m", "20s", "1h30m", etc. type: string storage: default: diff --git a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index 45ca5f5795..2a1fc8e394 100644 --- a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -5285,6 +5285,7 @@ spec: disableContainerBuildCapabilities: true secondsOfInactivityBeforeIdling: 1800 secondsOfRunBeforeIdling: -1 + startTimeout: 5m storage: pvcStrategy: per-user description: Development environment default configuration options. @@ -6830,11 +6831,11 @@ spec: pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ type: string startTimeout: + default: 5m description: StartTimeout determines the maximum duration a workspace can take to start before it is automatically failed. Duration should be specified in a format parseable by Go's time package, - e.g. "15m", "20s", "1h30m", etc. If not specified, the default - value of "5m" is used. + e.g. "15m", "20s", "1h30m", etc. type: string storage: default: