From 25ff9b515aceaa6a1e90f315023d490cc955bb9f Mon Sep 17 00:00:00 2001 From: marcobebway Date: Tue, 26 Sep 2023 13:35:39 +0200 Subject: [PATCH] Sync test CRD defaults --- .../bases/operator.kyma-project.io_nats.yaml | 32 +++++++++---------- .../validation/integration_test.go | 12 +++---- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/config/crd/bases/operator.kyma-project.io_nats.yaml b/config/crd/bases/operator.kyma-project.io_nats.yaml index 1ce8ae61..47ae0baf 100644 --- a/config/crd/bases/operator.kyma-project.io_nats.yaml +++ b/config/crd/bases/operator.kyma-project.io_nats.yaml @@ -50,18 +50,18 @@ spec: size: 1Gi storageClassName: default memStorage: - enabled: false - size: 20Mi + enabled: true + size: 1Gi logging: debug: false trace: false resources: limits: - cpu: 20m - memory: 64Mi + cpu: 500m + memory: 1Gi requests: - cpu: 5m - memory: 16Mi + cpu: 40m + memory: 64Mi description: NATSSpec defines the desired state of NATS. properties: annotations: @@ -90,8 +90,8 @@ spec: size: 1Gi storageClassName: default memStorage: - enabled: false - size: 20Mi + enabled: true + size: 1Gi description: JetStream defines configurations that are specific to NATS JetStream. properties: @@ -127,20 +127,20 @@ spec: rule: self == oldSelf memStorage: default: - enabled: false - size: 20Mi + enabled: true + size: 1Gi description: MemStorage defines configurations to memory storage in NATS JetStream. properties: enabled: - default: false + default: true description: Enabled allows the enablement of memory storage. type: boolean size: anyOf: - type: integer - type: string - default: 20Mi + default: 1Gi description: Size defines the mem. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true @@ -176,11 +176,11 @@ spec: resources: default: limits: - cpu: 20m - memory: 64Mi + cpu: 500m + memory: 1Gi requests: - cpu: 5m - memory: 16Mi + cpu: 40m + memory: 64Mi description: Resources defines resources for NATS. properties: claims: diff --git a/internal/controller/nats/integrationtests/validation/integration_test.go b/internal/controller/nats/integrationtests/validation/integration_test.go index 1d305b0f..288d4ae9 100644 --- a/internal/controller/nats/integrationtests/validation/integration_test.go +++ b/internal/controller/nats/integrationtests/validation/integration_test.go @@ -456,20 +456,20 @@ func Test_NATS_Defaulting(t *testing.T) { func defaultResources() corev1.ResourceRequirements { return corev1.ResourceRequirements{ Limits: corev1.ResourceList{ - "cpu": resource.MustParse("20m"), - "memory": resource.MustParse("64Mi"), + "cpu": resource.MustParse("500m"), + "memory": resource.MustParse("1Gi"), }, Requests: corev1.ResourceList{ - "cpu": resource.MustParse("5m"), - "memory": resource.MustParse("16Mi"), + "cpu": resource.MustParse("40m"), + "memory": resource.MustParse("64Mi"), }, } } func defaultMemStorage() v1alpha1.MemStorage { return v1alpha1.MemStorage{ - Enabled: false, - Size: resource.MustParse("20Mi"), + Enabled: true, + Size: resource.MustParse("1Gi"), } }