diff --git a/core/pom.xml b/core/pom.xml index 730455d9..a39e505e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -49,7 +49,7 @@ dev.streamx - streamx-operator-api + streamx-operator-mesh-api com.fasterxml.jackson.datatype diff --git a/core/src/test/resources/dev/streamx/cli/command/cloud/deploy/servicemeshes.streamx.dev-v1.yml b/core/src/test/resources/dev/streamx/cli/command/cloud/deploy/servicemeshes.streamx.dev-v1.yml index 77a20dfc..c67f3a24 100644 --- a/core/src/test/resources/dev/streamx/cli/command/cloud/deploy/servicemeshes.streamx.dev-v1.yml +++ b/core/src/test/resources/dev/streamx/cli/command/cloud/deploy/servicemeshes.streamx.dev-v1.yml @@ -121,6 +121,15 @@ spec: type: "string" type: "object" type: "array" + podDisruptionBudget: + properties: + enabled: + type: "boolean" + maxUnavailable: + type: "integer" + minAvailable: + type: "integer" + type: "object" probes: properties: liveness: @@ -319,6 +328,8 @@ spec: properties: name: type: "string" + request: + type: "string" type: "object" type: "array" limits: @@ -725,6 +736,10 @@ spec: type: "object" type: "array" type: "object" + stateful: + type: "boolean" + storageClassName: + type: "string" strategy: properties: rollingUpdate: @@ -755,6 +770,15 @@ spec: type: "string" type: "object" type: "array" + podDisruptionBudget: + properties: + enabled: + type: "boolean" + maxUnavailable: + type: "integer" + minAvailable: + type: "integer" + type: "object" probes: properties: liveness: @@ -953,6 +977,8 @@ spec: properties: name: type: "string" + request: + type: "string" type: "object" type: "array" limits: @@ -1359,6 +1385,10 @@ spec: type: "object" type: "array" type: "object" + stateful: + type: "boolean" + storageClassName: + type: "string" strategy: properties: rollingUpdate: @@ -1389,6 +1419,15 @@ spec: type: "string" type: "object" type: "array" + podDisruptionBudget: + properties: + enabled: + type: "boolean" + maxUnavailable: + type: "integer" + minAvailable: + type: "integer" + type: "object" probes: properties: liveness: @@ -1587,6 +1626,8 @@ spec: properties: name: type: "string" + request: + type: "string" type: "object" type: "array" limits: @@ -1993,6 +2034,10 @@ spec: type: "object" type: "array" type: "object" + stateful: + type: "boolean" + storageClassName: + type: "string" strategy: properties: rollingUpdate: @@ -2023,6 +2068,15 @@ spec: type: "string" type: "object" type: "array" + podDisruptionBudget: + properties: + enabled: + type: "boolean" + maxUnavailable: + type: "integer" + minAvailable: + type: "integer" + type: "object" probes: properties: liveness: @@ -2221,6 +2275,8 @@ spec: properties: name: type: "string" + request: + type: "string" type: "object" type: "array" limits: @@ -2627,6 +2683,10 @@ spec: type: "object" type: "array" type: "object" + stateful: + type: "boolean" + storageClassName: + type: "string" strategy: properties: rollingUpdate: @@ -2849,6 +2909,8 @@ spec: properties: name: type: "string" + request: + type: "string" type: "object" type: "array" limits: @@ -2868,6 +2930,20 @@ spec: type: "object" sidecar: type: "boolean" + volumes: + additionalProperties: + properties: + mountPath: + type: "string" + size: + anyOf: + - type: "integer" + - type: "string" + x-kubernetes-int-or-string: true + storageClassName: + type: "string" + type: "object" + type: "object" type: "object" type: "object" imagePullPolicy: @@ -2918,6 +2994,17 @@ spec: type: "string" type: "object" type: "array" + waitForLoadBalancer: + type: "boolean" + type: "object" + podDisruptionBudget: + properties: + enabled: + type: "boolean" + maxUnavailable: + type: "integer" + minAvailable: + type: "integer" type: "object" probes: properties: @@ -3117,6 +3204,8 @@ spec: properties: name: type: "string" + request: + type: "string" type: "object" type: "array" limits: @@ -3525,6 +3614,8 @@ spec: type: "object" stateful: type: "boolean" + storageClassName: + type: "string" strategy: properties: rollingUpdate: @@ -3543,6 +3634,20 @@ spec: type: type: "string" type: "object" + volumes: + additionalProperties: + properties: + mountPath: + type: "string" + size: + anyOf: + - type: "integer" + - type: "string" + x-kubernetes-int-or-string: true + storageClassName: + type: "string" + type: "object" + type: "object" type: "object" type: "object" ingestion: @@ -3596,6 +3701,17 @@ spec: type: "string" type: "object" type: "array" + waitForLoadBalancer: + type: "boolean" + type: "object" + podDisruptionBudget: + properties: + enabled: + type: "boolean" + maxUnavailable: + type: "integer" + minAvailable: + type: "integer" type: "object" probes: properties: @@ -3795,6 +3911,8 @@ spec: properties: name: type: "string" + request: + type: "string" type: "object" type: "array" limits: @@ -4201,6 +4319,10 @@ spec: type: "object" type: "array" type: "object" + stateful: + type: "boolean" + storageClassName: + type: "string" strategy: properties: rollingUpdate: @@ -4219,6 +4341,20 @@ spec: type: type: "string" type: "object" + volumes: + additionalProperties: + properties: + mountPath: + type: "string" + size: + anyOf: + - type: "integer" + - type: "string" + x-kubernetes-int-or-string: true + storageClassName: + type: "string" + type: "object" + type: "object" type: "object" type: "object" processing: @@ -4233,6 +4369,15 @@ spec: type: "string" type: "object" type: "array" + podDisruptionBudget: + properties: + enabled: + type: "boolean" + maxUnavailable: + type: "integer" + minAvailable: + type: "integer" + type: "object" probes: properties: liveness: @@ -4431,6 +4576,8 @@ spec: properties: name: type: "string" + request: + type: "string" type: "object" type: "array" limits: @@ -4837,6 +4984,10 @@ spec: type: "object" type: "array" type: "object" + stateful: + type: "boolean" + storageClassName: + type: "string" strategy: properties: rollingUpdate: @@ -4855,25 +5006,22 @@ spec: type: type: "string" type: "object" + volumes: + additionalProperties: + properties: + mountPath: + type: "string" + size: + anyOf: + - type: "integer" + - type: "string" + x-kubernetes-int-or-string: true + storageClassName: + type: "string" + type: "object" + type: "object" type: "object" type: "object" - tenantConfig: - properties: - inboxesCompactionThresholdBytes: - type: "integer" - inboxesPartitions: - type: "integer" - outboxesCompactionThresholdBytes: - type: "integer" - outboxesPartitions: - type: "integer" - relaysPartitions: - type: "integer" - storesCompactionThresholdBytes: - type: "integer" - subscriptionExpirationTimeMinutes: - type: "integer" - type: "object" type: "object" environment: additionalProperties: diff --git a/core/src/test/resources/dev/streamx/cli/command/cloud/project/deployment.custom-name.yaml b/core/src/test/resources/dev/streamx/cli/command/cloud/project/deployment.custom-name.yaml index d11743b9..0f8d4610 100644 --- a/core/src/test/resources/dev/streamx/cli/command/cloud/project/deployment.custom-name.yaml +++ b/core/src/test/resources/dev/streamx/cli/command/cloud/project/deployment.custom-name.yaml @@ -1,12 +1,4 @@ --- -tenantConfig: - inboxesPartitions: 2 - relaysPartitions: 2 - outboxesPartitions: 2 - inboxesCompactionThresholdBytes: 10240 - outboxesCompactionThresholdBytes: 10240 - storesCompactionThresholdBytes: 10240 - subscriptionExpirationTimeMinutes: 240 ingestion: rest: replicas: 2 @@ -15,5 +7,5 @@ processing: replicas: 2 delivery: web-delivery-service: - replicas: 2 stateful: false + replicas: 2 diff --git a/core/src/test/resources/dev/streamx/cli/command/cloud/project/deployment.yaml b/core/src/test/resources/dev/streamx/cli/command/cloud/project/deployment.yaml index da8e102a..2ea76b54 100644 --- a/core/src/test/resources/dev/streamx/cli/command/cloud/project/deployment.yaml +++ b/core/src/test/resources/dev/streamx/cli/command/cloud/project/deployment.yaml @@ -1,12 +1,4 @@ --- -tenantConfig: - inboxesPartitions: 2 - relaysPartitions: 2 - outboxesPartitions: 2 - inboxesCompactionThresholdBytes: 10240 - outboxesCompactionThresholdBytes: 10240 - storesCompactionThresholdBytes: 10240 - subscriptionExpirationTimeMinutes: 240 ingestion: rest: replicas: 1 @@ -15,5 +7,5 @@ processing: replicas: 2 delivery: web-delivery-service: - replicas: 1 stateful: true + replicas: 1 diff --git a/core/src/test/resources/dev/streamx/cli/command/cloud/project/mesh.yaml b/core/src/test/resources/dev/streamx/cli/command/cloud/project/mesh.yaml index 9023e198..c6bd93fd 100644 --- a/core/src/test/resources/dev/streamx/cli/command/cloud/project/mesh.yaml +++ b/core/src/test/resources/dev/streamx/cli/command/cloud/project/mesh.yaml @@ -28,4 +28,6 @@ delivery: image: "docker.io/library/nginx:1.26.0" ports: - 8082:80 - repositoryVolume: "/usr/share/nginx/html" \ No newline at end of file + repositoryVolume: "/usr/share/nginx/html" + environment: + STREAMX_DELIVERY-SERVICE_READINESS-CHECK_CHANNELS-QUIET-TIME: "3000" \ No newline at end of file diff --git a/core/src/test/resources/dev/streamx/cli/command/dev/failing-mesh.yaml b/core/src/test/resources/dev/streamx/cli/command/dev/failing-mesh.yaml index e733ee53..06d2c4cc 100644 --- a/core/src/test/resources/dev/streamx/cli/command/dev/failing-mesh.yaml +++ b/core/src/test/resources/dev/streamx/cli/command/dev/failing-mesh.yaml @@ -28,3 +28,5 @@ delivery: pages: topic: outboxes/pages port: 8081 + environment: + STREAMX_DELIVERY-SERVICE_READINESS-CHECK_CHANNELS-QUIET-TIME: "3000" diff --git a/core/src/test/resources/dev/streamx/cli/command/dev/incremental-reloaded-mesh.yaml b/core/src/test/resources/dev/streamx/cli/command/dev/incremental-reloaded-mesh.yaml index bb03f901..0b18a59c 100644 --- a/core/src/test/resources/dev/streamx/cli/command/dev/incremental-reloaded-mesh.yaml +++ b/core/src/test/resources/dev/streamx/cli/command/dev/incremental-reloaded-mesh.yaml @@ -28,3 +28,5 @@ delivery: pages: topic: outboxes/page port: 8081 + environment: + STREAMX_DELIVERY-SERVICE_READINESS-CHECK_CHANNELS-QUIET-TIME: "3000" diff --git a/core/src/test/resources/dev/streamx/cli/command/dev/initial-mesh.yaml b/core/src/test/resources/dev/streamx/cli/command/dev/initial-mesh.yaml index a24904ef..da297fa3 100644 --- a/core/src/test/resources/dev/streamx/cli/command/dev/initial-mesh.yaml +++ b/core/src/test/resources/dev/streamx/cli/command/dev/initial-mesh.yaml @@ -28,3 +28,5 @@ delivery: pages: topic: outboxes/pages port: 8081 + environment: + STREAMX_DELIVERY-SERVICE_READINESS-CHECK_CHANNELS-QUIET-TIME: "3000" diff --git a/pom.xml b/pom.xml index b5406fad..e0ec4b0a 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 1.0.16 1.1.1 - 0.0.12 + 0.0.16 2.9.0 3.27.3 3.12.1 @@ -88,7 +88,7 @@ dev.streamx - streamx-operator-api + streamx-operator-mesh-api ${streamx-operator.version}