Removed Galera storage class from defaults letting Kubernetes use the default one

This commit is contained in:
Martin Montes
2023-07-16 19:21:54 +02:00
committed by Martín Montes
parent 46fd744beb
commit e66a11f6d6
5 changed files with 7 additions and 15 deletions

View File

@ -197,13 +197,12 @@ func (g *GaleraSpec) FillWithDefaults() {
}
var (
fiveSeconds = metav1.Duration{Duration: 5 * time.Second}
oneMinute = metav1.Duration{Duration: 1 * time.Minute}
fiveMinutes = metav1.Duration{Duration: 5 * time.Minute}
threeMinutes = metav1.Duration{Duration: 3 * time.Minute}
sst = SSTMariaBackup
replicaThreads = 1
storageClassName = "default"
fiveSeconds = metav1.Duration{Duration: 5 * time.Second}
oneMinute = metav1.Duration{Duration: 1 * time.Minute}
fiveMinutes = metav1.Duration{Duration: 5 * time.Minute}
threeMinutes = metav1.Duration{Duration: 3 * time.Minute}
sst = SSTMariaBackup
replicaThreads = 1
// DefaultGaleraSpec provides sensible defaults for the GaleraSpec.
DefaultGaleraSpec = GaleraSpec{
@ -243,7 +242,6 @@ var (
"storage": resource.MustParse("50Mi"),
},
},
StorageClassName: &storageClassName,
AccessModes: []corev1.PersistentVolumeAccessMode{
corev1.ReadWriteOnce,
},

View File

@ -595,7 +595,6 @@ var _ = Describe("MariaDB Galera", func() {
},
},
VolumeClaimTemplate: corev1.PersistentVolumeClaimSpec{
StorageClassName: &testStorageClassName,
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
"storage": resource.MustParse("100Mi"),
@ -625,7 +624,6 @@ var _ = Describe("MariaDB Galera", func() {
PodSyncTimeout: &recoveryTimeout,
},
VolumeClaimTemplate: &corev1.PersistentVolumeClaimSpec{
StorageClassName: &testStorageClassName,
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
"storage": resource.MustParse("10Mi"),

View File

@ -28,7 +28,7 @@ spec:
...
```
This relies on sensible defaults set by either the operator or the webhook, such as the `default` `StorageClass`, which may not be suitable for your Kubernetes cluster. This can be solved by overriding the defaults, as in this other [example](../examples/manifests/mariadb_v1alpha1_mariadb_galera.yaml), so you have fine grained control over the Galera configuration:
This relies on sensible defaults set by either the operator or the webhook, which may not be suitable for your Kubernetes cluster. This can be solved by overriding the defaults, as in this other [example](../examples/manifests/mariadb_v1alpha1_mariadb_galera.yaml), so you have fine grained control over the Galera configuration:
```yaml
apiVersion: mariadb.mmontes.io/v1alpha1
@ -66,7 +66,6 @@ spec:
resources:
requests:
storage: 50Mi
storageClassName: standard
accessModes:
- ReadWriteOnce
...

View File

@ -56,7 +56,6 @@ spec:
resources:
requests:
storage: 50Mi
storageClassName: standard
accessModes:
- ReadWriteOnce
@ -95,7 +94,6 @@ spec:
resources:
requests:
storage: 1Gi
storageClassName: standard
accessModes:
- ReadWriteOnce

View File

@ -23,6 +23,5 @@ spec:
resources:
requests:
storage: 100Mi
storageClassName: standard
accessModes:
- ReadWriteOnce