ETCD-520: add etcd dbsize field

features.md

@@ -15,6 +15,7 @@
 | CSIDriverSharedResource| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | DNSNameResolver| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | DynamicResourceAllocation| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
+| EtcdBackendQuota| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | Example| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | ExternalRouteCertificate| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |
 | GCPClusterHostedDNS| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span>  |

features/features.go

@@ -245,6 +245,13 @@ var (
 					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 					mustRegister()
 
+	FeatureGateBackendQuotaGiB = newFeatureGate("EtcdBackendQuota").
+					reportProblemsToJiraComponent("etcd").
+					contactPerson("hasbro17").
+					productScope(ocpSpecific).
+					enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
+					mustRegister()
+
 	FeatureGateAutomatedEtcdBackup = newFeatureGate("AutomatedEtcdBackup").
 					reportProblemsToJiraComponent("etcd").
 					contactPerson("hasbro17").

openapi/openapi.json

@@ -27072,6 +27072,12 @@
         "forceRedeploymentReason"
       ],
       "properties": {
+        "backendQuotaGiB": {
+          "description": "backendQuotaGiB sets the etcd backend storage size limit in gibibytes. The value should be an integer not less than 8 and not more than 32. When not specified, the default value is 8.",
+          "type": "integer",
+          "format": "int32",
+          "default": 8
+        },
         "controlPlaneHardwareSpeed": {
           "description": "HardwareSpeed allows user to change the etcd tuning profile which configures the latency parameters for heartbeat interval and leader election timeouts allowing the cluster to tolerate longer round-trip-times between etcd members. Valid values are \"\", \"Standard\" and \"Slower\".\n\t\"\" means no opinion and the platform is left to choose a reasonable default\n\twhich is subject to change without notice.\n\nPossible enum values:\n - `\"Slower\"` provides more tolerance for slower hardware and/or higher latency networks. Sets (values subject to change): ETCD_HEARTBEAT_INTERVAL: 5x Standard ETCD_LEADER_ELECTION_TIMEOUT: 2.5x Standard\n - `\"Standard\"` provides the normal tolerances for hardware speed and latency. Currently sets (values subject to change at any time): ETCD_HEARTBEAT_INTERVAL: 100ms ETCD_LEADER_ELECTION_TIMEOUT: 1000ms",
           "type": "string",

operator/v1/tests/etcds.operator.openshift.io/AAA_ungated.yaml

@@ -1,6 +1,7 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "Etcd"
 crdName: etcds.operator.openshift.io
+featureGate: -EtcdBackendQuota
 tests:
   onCreate:
     - name: Should be able to create a minimal Etcd

operator/v1/tests/etcds.operator.openshift.io/EtcdBackendQuota.yaml

@@ -0,0 +1,149 @@
+apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
+name: "Etcd"
+crdName: etcds.operator.openshift.io
+featureGate: EtcdBackendQuota
+tests:
+  onCreate:
+    - name: Should be able to create with 8 BackendQuotaGiB
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib8
+        spec:
+          backendQuotaGiB: 8
+      expected: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: default
+        spec:
+          logLevel: Normal
+          operatorLogLevel: Normal
+          backendQuotaGiB: 8
+    - name: Should be able to create with 16 BackendQuotaGiB
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib16
+        spec:
+          backendQuotaGiB: 16
+      expected: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib16
+        spec:
+          logLevel: Normal
+          operatorLogLevel: Normal
+          backendQuotaGiB: 16
+    - name: Should be able to create with 20 BackendQuotaGiB
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib20
+        spec:
+          backendQuotaGiB: 20
+      expected: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib20
+        spec:
+          logLevel: Normal
+          operatorLogLevel: Normal
+          backendQuotaGiB: 20
+    - name: Should be able to create with 32 BackendQuotaGiB
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib32
+        spec:
+          backendQuotaGiB: 32
+      expected: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib32
+        spec:
+          logLevel: Normal
+          operatorLogLevel: Normal
+          backendQuotaGiB: 32
+    - name: Should not be able to create with less than 8 BackendQuotaGiB
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib6
+        spec:
+          backendQuotaGiB: 6
+      expectedError: "spec.backendQuotaGiB: Invalid value: 6: spec.backendQuotaGiB in body should be greater than or equal to 8"
+    - name: Should not be able to create with more than 32 BackendQuotaGiB
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib40
+        spec:
+          backendQuotaGiB: 40
+      expectedError: "spec.backendQuotaGiB: Invalid value: 40: spec.backendQuotaGiB in body should be less than or equal to 32"
+  onUpdate:
+    - name: Should be able to create with default then upgrade to 16
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: default
+        spec:
+          backendQuotaGiB: 8
+      updated: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib16
+        spec:
+          backendQuotaGiB: 16
+      expected: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib16
+        spec:
+          logLevel: Normal
+          operatorLogLevel: Normal
+          backendQuotaGiB: 16
+    - name: Should not be allowed to try to decrease BackendQuotaGiB
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib16
+        spec:
+          backendQuotaGiB: 16
+      updated: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib8
+        spec:
+          backendQuotaGiB: 8
+      expectedError: etcd backendQuotaGiB may not be decreased
+    - name: Should not be allowed to upgrade to more than 32 BackendQuotaGiB
+      initial: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib16
+        spec:
+          backendQuotaGiB: 16
+      updated: |
+        apiVersion: operator.openshift.io/v1
+        kind: Etcd
+        metadata:
+          name: gib40
+        spec:
+          backendQuotaGiB: 40
+      expectedError: "spec.backendQuotaGiB: Invalid value: 40: spec.backendQuotaGiB in body should be less than or equal to 32"

operator/v1/tests/etcds.operator.openshift.io/HardwareSpeed.yaml

@@ -17,6 +17,7 @@ tests:
           logLevel: Normal
           operatorLogLevel: Normal
           controlPlaneHardwareSpeed: Standard
+          backendQuotaGiB: 8
     - name: Should be able to create with Slower hardware speed
       initial: |
         apiVersion: operator.openshift.io/v1
@@ -30,6 +31,7 @@ tests:
           logLevel: Normal
           operatorLogLevel: Normal
           controlPlaneHardwareSpeed: Slower
+          backendQuotaGiB: 8
   onUpdate:
     - name: Should be able to create with Standard, then set to Slower
       initial: |
@@ -49,6 +51,7 @@ tests:
           logLevel: Normal
           operatorLogLevel: Normal
           controlPlaneHardwareSpeed: Slower
+          backendQuotaGiB: 8
     - name: Should not be allowed to try to set invalid hardware speed
       initial: |
         apiVersion: operator.openshift.io/v1

operator/v1/types_etcd.go

@@ -43,6 +43,18 @@ type EtcdSpec struct {
 	// +openshift:enable:FeatureGate=HardwareSpeed
 	// +optional
 	HardwareSpeed ControlPlaneHardwareSpeed `json:"controlPlaneHardwareSpeed"`
+
+	// backendQuotaGiB sets the etcd backend storage size limit in gibibytes.
+	// The value should be an integer not less than 8 and not more than 32.
+	// When not specified, the default value is 8.
+	// +kubebuilder:default:=8
+	// +kubebuilder:validation:Minimum=8
+	// +kubebuilder:validation:Maximum=32
+	// +kubebuilder:validation:XValidation:rule="self>=oldSelf",message="etcd backendQuotaGiB may not be decreased"
+	// +openshift:enable:FeatureGate=EtcdBackendQuota
+	// +default=8
+	// +optional
+	BackendQuotaGiB int32 `json:"backendQuotaGiB,omitempty"`
 }
 
 type EtcdStatus struct {

operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml

@@ -40,6 +40,18 @@ spec:
             type: object
           spec:
             properties:
+              backendQuotaGiB:
+                default: 8
+                description: backendQuotaGiB sets the etcd backend storage size limit
+                  in gibibytes. The value should be an integer not less than 8 and
+                  not more than 32. When not specified, the default value is 8.
+                format: int32
+                maximum: 32
+                minimum: 8
+                type: integer
+                x-kubernetes-validations:
+                - message: etcd backendQuotaGiB may not be decreased
+                  rule: self>=oldSelf
               controlPlaneHardwareSpeed:
                 description: HardwareSpeed allows user to change the etcd tuning profile
                   which configures the latency parameters for heartbeat interval and

operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml

@@ -40,6 +40,18 @@ spec:
             type: object
           spec:
             properties:
+              backendQuotaGiB:
+                default: 8
+                description: backendQuotaGiB sets the etcd backend storage size limit
+                  in gibibytes. The value should be an integer not less than 8 and
+                  not more than 32. When not specified, the default value is 8.
+                format: int32
+                maximum: 32
+                minimum: 8
+                type: integer
+                x-kubernetes-validations:
+                - message: etcd backendQuotaGiB may not be decreased
+                  rule: self>=oldSelf
               controlPlaneHardwareSpeed:
                 description: HardwareSpeed allows user to change the etcd tuning profile
                   which configures the latency parameters for heartbeat interval and

operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml

@@ -40,6 +40,18 @@ spec:
             type: object
           spec:
             properties:
+              backendQuotaGiB:
+                default: 8
+                description: backendQuotaGiB sets the etcd backend storage size limit
+                  in gibibytes. The value should be an integer not less than 8 and
+                  not more than 32. When not specified, the default value is 8.
+                format: int32
+                maximum: 32
+                minimum: 8
+                type: integer
+                x-kubernetes-validations:
+                - message: etcd backendQuotaGiB may not be decreased
+                  rule: self>=oldSelf
               controlPlaneHardwareSpeed:
                 description: HardwareSpeed allows user to change the etcd tuning profile
                   which configures the latency parameters for heartbeat interval and

operator/v1/zz_generated.featuregated-crd-manifests.yaml

@@ -154,6 +154,7 @@ etcds.operator.openshift.io:
   Capability: ""
   Category: coreoperators
   FeatureGates:
+  - EtcdBackendQuota
   - HardwareSpeed
   FilenameOperatorName: etcd
   FilenameOperatorOrdering: "01"