Skip to content

Commit 6315ae6

Browse files
lpiwowarroot
andauthored
Use RWX PVs only for parallel execution (#96)
This change is needed as we are going to switch from local storage to LVMS based storage that does not support RWX. Because of that the test-operator will now be by default requesting RWO PVs only. RWX will be requested when parallel is set to true in the test-operator related CR. Co-authored-by: root <[email protected]>
1 parent 6251440 commit 6315ae6

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

controllers/common.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ func (r *Reconciler) EnsureLogsPVCExists(
119119
helper *helper.Helper,
120120
labels map[string]string,
121121
StorageClassName string,
122+
parallel bool,
122123
) (ctrl.Result, error) {
123124
instanceNamespace := instance.GetNamespace()
124125
pvcName := r.GetPVCLogsName(instance)
@@ -129,17 +130,19 @@ func (r *Reconciler) EnsureLogsPVCExists(
129130
return ctrl.Result{}, nil
130131
}
131132

133+
pvcAccessMode := []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}
134+
if parallel {
135+
pvcAccessMode = append(pvcAccessMode, corev1.ReadWriteMany)
136+
}
137+
132138
testOperatorPvcDef := &corev1.PersistentVolumeClaim{
133139
ObjectMeta: metav1.ObjectMeta{
134140
Name: pvcName,
135141
Namespace: instanceNamespace,
136142
Labels: labels,
137143
},
138144
Spec: corev1.PersistentVolumeClaimSpec{
139-
AccessModes: []corev1.PersistentVolumeAccessMode{
140-
corev1.ReadWriteMany,
141-
corev1.ReadWriteOnce,
142-
},
145+
AccessModes: pvcAccessMode,
143146
Resources: corev1.ResourceRequirements{
144147
Requests: corev1.ResourceList{
145148
corev1.ResourceStorage: k8sresource.MustParse("1Gi"),

controllers/tempest_controller.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ func (r *TempestReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re
208208
helper,
209209
serviceLabels,
210210
instance.Spec.StorageClass,
211+
instance.Spec.Parallel,
211212
)
212213

213214
if err != nil {

controllers/tobiko_controller.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ func (r *TobikoReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
152152
helper,
153153
serviceLabels,
154154
instance.Spec.StorageClass,
155+
instance.Spec.Parallel,
155156
)
156157
if err != nil {
157158
return ctrlResult, err

0 commit comments

Comments
 (0)