From 960953e348bed50f578afe4f9a0565a6a96f56f5 Mon Sep 17 00:00:00 2001 From: Angel Misevski Date: Thu, 3 Mar 2022 13:46:13 -0500 Subject: [PATCH] chore: Bump DevWorkspace Operator dependency to v0.13.0 Signed-off-by: Angel Misevski --- DEPENDENCIES.md | 2 +- go.mod | 2 +- go.sum | 4 ++-- .../controller/v1alpha1/devworkspaceoperatorconfig_types.go | 4 ++++ .../apis/controller/v1alpha1/zz_generated.deepcopy.go | 2 +- .../devfile/devworkspace-operator/pkg/constants/constants.go | 4 ++++ .../devfile/devworkspace-operator/pkg/constants/metadata.go | 5 +++++ vendor/modules.txt | 2 +- 8 files changed, 19 insertions(+), 6 deletions(-) diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index 8a47efb2a..540284523 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -460,4 +460,4 @@ | [golang.org/x/mobile@d3739f865fa66d07c1f506505c18aac71a8ead6e](https://cs.opensource.google/go) | BSD-3-Clause | N/A | | [github.com/devfile/api/v2@03e023e7078b64884216d8e6dce8f0cf8b7e74d2](https://github.com/devfile/api.git) | Apache-2.0 | [CQ](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23680) | | [github.com/che-incubator/kubernetes-image-puller-operator@0128446f5af78587c0427a35d693bbb8d24036bc](https://github.com/che-incubator/kubernetes-image-puller-operator.git) | EPL-2.0 | todo | -| [github.com/devfile/devworkspace-operator@ec1a4cefefe5d77620c8f5f21624f41b7e8e9100](https://github.com/devfile/devworkspace-operator.git) | Apache-2.0 | [clearlydefined](https://clearlydefined.io/definitions/git/github/devfile/devworkspace-operator/ec1a4cefefe5d77620c8f5f21624f41b7e8e9100) | +| [github.com/devfile/devworkspace-operator@aaa430987417c980001c7ae19932f78991fe9707](https://github.com/devfile/devworkspace-operator.git) | Apache-2.0 | [clearlydefined](https://clearlydefined.io/definitions/git/github/devfile/devworkspace-operator/aaa430987417c980001c7ae19932f78991fe9707) | diff --git a/go.mod b/go.mod index c0a6735cf..941435b26 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/Shopify/logrus-bugsnag v0.0.0-00010101000000-000000000000 // indirect github.com/che-incubator/kubernetes-image-puller-operator v0.0.0-20210929175054-0128446f5af7 github.com/devfile/api/v2 v2.0.0-20210917193329-089a48011460 - github.com/devfile/devworkspace-operator v0.12.3 + github.com/devfile/devworkspace-operator v0.13.0 github.com/go-logr/logr v0.4.0 github.com/golang/mock v1.5.0 github.com/google/go-cmp v0.5.6 diff --git a/go.sum b/go.sum index badfea736..38771720d 100644 --- a/go.sum +++ b/go.sum @@ -114,8 +114,8 @@ github.com/deislabs/oras v0.8.1/go.mod h1:Mx0rMSbBNaNfY9hjpccEnxkOqJL6KGjtxNHPLC github.com/denisenkom/go-mssqldb v0.0.0-20190204142019-df6d76eb9289/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc= github.com/devfile/api/v2 v2.0.0-20210917193329-089a48011460 h1:cmd+3poyUwevcWchYdvE02YT1nQU4SJpA5/wrdLrpWE= github.com/devfile/api/v2 v2.0.0-20210917193329-089a48011460/go.mod h1:kLX/nW93gigOHXK3NLeJL2fSS/sgEe+OHu8bo3aoOi4= -github.com/devfile/devworkspace-operator v0.12.3 h1:HMUfbQpDg5XBwHOLLiyUPb4hF4RJKVs95BTlL+OI6As= -github.com/devfile/devworkspace-operator v0.12.3/go.mod h1:33uEtRwYsox/Jsuh5oqNc4iPNKtprazz15Jc0iX9aTU= +github.com/devfile/devworkspace-operator v0.13.0 h1:s/jFTfqKmVM8UizgCcS5icZ+w3LV+iRtDDkeYqVk+os= +github.com/devfile/devworkspace-operator v0.13.0/go.mod h1:33uEtRwYsox/Jsuh5oqNc4iPNKtprazz15Jc0iX9aTU= 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= diff --git a/vendor/github.com/devfile/devworkspace-operator/apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go b/vendor/github.com/devfile/devworkspace-operator/apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go index 83162e456..ac380288e 100644 --- a/vendor/github.com/devfile/devworkspace-operator/apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go +++ b/vendor/github.com/devfile/devworkspace-operator/apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go @@ -76,6 +76,10 @@ type WorkspaceConfig struct { // PVCName defines the name used for the persistent volume claim created // to support workspace storage when the 'common' storage class is used. // If not specified, the default value of `claim-devworkspace` is used. + // Note that changing this configuration value after workspaces have been + // created will disconnect all existing workspaces from the previously-used + // persistent volume claim, and will require manual removal of the old PVCs + // in the cluster. // +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?$ // +kubebuilder:validation:MaxLength=63 PVCName string `json:"pvcName,omitempty"` diff --git a/vendor/github.com/devfile/devworkspace-operator/apis/controller/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/devfile/devworkspace-operator/apis/controller/v1alpha1/zz_generated.deepcopy.go index 648e81080..4300d9ac6 100644 --- a/vendor/github.com/devfile/devworkspace-operator/apis/controller/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/devfile/devworkspace-operator/apis/controller/v1alpha1/zz_generated.deepcopy.go @@ -20,7 +20,7 @@ package v1alpha1 import ( - v1 "k8s.io/api/core/v1" + "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/vendor/github.com/devfile/devworkspace-operator/pkg/constants/constants.go b/vendor/github.com/devfile/devworkspace-operator/pkg/constants/constants.go index b11e1b2c0..a823b1e2e 100644 --- a/vendor/github.com/devfile/devworkspace-operator/pkg/constants/constants.go +++ b/vendor/github.com/devfile/devworkspace-operator/pkg/constants/constants.go @@ -74,6 +74,10 @@ const ( // so do not require cleanup. When a DevWorkspace is stopped, all local changes are lost. EphemeralStorageClassType = "ephemeral" + // CheCommonPVCName is the name of the common PVC equivalent used by Che. If present in the namespace, this PVC is mounted instead + // of the default PVC when the 'common' or 'async' storage classes are used. + CheCommonPVCName = "claim-che-workspace" + // Constants describing configuration for automatic project cloning // ProjectCloneDisable specifies that project cloning should be disabled. diff --git a/vendor/github.com/devfile/devworkspace-operator/pkg/constants/metadata.go b/vendor/github.com/devfile/devworkspace-operator/pkg/constants/metadata.go index 912d4fbf7..e36d0c903 100644 --- a/vendor/github.com/devfile/devworkspace-operator/pkg/constants/metadata.go +++ b/vendor/github.com/devfile/devworkspace-operator/pkg/constants/metadata.go @@ -20,6 +20,11 @@ const ( // DevWorkspaceIDLabel is the label key to store workspace identifier DevWorkspaceIDLabel = "controller.devfile.io/devworkspace_id" + // WorkspaceIdOverrideAnnotation is an annotation that can be applied to DevWorkspaces + // to override the default DevWorkspace ID assigned by the Operator. Is only respected + // when a DevWorkspace is created. Once a DevWorkspace has an ID set, it cannot be changed. + WorkspaceIdOverrideAnnotation = "controller.devfile.io/devworkspace_id_override" + // DevWorkspaceCreatorLabel is the label key for storing the UID of the user who created the workspace DevWorkspaceCreatorLabel = "controller.devfile.io/creator" diff --git a/vendor/modules.txt b/vendor/modules.txt index a08766610..a9b064322 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -35,7 +35,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.12.3 +# github.com/devfile/devworkspace-operator v0.13.0 ## explicit github.com/devfile/devworkspace-operator/apis/controller/v1alpha1 github.com/devfile/devworkspace-operator/controllers/controller/devworkspacerouting