Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions DEPENDENCIES.md

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions api/v2/checluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,13 @@ type PVC struct {
// Storage class for the Persistent Volume Claim. When omitted or left blank, a default storage class is used.
// +optional
StorageClass string `json:"storageClass,omitempty"`
// StorageAccessMode are the desired access modes the volume should have.
// It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
// user to re-use volume across multiple workspaces.
//
// It defaults to ReadWriteOnce if not specified
Copy link
Copy Markdown
Contributor

@dkwon17 dkwon17 Jul 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default ReadWriteOnce is not being used in this case,

For example, if I set:

    storage:
      perUserStrategyPvcConfig:
        storageAccessMode:
          - ReadWriteMany
      pvcStrategy: per-user

And then if I remove perUserStrategyPvcConfig:

  storage:
    pvcStrategy: per-user

the DWOC still has ReadWriteMany:

apiVersion: controller.devfile.io/v1alpha1
config:
  workspace:
    storageAccessMode:
      - ReadWriteMany

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

storageClass and claimSize has the same behaviour where the defaults aren't applied:

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've created this issue for addressing it eclipse-che/che#23502

// +optional
StorageAccessMode []corev1.PersistentVolumeAccessMode `json:"storageAccessMode,omitempty"`
}

// External devfile registries configuration.
Expand Down
9 changes: 7 additions & 2 deletions api/v2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7926,6 +7926,17 @@ spec:
the claim size, the storage class that provisions
it must support resizing.
type: string
storageAccessMode:
description: |-
StorageAccessMode are the desired access modes the volume should have.
It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
user to re-use volume across multiple workspaces.


It defaults to ReadWriteOnce if not specified
items:
type: string
type: array
storageClass:
description: Storage class for the Persistent Volume
Claim. When omitted or left blank, a default storage
Expand All @@ -7941,6 +7952,17 @@ spec:
the claim size, the storage class that provisions
it must support resizing.
type: string
storageAccessMode:
description: |-
StorageAccessMode are the desired access modes the volume should have.
It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
user to re-use volume across multiple workspaces.


It defaults to ReadWriteOnce if not specified
items:
type: string
type: array
storageClass:
description: Storage class for the Persistent Volume
Claim. When omitted or left blank, a default storage
Expand Down
22 changes: 22 additions & 0 deletions config/crd/bases/org.eclipse.che_checlusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7877,6 +7877,17 @@ spec:
claim size, the storage class that provisions it must
support resizing.
type: string
storageAccessMode:
description: |-
StorageAccessMode are the desired access modes the volume should have.
It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
user to re-use volume across multiple workspaces.


It defaults to ReadWriteOnce if not specified
items:
type: string
type: array
storageClass:
description: Storage class for the Persistent Volume Claim.
When omitted or left blank, a default storage class
Expand All @@ -7892,6 +7903,17 @@ spec:
claim size, the storage class that provisions it must
support resizing.
type: string
storageAccessMode:
description: |-
StorageAccessMode are the desired access modes the volume should have.
It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
user to re-use volume across multiple workspaces.


It defaults to ReadWriteOnce if not specified
items:
type: string
type: array
storageClass:
description: Storage class for the Persistent Volume Claim.
When omitted or left blank, a default storage class
Expand Down
22 changes: 22 additions & 0 deletions deploy/deployment/kubernetes/combined.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7898,6 +7898,17 @@ spec:
claim size, the storage class that provisions it must
support resizing.
type: string
storageAccessMode:
description: |-
StorageAccessMode are the desired access modes the volume should have.
It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
user to re-use volume across multiple workspaces.


It defaults to ReadWriteOnce if not specified
items:
type: string
type: array
storageClass:
description: Storage class for the Persistent Volume Claim.
When omitted or left blank, a default storage class
Expand All @@ -7913,6 +7924,17 @@ spec:
claim size, the storage class that provisions it must
support resizing.
type: string
storageAccessMode:
description: |-
StorageAccessMode are the desired access modes the volume should have.
It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
user to re-use volume across multiple workspaces.


It defaults to ReadWriteOnce if not specified
items:
type: string
type: array
storageClass:
description: Storage class for the Persistent Volume Claim.
When omitted or left blank, a default storage class
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7893,6 +7893,17 @@ spec:
claim size, the storage class that provisions it must
support resizing.
type: string
storageAccessMode:
description: |-
StorageAccessMode are the desired access modes the volume should have.
It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
user to re-use volume across multiple workspaces.


It defaults to ReadWriteOnce if not specified
items:
type: string
type: array
storageClass:
description: Storage class for the Persistent Volume Claim.
When omitted or left blank, a default storage class
Expand All @@ -7908,6 +7919,17 @@ spec:
claim size, the storage class that provisions it must
support resizing.
type: string
storageAccessMode:
description: |-
StorageAccessMode are the desired access modes the volume should have.
It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
user to re-use volume across multiple workspaces.


It defaults to ReadWriteOnce if not specified
items:
type: string
type: array
storageClass:
description: Storage class for the Persistent Volume Claim.
When omitted or left blank, a default storage class
Expand Down
22 changes: 22 additions & 0 deletions deploy/deployment/openshift/combined.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7898,6 +7898,17 @@ spec:
claim size, the storage class that provisions it must
support resizing.
type: string
storageAccessMode:
description: |-
StorageAccessMode are the desired access modes the volume should have.
It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
user to re-use volume across multiple workspaces.


It defaults to ReadWriteOnce if not specified
items:
type: string
type: array
storageClass:
description: Storage class for the Persistent Volume Claim.
When omitted or left blank, a default storage class
Expand All @@ -7913,6 +7924,17 @@ spec:
claim size, the storage class that provisions it must
support resizing.
type: string
storageAccessMode:
description: |-
StorageAccessMode are the desired access modes the volume should have.
It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
user to re-use volume across multiple workspaces.


It defaults to ReadWriteOnce if not specified
items:
type: string
type: array
storageClass:
description: Storage class for the Persistent Volume Claim.
When omitted or left blank, a default storage class
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7893,6 +7893,17 @@ spec:
claim size, the storage class that provisions it must
support resizing.
type: string
storageAccessMode:
description: |-
StorageAccessMode are the desired access modes the volume should have.
It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
user to re-use volume across multiple workspaces.


It defaults to ReadWriteOnce if not specified
items:
type: string
type: array
storageClass:
description: Storage class for the Persistent Volume Claim.
When omitted or left blank, a default storage class
Expand All @@ -7908,6 +7919,17 @@ spec:
claim size, the storage class that provisions it must
support resizing.
type: string
storageAccessMode:
description: |-
StorageAccessMode are the desired access modes the volume should have.
It is used to specify PersistentVolume access mode type to RWO/RWX when using per-user strategy, allowing
user to re-use volume across multiple workspaces.


It defaults to ReadWriteOnce if not specified
items:
type: string
type: array
storageClass:
description: Storage class for the Persistent Volume Claim.
When omitted or left blank, a default storage class
Expand Down
28 changes: 14 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ toolchain go1.23.8
require (
github.com/che-incubator/kubernetes-image-puller-operator v0.0.0-20210929175054-0128446f5af7
github.com/devfile/api/v2 v2.2.2
github.com/devfile/devworkspace-operator v0.31.0
github.com/go-logr/logr v1.2.4
github.com/devfile/devworkspace-operator v0.35.0
github.com/go-logr/logr v1.4.1
github.com/google/go-cmp v0.6.0
github.com/openshift/api v0.0.0-20230120182048-88b476f987ed
github.com/operator-framework/api v0.10.0
github.com/operator-framework/api v0.15.0
github.com/operator-framework/operator-lifecycle-manager v0.18.1
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.10.0
go.uber.org/zap v1.24.0
golang.org/x/net v0.36.0
golang.org/x/net v0.38.0
k8s.io/api v0.26.1
k8s.io/apiextensions-apiserver v0.26.1
k8s.io/apimachinery v0.26.1
Expand Down Expand Up @@ -48,12 +48,12 @@ require (
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/gomega v1.27.10 // indirect
github.com/onsi/gomega v1.34.1 // indirect
github.com/operator-framework/operator-registry v1.13.6 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand All @@ -65,9 +65,9 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/term v0.29.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/term v0.30.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/grpc v1.58.3 // indirect
Expand All @@ -89,10 +89,10 @@ require (
github.com/Shopify/logrus-bugsnag v0.0.0-00010101000000-000000000000 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee // indirect
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/sync v0.12.0 // indirect
golang.org/x/tools v0.23.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
honnef.co/go/tools v0.0.1-2020.1.3 // indirect
Expand Down
Loading