diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index baa62d7d91d..baea1d76796 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -55317,7 +55317,7 @@ func schema_openshift_api_operator_v1_EtcdSpec(ref common.ReferenceCallback) com }, "backendQuotaGiB": { SchemaProps: spec.SchemaProps{ - 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.", + 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 16. When not specified, the default value is 8.", Default: 8, Type: []string{"integer"}, Format: "int32", diff --git a/operator/v1/tests/etcds.operator.openshift.io/EtcdBackendQuota.yaml b/operator/v1/tests/etcds.operator.openshift.io/EtcdBackendQuota.yaml index 5e0ac549e3b..258286a94ba 100644 --- a/operator/v1/tests/etcds.operator.openshift.io/EtcdBackendQuota.yaml +++ b/operator/v1/tests/etcds.operator.openshift.io/EtcdBackendQuota.yaml @@ -39,7 +39,7 @@ tests: logLevel: Normal operatorLogLevel: Normal backendQuotaGiB: 16 - - name: Should be able to create with 20 BackendQuotaGiB + - name: Should not be able to create with more than 16 BackendQuotaGiB (20) initial: | apiVersion: operator.openshift.io/v1 kind: Etcd @@ -47,32 +47,7 @@ tests: 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 + expectedError: "spec.backendQuotaGiB: Invalid value: 20: spec.backendQuotaGiB in body should be less than or equal to 16" - name: Should not be able to create with less than 8 BackendQuotaGiB initial: | apiVersion: operator.openshift.io/v1 @@ -82,7 +57,7 @@ tests: 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 + - name: Should not be able to create with more than 16 BackendQuotaGiB (40) initial: | apiVersion: operator.openshift.io/v1 kind: Etcd @@ -90,7 +65,7 @@ tests: name: gib40 spec: backendQuotaGiB: 40 - expectedError: "spec.backendQuotaGiB: Invalid value: 40: spec.backendQuotaGiB in body should be less than or equal to 32" + expectedError: "spec.backendQuotaGiB: Invalid value: 40: spec.backendQuotaGiB in body should be less than or equal to 16" onUpdate: - name: Should be able to create with default then upgrade to 16 initial: | @@ -132,7 +107,7 @@ tests: spec: backendQuotaGiB: 8 expectedError: etcd backendQuotaGiB may not be decreased - - name: Should not be allowed to upgrade to more than 32 BackendQuotaGiB + - name: Should not be allowed to upgrade to more than 16 BackendQuotaGiB initial: | apiVersion: operator.openshift.io/v1 kind: Etcd @@ -147,4 +122,4 @@ tests: name: gib40 spec: backendQuotaGiB: 40 - expectedError: "spec.backendQuotaGiB: Invalid value: 40: spec.backendQuotaGiB in body should be less than or equal to 32" + expectedError: "spec.backendQuotaGiB: Invalid value: 40: spec.backendQuotaGiB in body should be less than or equal to 16" diff --git a/operator/v1/types_etcd.go b/operator/v1/types_etcd.go index 252f3b39905..f2f11310360 100644 --- a/operator/v1/types_etcd.go +++ b/operator/v1/types_etcd.go @@ -42,11 +42,11 @@ type EtcdSpec struct { 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. + // The value should be an integer not less than 8 and not more than 16. // When not specified, the default value is 8. // +kubebuilder:default:=8 // +kubebuilder:validation:Minimum=8 - // +kubebuilder:validation:Maximum=32 + // +kubebuilder:validation:Maximum=16 // +kubebuilder:validation:XValidation:rule="self>=oldSelf",message="etcd backendQuotaGiB may not be decreased" // +openshift:enable:FeatureGate=EtcdBackendQuota // +default=8 diff --git a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml index 1f58ced4e0f..1feb64cbb5c 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml @@ -50,10 +50,10 @@ spec: 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. + The value should be an integer not less than 8 and not more than 16. When not specified, the default value is 8. format: int32 - maximum: 32 + maximum: 16 minimum: 8 type: integer x-kubernetes-validations: diff --git a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml index 76d63711f7f..2c32b9c9648 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml @@ -50,10 +50,10 @@ spec: 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. + The value should be an integer not less than 8 and not more than 16. When not specified, the default value is 8. format: int32 - maximum: 32 + maximum: 16 minimum: 8 type: integer x-kubernetes-validations: diff --git a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml index 7433b66d363..b74dfb9893e 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml @@ -50,10 +50,10 @@ spec: 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. + The value should be an integer not less than 8 and not more than 16. When not specified, the default value is 8. format: int32 - maximum: 32 + maximum: 16 minimum: 8 type: integer x-kubernetes-validations: diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yaml index 1b4e03d39f6..3e6062e5a0d 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yaml @@ -50,10 +50,10 @@ spec: 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. + The value should be an integer not less than 8 and not more than 16. When not specified, the default value is 8. format: int32 - maximum: 32 + maximum: 16 minimum: 8 type: integer x-kubernetes-validations: diff --git a/operator/v1/zz_generated.swagger_doc_generated.go b/operator/v1/zz_generated.swagger_doc_generated.go index c3ed726028d..0b82b1ac663 100644 --- a/operator/v1/zz_generated.swagger_doc_generated.go +++ b/operator/v1/zz_generated.swagger_doc_generated.go @@ -798,7 +798,7 @@ func (EtcdList) SwaggerDoc() map[string]string { var map_EtcdSpec = map[string]string{ "controlPlaneHardwareSpeed": "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.", - "backendQuotaGiB": "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.", + "backendQuotaGiB": "backendQuotaGiB sets the etcd backend storage size limit in gibibytes. The value should be an integer not less than 8 and not more than 16. When not specified, the default value is 8.", } func (EtcdSpec) SwaggerDoc() map[string]string { diff --git a/payload-manifests/crds/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml b/payload-manifests/crds/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml index 1f58ced4e0f..1feb64cbb5c 100644 --- a/payload-manifests/crds/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml @@ -50,10 +50,10 @@ spec: 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. + The value should be an integer not less than 8 and not more than 16. When not specified, the default value is 8. format: int32 - maximum: 32 + maximum: 16 minimum: 8 type: integer x-kubernetes-validations: diff --git a/payload-manifests/crds/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml index 76d63711f7f..2c32b9c9648 100644 --- a/payload-manifests/crds/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml @@ -50,10 +50,10 @@ spec: 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. + The value should be an integer not less than 8 and not more than 16. When not specified, the default value is 8. format: int32 - maximum: 32 + maximum: 16 minimum: 8 type: integer x-kubernetes-validations: diff --git a/payload-manifests/crds/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml index 7433b66d363..b74dfb9893e 100644 --- a/payload-manifests/crds/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml @@ -50,10 +50,10 @@ spec: 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. + The value should be an integer not less than 8 and not more than 16. When not specified, the default value is 8. format: int32 - maximum: 32 + maximum: 16 minimum: 8 type: integer x-kubernetes-validations: