Skip to content

Commit 7e7cdec

Browse files
dannyzakenliranmauda
authored andcommitted
Changed DB PVC access mode to RWOP
Signed-off-by: Danny Zaken <dannyzaken@gmail.com> (cherry picked from commit 5e2d253) (cherry picked from commit 424ba83)
1 parent 1e0e4ee commit 7e7cdec

4 files changed

Lines changed: 11 additions & 6 deletions

File tree

deploy/internal/statefulset-postgres-db.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ spec:
7575
app: noobaa
7676
spec:
7777
accessModes:
78-
- ReadWriteOnce
78+
- ReadWriteOncePod
7979
resources:
8080
requests:
8181
storage: 50Gi

deploy/olm/noobaa-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ metadata:
1717
spec:
1818
displayName: NooBaa Operator
1919
version: "999.999.999-placeholder"
20-
minKubeVersion: 1.16.0
20+
minKubeVersion: 1.22.0
2121
maturity: alpha
2222
provider:
2323
name: NooBaa

pkg/bundle/deploy.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5297,7 +5297,7 @@ spec:
52975297
resource: limits.memory
52985298
`
52995299

5300-
const Sha256_deploy_internal_statefulset_postgres_db_yaml = "cd739b491f35e77972c55078e6b1ea1362f3897194ed9c89fcf962a1ad6a4c3c"
5300+
const Sha256_deploy_internal_statefulset_postgres_db_yaml = "53b628aaceffc1952efed5ed1131f16461fde6eb78c1a5f0f281f3efc30c30b4"
53015301

53025302
const File_deploy_internal_statefulset_postgres_db_yaml = `apiVersion: apps/v1
53035303
kind: StatefulSet
@@ -5376,7 +5376,7 @@ spec:
53765376
app: noobaa
53775377
spec:
53785378
accessModes:
5379-
- ReadWriteOnce
5379+
- ReadWriteOncePod
53805380
resources:
53815381
requests:
53825382
storage: 50Gi
@@ -6066,7 +6066,7 @@ s3 ls s3://first.bucket
60666066
` + "`" + `` + "`" + `` + "`" + `
60676067
`
60686068

6069-
const Sha256_deploy_olm_noobaa_operator_clusterserviceversion_yaml = "3b11ab7cce6a4dfc36ad13f75b37821c8e200aec4cf21007208948e74ce9cc44"
6069+
const Sha256_deploy_olm_noobaa_operator_clusterserviceversion_yaml = "4316a5d3ea52ed0e82489ad380b596f41e3675737b5d5ad80e403759f39fc128"
60706070

60716071
const File_deploy_olm_noobaa_operator_clusterserviceversion_yaml = `apiVersion: operators.coreos.com/v1alpha1
60726072
kind: ClusterServiceVersion
@@ -6087,7 +6087,7 @@ metadata:
60876087
spec:
60886088
displayName: NooBaa Operator
60896089
version: "999.999.999-placeholder"
6090-
minKubeVersion: 1.16.0
6090+
minKubeVersion: 1.22.0
60916091
maturity: alpha
60926092
provider:
60936093
name: NooBaa

pkg/system/db_reconciler.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,10 @@ func setDesiredStorageConf(storageConfiguration *cnpgv1.StorageConfiguration, db
458458
if storageConfiguration == nil {
459459
return fmt.Errorf("storage configuration is nil")
460460
}
461+
if storageConfiguration.PersistentVolumeClaimTemplate == nil {
462+
storageConfiguration.PersistentVolumeClaimTemplate = &corev1.PersistentVolumeClaimSpec{}
463+
}
464+
storageConfiguration.PersistentVolumeClaimTemplate.AccessModes = []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOncePod}
461465
if dbSpec.DBStorageClass != nil {
462466
storageConfiguration.StorageClass = dbSpec.DBStorageClass
463467
} else {
@@ -532,6 +536,7 @@ func (r *Reconciler) wasClusterSpecChanged(existingClusterSpec *cnpgv1.ClusterSp
532536
!reflect.DeepEqual(existingClusterSpec.Resources, r.CNPGCluster.Spec.Resources) ||
533537
!reflect.DeepEqual(existingClusterSpec.StorageConfiguration.StorageClass, r.CNPGCluster.Spec.StorageConfiguration.StorageClass) ||
534538
!reflect.DeepEqual(existingClusterSpec.StorageConfiguration.Size, r.CNPGCluster.Spec.StorageConfiguration.Size) ||
539+
!reflect.DeepEqual(existingClusterSpec.StorageConfiguration.PersistentVolumeClaimTemplate, r.CNPGCluster.Spec.StorageConfiguration.PersistentVolumeClaimTemplate) ||
535540
!reflect.DeepEqual(existingClusterSpec.Monitoring, r.CNPGCluster.Spec.Monitoring) ||
536541
!reflect.DeepEqual(existingClusterSpec.PostgresConfiguration.Parameters, r.CNPGCluster.Spec.PostgresConfiguration.Parameters)
537542
}

0 commit comments

Comments
 (0)