Update dev resources

Signed-off-by: Anatolii Bazko <[email protected]>
eclipse-che · Dec 22, 2022 · 9b02186 · 9b02186
1 parent eee2c14
commit 9b02186
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 18 deletions.
diff --git 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-740.next
+  name: eclipse-che.v7.59.0-741.next
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1233,7 +1233,7 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: Eclipse Foundation
-  version: 7.59.0-740.next
+  version: 7.59.0-741.next
   webhookdefinitions:
     - admissionReviewVersions:
         - v1

diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml
@@ -6810,7 +6810,8 @@ spec:
                       workspace pods.
                     type: object
                   podSchedulerName:
-                    description: Pod scheduler for the workspace pods. If not specified, the pod scheduler is set to the default scheduler on the cluster.
+                    description: Pod scheduler for the workspace pods. If not specified,
+                      the pod scheduler is set to the default scheduler on the cluster.
                     type: string
                   secondsOfInactivityBeforeIdling:
                     default: 1800
@@ -6834,7 +6835,11 @@ spec:
                     pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
                     type: string
                   startTimeout:
-                    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.
+                    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.
                     type: string
                   storage:
                     default:

diff --git a/...y/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/...y/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
@@ -6805,7 +6805,8 @@ spec:
                       workspace pods.
                     type: object
                   podSchedulerName:
-                    description: Pod scheduler for the workspace pods. If not specified, the pod scheduler is set to the default scheduler on the cluster.
+                    description: Pod scheduler for the workspace pods. If not specified,
+                      the pod scheduler is set to the default scheduler on the cluster.
                     type: string
                   secondsOfInactivityBeforeIdling:
                     default: 1800
@@ -6829,7 +6830,11 @@ spec:
                     pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
                     type: string
                   startTimeout:
-                    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.
+                    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.
                     type: string
                   storage:
                     default:

diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml
@@ -6810,7 +6810,8 @@ spec:
                       workspace pods.
                     type: object
                   podSchedulerName:
-                    description: Pod scheduler for the workspace pods. If not specified, the pod scheduler is set to the default scheduler on the cluster.
+                    description: Pod scheduler for the workspace pods. If not specified,
+                      the pod scheduler is set to the default scheduler on the cluster.
                     type: string
                   secondsOfInactivityBeforeIdling:
                     default: 1800
@@ -6834,7 +6835,11 @@ spec:
                     pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
                     type: string
                   startTimeout:
-                    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.
+                    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.
                     type: string
                   storage:
                     default:

diff --git a/...oy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/...oy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
@@ -6805,7 +6805,8 @@ spec:
                       workspace pods.
                     type: object
                   podSchedulerName:
-                    description: Pod scheduler for the workspace pods. If not specified, the pod scheduler is set to the default scheduler on the cluster.
+                    description: Pod scheduler for the workspace pods. If not specified,
+                      the pod scheduler is set to the default scheduler on the cluster.
                     type: string
                   secondsOfInactivityBeforeIdling:
                     default: 1800
@@ -6829,7 +6830,11 @@ spec:
                     pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
                     type: string
                   startTimeout:
-                    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.
+                    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.
                     type: string
                   storage:
                     default:

diff --git a/go.mod b/go.mod
@@ -525,5 +525,3 @@ replace (
 )
 
 replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
-
-replace github.com/devfile/devworkspace-operator => github.com/dkwon17/devworkspace-operator v0.2.1-0.20221114184800-62aa6f1d7c01
diff --git a/go.sum b/go.sum
@@ -116,8 +116,6 @@ github.com/devfile/devworkspace-operator v0.18.0/go.mod h1:dllRPgSIhSE68szbATTkF
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dhui/dktest v0.3.2/go.mod h1:l1/ib23a/CmxAe7yixtrYPc8Iy90Zy2udyaHINM5p58=
-github.com/dkwon17/devworkspace-operator v0.2.1-0.20221114184800-62aa6f1d7c01 h1:qK27w9VKhAXSBXLAvCt0LiS+Du79ijEp5Fs7bvkOU2I=
-github.com/dkwon17/devworkspace-operator v0.2.1-0.20221114184800-62aa6f1d7c01/go.mod h1:xLELAolfebwROqGSvOWhdC0eH7S+V7iVFzHxtm3Jf2A=
 github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492 h1:FwssHbCDJD025h+BchanCwE1Q8fyMgqDr2mOQAWOLGw=
 github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=

diff --git a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml
@@ -6805,7 +6805,8 @@ spec:
                       workspace pods.
                     type: object
                   podSchedulerName:
-                    description: Pod scheduler for the workspace pods. If not specified, the pod scheduler is set to the default scheduler on the cluster.
+                    description: Pod scheduler for the workspace pods. If not specified,
+                      the pod scheduler is set to the default scheduler on the cluster.
                     type: string
                   secondsOfInactivityBeforeIdling:
                     default: 1800
@@ -6829,7 +6830,11 @@ spec:
                     pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
                     type: string
                   startTimeout:
-                    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.
+                    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.
                     type: string
                   storage:
                     default:

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -48,7 +48,7 @@ github.com/davecgh/go-spew/spew
 github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2
 github.com/devfile/api/v2/pkg/attributes
 github.com/devfile/api/v2/pkg/devfile
-# github.com/devfile/devworkspace-operator v0.18.0 => github.com/dkwon17/devworkspace-operator v0.2.1-0.20221114184800-62aa6f1d7c01
+# github.com/devfile/devworkspace-operator v0.18.0
 ## explicit; go 1.18
 github.com/devfile/devworkspace-operator/apis/controller/v1alpha1
 github.com/devfile/devworkspace-operator/controllers/controller/devworkspacerouting
@@ -1190,4 +1190,3 @@ sigs.k8s.io/yaml
 # sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.8.8
 # sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.10.17
 # github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
-# github.com/devfile/devworkspace-operator => github.com/dkwon17/devworkspace-operator v0.2.1-0.20221114184800-62aa6f1d7c01
Original file line number	Diff line number	Diff line change
Expand Up		@@ -525,5 +525,3 @@ replace (
		)

		replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm

		replace github.com/devfile/devworkspace-operator => github.com/dkwon17/devworkspace-operator v0.2.1-0.20221114184800-62aa6f1d7c01