Skip to content

Commit 7b16597

Browse files
author
Dimitra Chatzichrysou
committed
Remove diskSize default value from CRD
1 parent 8ddf580 commit 7b16597

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

api/v1alpha1/drupalsite_types.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ type DrupalSiteSpec struct {
4545
Version `json:"version"`
4646

4747
// Configuration of the DrupalSite for specific needs. A typical default value is given for every setting, so usually these won't need to change.
48-
// +kubebuilder:default={"databaseClass":"standard","qosClass":"standard","diskSize":"2000Mi"}
48+
// +kubebuilder:default={"databaseClass":"standard","qosClass":"standard"}
4949
// +optional
5050
Configuration `json:"configuration,omitempty"`
5151
}
@@ -92,10 +92,7 @@ type Configuration struct {
9292
// +optional
9393
CloneFrom `json:"cloneFrom,omitempty"`
9494

95-
// DiskSize is the max size of the site's files directory. The default value is "2000Mi".
96-
// When `cloneFrom` is set, if this value is less than the source's, it will be *overwritten*,
97-
// since the size has to be at least as large as the source.
98-
// +kubebuilder:default="2000Mi"
95+
// DiskSize is the max size of the site's files directory.
9996
// +optional
10097
// +kubebuilder:validation:Pattern=`^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$`
10198
DiskSize string `json:"diskSize,omitempty"`

config/crd/bases/drupal.webservices.cern.ch_drupalsites.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ spec:
3939
configuration:
4040
default:
4141
databaseClass: standard
42-
diskSize: 2000Mi
4342
qosClass: standard
4443
description: Configuration of the DrupalSite for specific needs. A
4544
typical default value is given for every setting, so usually these
@@ -61,11 +60,7 @@ spec:
6160
- standard
6261
type: string
6362
diskSize:
64-
default: 2000Mi
6563
description: DiskSize is the max size of the site's files directory.
66-
The default value is "2000Mi". When `cloneFrom` is set, if this
67-
value is less than the source's, it will be *overwritten*, since
68-
the size has to be at least as large as the source.
6964
pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
7065
type: string
7166
easystart:

0 commit comments

Comments
 (0)