This is an automated email from the ASF dual-hosted git repository.
roryqi pushed a commit to branch support-pvc
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/support-pvc by this push:
new 9ed7e0c8a address comments
9ed7e0c8a is described below
commit 9ed7e0c8a9acbc157dc0b0f1d7c796146af83737
Author: Rory <[email protected]>
AuthorDate: Sat Jun 15 17:15:28 2024 +0800
address comments
---
.../uniffle.apache.org_remoteshuffleservices.yaml | 43 +++++++++++++---------
.../controller/sync/shuffleserver/shuffleserver.go | 2 +-
2 files changed, 26 insertions(+), 19 deletions(-)
diff --git
a/deploy/kubernetes/operator/config/crd/bases/uniffle.apache.org_remoteshuffleservices.yaml
b/deploy/kubernetes/operator/config/crd/bases/uniffle.apache.org_remoteshuffleservices.yaml
index 818df4bc8..9dca5b422 100644
---
a/deploy/kubernetes/operator/config/crd/bases/uniffle.apache.org_remoteshuffleservices.yaml
+++
b/deploy/kubernetes/operator/config/crd/bases/uniffle.apache.org_remoteshuffleservices.yaml
@@ -8379,14 +8379,14 @@ spec:
a PersistentVolumeClaim are also valid here.
properties:
accessModes:
- description: 'AccessModes contains the desired
access
+ description: 'accessModes contains the desired
access
modes the volume should have. More info:
https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
items:
type: string
type: array
dataSource:
- description: 'This field can be used to specify
either:
- * An existing VolumeSnapshot object
(snapshot.storage.k8s.io/VolumeSnapshot)
+ description: 'dataSource field can be used to
specify
+ either: * An existing VolumeSnapshot object
(snapshot.storage.k8s.io/VolumeSnapshot)
* An existing PVC (PersistentVolumeClaim) If
the provisioner
or an external controller can support the
specified
data source, it will create a new volume based
on
@@ -8413,11 +8413,12 @@ spec:
- kind
- name
type: object
+ x-kubernetes-map-type: atomic
dataSourceRef:
- description: 'Specifies the object from which to
populate
- the volume with data, if a non-empty volume is
desired.
- This may be any local object from a non-empty
API
- group (non core object) or a
PersistentVolumeClaim
+ description: 'dataSourceRef specifies the object
from
+ which to populate the volume with data, if a
non-empty
+ volume is desired. This may be any local
object from
+ a non-empty API group (non core object) or a
PersistentVolumeClaim
object. When this field is specified, volume
binding
will only succeed if the type of the specified
object
matches some installed volume populator or
dynamic
@@ -8429,12 +8430,12 @@ spec:
if one of them is empty and the other is
non-empty.
There are two important differences between
DataSource
and DataSourceRef: * While DataSource only
allows
- two specific types of objects, DataSourceRef
allows
+ two specific types of objects, DataSourceRef
allows
any non-core object, as well as
PersistentVolumeClaim
objects. * While DataSource ignores disallowed
values
- (dropping them), DataSourceRef preserves all
values,
- and generates an error if a disallowed value
is specified.
- (Alpha) Using this field requires the
AnyVolumeDataSource
+ (dropping them), DataSourceRef preserves all
values,
+ and generates an error if a disallowed value
is specified.
+ (Beta) Using this field requires the
AnyVolumeDataSource
feature gate to be enabled.'
properties:
apiGroup:
@@ -8455,9 +8456,14 @@ spec:
- kind
- name
type: object
+ x-kubernetes-map-type: atomic
resources:
- description: 'Resources represents the minimum
resources
- the volume should have. More info:
https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
+ description: 'resources represents the minimum
resources
+ the volume should have. If
RecoverVolumeExpansionFailure
+ feature is enabled users are allowed to
specify resource
+ requirements that are lower than previous
value but
+ must still be higher than capacity recorded in
the
+ status field of the claim. More info:
https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
properties:
limits:
additionalProperties:
@@ -8484,8 +8490,8 @@ spec:
type: object
type: object
selector:
- description: A label query over volumes to
consider
- for binding.
+ description: selector is a label query over
volumes
+ to consider for binding.
properties:
matchExpressions:
description: matchExpressions is a list of
label
@@ -8530,9 +8536,10 @@ spec:
requirements are ANDed.
type: object
type: object
+ x-kubernetes-map-type: atomic
storageClassName:
- description: 'Name of the StorageClass required
by the
- claim. More info:
https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
+ description: 'storageClassName is the name of
the StorageClass
+ required by the claim. More info:
https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
type: string
volumeMode:
description: volumeMode defines what type of
volume
@@ -8540,7 +8547,7 @@ spec:
when not included in claim spec.
type: string
volumeName:
- description: VolumeName is the binding reference
to
+ description: volumeName is the binding reference
to
the PersistentVolume backing this claim.
type: string
type: object
diff --git
a/deploy/kubernetes/operator/pkg/controller/sync/shuffleserver/shuffleserver.go
b/deploy/kubernetes/operator/pkg/controller/sync/shuffleserver/shuffleserver.go
index 9d5dc17d8..867a40386 100644
---
a/deploy/kubernetes/operator/pkg/controller/sync/shuffleserver/shuffleserver.go
+++
b/deploy/kubernetes/operator/pkg/controller/sync/shuffleserver/shuffleserver.go
@@ -251,7 +251,7 @@ func generateStorageBasePath(rss
*unifflev1alpha1.RemoteShuffleService) string {
}
for _, vm := range rss.Spec.ShuffleServer.VolumeMounts {
- paths = append(paths, strings.TrimSuffix(vm.MountPath,
"/"+"rssdata"))
+ paths = append(paths, strings.TrimSuffix(vm.MountPath,
"/")+"/"+controllerconstants.RssDataDir)
}
sort.Strings(paths)
