Skip to content

Commit 9363b45

Browse files
authored
Merge pull request noobaa#1768 from liranmauda/liran-backport-into-5.19
[Backport into 5.19] Changed DB PVC access mode to RWOP
2 parents e9711cb + dc9d7fe commit 9363b45

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
@@ -74,7 +74,7 @@ spec:
7474
app: noobaa
7575
spec:
7676
accessModes:
77-
- ReadWriteOnce
77+
- ReadWriteOncePod
7878
resources:
7979
requests:
8080
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
@@ -5230,7 +5230,7 @@ spec:
52305230
resource: limits.memory
52315231
`
52325232

5233-
const Sha256_deploy_internal_statefulset_postgres_db_yaml = "37a6c36928ba426ca04fd89e1eb2685e10d1a5f65c63ebb40c68a4f5c37645de"
5233+
const Sha256_deploy_internal_statefulset_postgres_db_yaml = "8aad13d8fca170ba12c834dec27bc6626339755e76dd2936b66ee144c9b67f1f"
52345234

52355235
const File_deploy_internal_statefulset_postgres_db_yaml = `apiVersion: apps/v1
52365236
kind: StatefulSet
@@ -5308,7 +5308,7 @@ spec:
53085308
app: noobaa
53095309
spec:
53105310
accessModes:
5311-
- ReadWriteOnce
5311+
- ReadWriteOncePod
53125312
resources:
53135313
requests:
53145314
storage: 50Gi
@@ -5998,7 +5998,7 @@ s3 ls s3://first.bucket
59985998
` + "`" + `` + "`" + `` + "`" + `
59995999
`
60006000

6001-
const Sha256_deploy_olm_noobaa_operator_clusterserviceversion_yaml = "3b11ab7cce6a4dfc36ad13f75b37821c8e200aec4cf21007208948e74ce9cc44"
6001+
const Sha256_deploy_olm_noobaa_operator_clusterserviceversion_yaml = "4316a5d3ea52ed0e82489ad380b596f41e3675737b5d5ad80e403759f39fc128"
60026002

60036003
const File_deploy_olm_noobaa_operator_clusterserviceversion_yaml = `apiVersion: operators.coreos.com/v1alpha1
60046004
kind: ClusterServiceVersion
@@ -6019,7 +6019,7 @@ metadata:
60196019
spec:
60206020
displayName: NooBaa Operator
60216021
version: "999.999.999-placeholder"
6022-
minKubeVersion: 1.16.0
6022+
minKubeVersion: 1.22.0
60236023
maturity: alpha
60246024
provider:
60256025
name: NooBaa

pkg/system/db_reconciler.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,10 @@ func setDesiredStorageConf(storageConfiguration *cnpgv1.StorageConfiguration, db
476476
if storageConfiguration == nil {
477477
return fmt.Errorf("storage configuration is nil")
478478
}
479+
if storageConfiguration.PersistentVolumeClaimTemplate == nil {
480+
storageConfiguration.PersistentVolumeClaimTemplate = &corev1.PersistentVolumeClaimSpec{}
481+
}
482+
storageConfiguration.PersistentVolumeClaimTemplate.AccessModes = []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOncePod}
479483
if dbSpec.DBStorageClass != nil {
480484
storageConfiguration.StorageClass = dbSpec.DBStorageClass
481485
} else {
@@ -550,6 +554,7 @@ func (r *Reconciler) wasClusterSpecChanged(existingClusterSpec *cnpgv1.ClusterSp
550554
!reflect.DeepEqual(existingClusterSpec.Resources, r.CNPGCluster.Spec.Resources) ||
551555
!reflect.DeepEqual(existingClusterSpec.StorageConfiguration.StorageClass, r.CNPGCluster.Spec.StorageConfiguration.StorageClass) ||
552556
!reflect.DeepEqual(existingClusterSpec.StorageConfiguration.Size, r.CNPGCluster.Spec.StorageConfiguration.Size) ||
557+
!reflect.DeepEqual(existingClusterSpec.StorageConfiguration.PersistentVolumeClaimTemplate, r.CNPGCluster.Spec.StorageConfiguration.PersistentVolumeClaimTemplate) ||
553558
!reflect.DeepEqual(existingClusterSpec.Monitoring, r.CNPGCluster.Spec.Monitoring) ||
554559
!reflect.DeepEqual(existingClusterSpec.PostgresConfiguration.Parameters, r.CNPGCluster.Spec.PostgresConfiguration.Parameters)
555560
}

0 commit comments

Comments
 (0)