From 16e76ae5c7e11006f8308bcee4e798002af9a595 Mon Sep 17 00:00:00 2001 From: rodrigolourencolopes Date: Mon, 18 Nov 2024 16:06:26 +0100 Subject: [PATCH 1/5] feat: increase ES memory for the benchmarks. --- charts/zeebe-benchmark/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/zeebe-benchmark/values.yaml b/charts/zeebe-benchmark/values.yaml index 40cc8d8..d7d076c 100644 --- a/charts/zeebe-benchmark/values.yaml +++ b/charts/zeebe-benchmark/values.yaml @@ -525,7 +525,7 @@ camunda-platform: # Persistent Volume Storage Class storageClass: "ssd" # Persistent Volume Size - size: 16Gi + size: 32Gi # Persistent Volume Access Modes accessModes: [ "ReadWriteOnce" ] From d57ed28dc3a7b0f4584a70b32e4fd3efcbfee1e5 Mon Sep 17 00:00:00 2001 From: rodrigolourencolopes Date: Wed, 20 Nov 2024 12:32:51 +0100 Subject: [PATCH 2/5] fix: replace release tag To see the full reasoning check the slack thread: https://camunda.slack.com/archives/C06GF0JPY68/p1732001694427559?thread_ts=1731918845.694709&cid=C06GF0JPY68 --- charts/zeebe-benchmark/Chart-with-artifacthub-changes.yaml.tmp | 2 +- charts/zeebe-benchmark/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/zeebe-benchmark/Chart-with-artifacthub-changes.yaml.tmp b/charts/zeebe-benchmark/Chart-with-artifacthub-changes.yaml.tmp index 95cfd80..1483c76 100644 --- a/charts/zeebe-benchmark/Chart-with-artifacthub-changes.yaml.tmp +++ b/charts/zeebe-benchmark/Chart-with-artifacthub-changes.yaml.tmp @@ -10,7 +10,7 @@ sources: dependencies: - name: camunda-platform repository: "oci://ghcr.io/camunda/helm" - version: "0.0.0-12.0.0-alpha1" + version: "0.0.0-8.7.0-alpha1" condition: "camunda.enabled" - name: prometheus-elasticsearch-exporter repository: "https://prometheus-community.github.io/helm-charts" diff --git a/charts/zeebe-benchmark/Chart.yaml b/charts/zeebe-benchmark/Chart.yaml index 95cfd80..1483c76 100644 --- a/charts/zeebe-benchmark/Chart.yaml +++ b/charts/zeebe-benchmark/Chart.yaml @@ -10,7 +10,7 @@ sources: dependencies: - name: camunda-platform repository: "oci://ghcr.io/camunda/helm" - version: "0.0.0-12.0.0-alpha1" + version: "0.0.0-8.7.0-alpha1" condition: "camunda.enabled" - name: prometheus-elasticsearch-exporter repository: "https://prometheus-community.github.io/helm-charts" From 87e0ae06af8e3b923484a30c2dfb17d9059bc7ac Mon Sep 17 00:00:00 2001 From: rodrigolourencolopes Date: Thu, 21 Nov 2024 14:08:46 +0100 Subject: [PATCH 3/5] fix: fix tests to accommodate the changes in charts refactorings. The link to the commit in camunda-platform-helm https://github.com/camunda/camunda-platform-helm/commit/28d79278105b365a61b51974ce5efb0400d160e0#diff-624a96601c5010c87f441781ea4c0e803b469e0bf2507e7ea86a651b0967ca9d --- ...ml => c8-core-service-monitor.golden.yaml} | 6 +- .../golden/c8-zeebe-configmap.golden.yaml | 211 +++++++++++++----- .../test/golden/c8-zeebe-service.golden.yaml | 18 +- .../golden/c8-zeebe-statefulset.golden.yaml | 157 ++++--------- .../test/golden_camunda_platform_test.go | 48 +--- 5 files changed, 214 insertions(+), 226 deletions(-) rename charts/zeebe-benchmark/test/golden/{c8-zeebe-gateway-service-monitor.golden.yaml => c8-core-service-monitor.golden.yaml} (78%) diff --git a/charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-service-monitor.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-core-service-monitor.golden.yaml similarity index 78% rename from charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-service-monitor.golden.yaml rename to charts/zeebe-benchmark/test/golden/c8-core-service-monitor.golden.yaml index 1d1a947..3e75b1c 100644 --- a/charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-service-monitor.golden.yaml +++ b/charts/zeebe-benchmark/test/golden/c8-core-service-monitor.golden.yaml @@ -1,9 +1,9 @@ --- -# Source: zeebe-benchmark/charts/camunda-platform/templates/service-monitor/zeebe-gateway-service-monitor.yaml +# Source: zeebe-benchmark/charts/camunda-platform/templates/service-monitor/core-service-monitor.yaml apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: benchmark-test-camunda-platform-zeebe-gateway + name: benchmark-test-camunda-platform-core labels: app: camunda-platform app.kubernetes.io/name: camunda-platform @@ -15,7 +15,7 @@ spec: selector: matchLabels: app: camunda-platform - app.kubernetes.io/component: zeebe-gateway + app.kubernetes.io/component: core endpoints: - honorLabels: true path: /actuator/prometheus diff --git a/charts/zeebe-benchmark/test/golden/c8-zeebe-configmap.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-zeebe-configmap.golden.yaml index d03a4a2..345597a 100644 --- a/charts/zeebe-benchmark/test/golden/c8-zeebe-configmap.golden.yaml +++ b/charts/zeebe-benchmark/test/golden/c8-zeebe-configmap.golden.yaml @@ -1,87 +1,192 @@ --- -# Source: zeebe-benchmark/charts/camunda-platform/templates/zeebe/configmap.yaml +# Source: zeebe-benchmark/charts/camunda-platform/templates/core/configmap.yaml kind: ConfigMap metadata: - name: benchmark-test-zeebe-configuration + name: benchmark-test-core-configuration labels: app: camunda-platform app.kubernetes.io/name: camunda-platform app.kubernetes.io/instance: benchmark-test app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: zeebe-broker - app.kubernetes.io/version: "SNAPSHOT" + app.kubernetes.io/component: core + app.kubernetes.io/version: "8.7.0-alpha1" apiVersion: v1 data: + startup.sh: | + # The Node ID depends on the Pod name so it cannot be templated in the StatefulSet level. + export ZEEBE_BROKER_CLUSTER_NODEID="${ZEEBE_BROKER_CLUSTER_NODEID:-$[${K8S_NAME##*-} * 1 + 0]}" + echo "export ZEEBE_BROKER_CLUSTER_NODEID=${ZEEBE_BROKER_CLUSTER_NODEID}" >> ~/.bashrc + + exec /usr/local/camunda/bin/camunda application.yaml: | + + spring: + profiles: + active: auth + + management: + server: + port: 9600 + + server: + forward-headers-strategy: framework + address: 0.0.0.0 + port: 8080 + zeebe: + host: 0.0.0.0 + log: + level: "info" + broker: - exporters: - elasticsearch: - className: "io.camunda.zeebe.exporter.ElasticsearchExporter" - args: - url: "http://benchmark-test-elasticsearch:9200" - index: - prefix: "zeebe-record" - retention: - enabled: true - minimumAge: "10m" - policyName: "zeebe-record-retention-policy" - CamundaExporter: - className: "io.camunda.exporter.CamundaExporter" - args: - connect: - type: elasticsearch - url: "http://benchmark-test-elasticsearch:9200" - retention: - enabled: true - minimumAge: "10m" - policyName: "zeebe-record-retention-policy" - createSchema: true + # zeebe.broker.experimental + experimental: + engine: + authorization: + enableAuthorization: true + + # zeebe.broker.gateway gateway: enable: true network: + host: 0.0.0.0 port: 26500 - security: - enabled: false - authentication: - mode: none + + # zeebe.broker.network network: + advertisedHost: "${K8S_NAME}.${K8S_SERVICE_NAME}" host: 0.0.0.0 commandApi: port: 26501 internalApi: port: 26502 - monitoringApi: - port: "9600" + + # zeebe.broker.cluster cluster: + initialContactPoints: + - ${K8S_SERVICE_NAME}-0.${K8S_SERVICE_NAME}:26502 + - ${K8S_SERVICE_NAME}-1.${K8S_SERVICE_NAME}:26502 + - ${K8S_SERVICE_NAME}-2.${K8S_SERVICE_NAME}:26502 clusterSize: "3" replicationFactor: "3" partitionsCount: "3" clusterName: benchmark-test-zeebe + + # zeebe.broker.data + data: + snapshotPeriod: 5m + freeSpace: + processing: 2GB + replication: 3GB + + # zeebe.broker.threads threads: cpuThreadCount: "3" ioThreadCount: "3" - # Camunda Database configuration - camunda.database: - type: elasticsearch - # Cluster name - clusterName: elasticsearch - # Elasticsearch full url - url: "http://benchmark-test-elasticsearch:9200" + # zeebe.broker.exporters + exporters: + elasticsearch: + className: "io.camunda.zeebe.exporter.ElasticsearchExporter" + args: + url: "http://benchmark-test-elasticsearch:9200" + index: + prefix: "zeebe-record" + CamundaExporter: + className: "io.camunda.exporter.CamundaExporter" + args: + connect: + type: elasticsearch + url: "http://benchmark-test-elasticsearch:9200" + createSchema: true - startup.sh: | - #!/usr/bin/env bash - set -eux -o pipefail - export ZEEBE_BROKER_CLUSTER_NODEID=${ZEEBE_BROKER_CLUSTER_NODEID:-$[${K8S_NAME##*-} * 1 + 0]} - - if [ "$(ls -A /exporters/)" ]; then - mkdir -p /usr/local/zeebe/exporters/ - cp -a /exporters/*.jar /usr/local/zeebe/exporters/ - else - echo "No exporters available." - fi - exec /usr/local/zeebe/bin/broker - - broker-log4j2.xml: | \ No newline at end of file + camunda: + rest: + query: + enabled: true + + # + # Camunda Database Configuration. + # + database: + type: elasticsearch + # Cluster name + clusterName: elasticsearch + # Elasticsearch full url + url: "http://benchmark-test-elasticsearch:9200" + + # + # Camunda Operate Configuration. + # + operate: + + # ELS instance to store Operate data + elasticsearch: + # Cluster name + clusterName: elasticsearch + # Host + host: benchmark-test-elasticsearch + # Transport port + port: 9200 + # Elasticsearch full url + url: "http://benchmark-test-elasticsearch:9200" + # ELS instance to export Zeebe data to + zeebeElasticsearch: + # Cluster name + clusterName: elasticsearch + # Host + host: benchmark-test-elasticsearch + # Transport port + port: 9200 + # Index prefix, configured in Zeebe Elasticsearch exporter + prefix: zeebe-record + # Elasticsearch full url + url: "http://benchmark-test-elasticsearch:9200" + # Zeebe instance + zeebe: + # Gateway address + gatewayAddress: "benchmark-test-core:26500" + + # + # Camunda Tasklist Configuration. + # + tasklist: + + identity: + redirectRootUrl: "http://localhost:8082/tasklist" + + # Set Tasklist username and password. + # If user with does not exists it will be created. + # Default: demo/demo + #username: + #password: + # ELS instance to store Tasklist data + elasticsearch: + # Cluster name + clusterName: elasticsearch + # Host + host: benchmark-test-elasticsearch + # Transport port + port: 9200 + # Elasticsearch full url + url: "http://benchmark-test-elasticsearch:9200" + # ELS instance to export Zeebe data to + zeebeElasticsearch: + # Cluster name + clusterName: elasticsearch + # Host + host: benchmark-test-elasticsearch + # Transport port + port: 9200 + # Index prefix, configured in Zeebe Elasticsearch exporter + prefix: zeebe-record + # Elasticsearch full url + url: "http://benchmark-test-elasticsearch:9200" + # Zeebe instance + zeebe: + # Gateway address + gatewayAddress: benchmark-test-core:26500 + restAddress: "http://benchmark-test-core:8080" + + log4j2.xml: | \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden/c8-zeebe-service.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-zeebe-service.golden.yaml index 2dfa872..295c64f 100644 --- a/charts/zeebe-benchmark/test/golden/c8-zeebe-service.golden.yaml +++ b/charts/zeebe-benchmark/test/golden/c8-zeebe-service.golden.yaml @@ -1,24 +1,24 @@ --- -# Source: zeebe-benchmark/charts/camunda-platform/templates/zeebe/service.yaml +# Source: zeebe-benchmark/charts/camunda-platform/templates/core/service.yaml apiVersion: v1 kind: Service metadata: - name: "benchmark-test-zeebe" + name: benchmark-test-core labels: app: camunda-platform app.kubernetes.io/name: camunda-platform app.kubernetes.io/instance: benchmark-test app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: zeebe-broker - app.kubernetes.io/version: "SNAPSHOT" + app.kubernetes.io/component: core + app.kubernetes.io/version: "8.7.0-alpha1" annotations: spec: clusterIP: None publishNotReadyAddresses: true type: ClusterIP ports: - - port: 9600 + - port: 8080 protocol: TCP name: http - port: 26502 @@ -27,10 +27,16 @@ spec: - port: 26501 protocol: TCP name: command + - port: 9600 + protocol: TCP + name: server + - port: 26500 + protocol: TCP + name: gateway selector: app: camunda-platform app.kubernetes.io/name: camunda-platform app.kubernetes.io/instance: benchmark-test app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: zeebe-broker \ No newline at end of file + app.kubernetes.io/component: core \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden/c8-zeebe-statefulset.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-zeebe-statefulset.golden.yaml index c46dd16..3ff4c54 100644 --- a/charts/zeebe-benchmark/test/golden/c8-zeebe-statefulset.golden.yaml +++ b/charts/zeebe-benchmark/test/golden/c8-zeebe-statefulset.golden.yaml @@ -1,17 +1,17 @@ --- -# Source: zeebe-benchmark/charts/camunda-platform/templates/zeebe/statefulset.yaml +# Source: zeebe-benchmark/charts/camunda-platform/templates/core/statefulset.yaml apiVersion: apps/v1 kind: StatefulSet metadata: - name: "benchmark-test-zeebe" + name: benchmark-test-core labels: app: camunda-platform app.kubernetes.io/name: camunda-platform app.kubernetes.io/instance: benchmark-test app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: zeebe-broker - app.kubernetes.io/version: "SNAPSHOT" + app.kubernetes.io/component: core + app.kubernetes.io/version: "8.7.0-alpha1" annotations: spec: replicas: 3 @@ -22,8 +22,8 @@ spec: app.kubernetes.io/instance: benchmark-test app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: zeebe-broker - serviceName: "benchmark-test-zeebe" + app.kubernetes.io/component: core + serviceName: benchmark-test-core updateStrategy: type: RollingUpdate podManagementPolicy: Parallel @@ -35,41 +35,28 @@ spec: app.kubernetes.io/instance: benchmark-test app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: zeebe-broker - app.kubernetes.io/version: "SNAPSHOT" + app.kubernetes.io/component: core + app.kubernetes.io/version: "8.7.0-alpha1" annotations: - checksum/config: 4e7d66ef2c5cc5b5153ce41dd3b77c26d1ebea04c443bb81cbb8ec00a96462b1 + checksum/config: 0af99dfd865b4e2b8dcd8ea4defec2b16e5ffee41fa37cedc969f502c6d3824e spec: imagePullSecrets: [] initContainers: - - command: - - wget - - https://github.com/pyroscope-io/pyroscope-java/releases/latest/download/pyroscope.jar - - -O - - /pyroscope/pyroscope.jar - image: alpine - name: pyroscope - securityContext: - allowPrivilegeEscalation: false - privileged: false - readOnlyRootFilesystem: true - runAsUser: 1000 - volumeMounts: - - mountPath: /pyroscope - name: pyroscope + [] containers: - - name: zeebe - image: camunda/zeebe:SNAPSHOT + - name: core + image: camunda/camunda:8.7.0-alpha1 imagePullPolicy: Always securityContext: - allowPrivilegeEscalation: true - privileged: true + allowPrivilegeEscalation: false + privileged: false readOnlyRootFilesystem: true runAsNonRoot: true - runAsUser: 1000 + runAsUser: 1001 seccompProfile: type: RuntimeDefault + command: ["bash", "/usr/local/bin/startup.sh"] env: - name: CAMUNDA_LICENSE_KEY valueFrom: @@ -83,85 +70,33 @@ spec: fieldRef: fieldPath: metadata.name - name: K8S_SERVICE_NAME - value: "benchmark-test-zeebe" + value: benchmark-test-core - name: K8S_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace - - name: ZEEBE_BROKER_NETWORK_ADVERTISEDHOST - value: "$(K8S_NAME).$(K8S_SERVICE_NAME)" - - name: ZEEBE_BROKER_CLUSTER_INITIALCONTACTPOINTS - value: - $(K8S_SERVICE_NAME)-0.$(K8S_SERVICE_NAME):26502, - $(K8S_SERVICE_NAME)-1.$(K8S_SERVICE_NAME):26502, - $(K8S_SERVICE_NAME)-2.$(K8S_SERVICE_NAME):26502, - - name: ZEEBE_LOG_LEVEL - value: "info" - - name: ZEEBE_BROKER_GATEWAY_ENABLE - value: "false" - - name: ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_CLASSNAME - value: "io.camunda.zeebe.exporter.ElasticsearchExporter" - - name: ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_ARGS_URL - value: "http://benchmark-test-elasticsearch:9200" - - name: ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_ARGS_INDEX_PREFIX - value: "zeebe-record" + - name: VALUES_CAMUNDA_CORE_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: benchmark-test-core-identity-secret + key: core-secret - name: JAVA_TOOL_OPTIONS - value: "-XX:MaxRAMPercentage=25.0 -XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/usr/local/zeebe/data -XX:ErrorFile=/usr/local/zeebe/data/zeebe_error%p.log -Xlog:gc*:file=/usr/local/zeebe/data/gc.log:time:filecount=7,filesize=8M" + value: "-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/usr/local/zeebe/data -XX:ErrorFile=/usr/local/zeebe/data/zeebe_error%p.log -XX:+ExitOnOutOfMemoryError" - name: K8S_POD_NAME valueFrom: fieldRef: fieldPath: metadata.name - - name: K8S_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: K8S_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: ZEEBE_LOG_APPENDER - value: Stackdriver - - name: ZEEBE_LOG_STACKDRIVER_SERVICENAME - value: zeebe - - name: ZEEBE_LOG_STACKDRIVER_SERVICEVERSION - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: ATOMIX_LOG_LEVEL - value: INFO - - name: ZEEBE_LOG_LEVEL - value: DEBUG - - name: PYROSCOPE_SERVER_ADDRESS - value: http://pyroscope.pyroscope.svc.cluster.local:4040 - - name: PYROSCOPE_APPLICATION_NAME - value: io.camunda.zeebe.broker - - name: PYROSCOPE_LOG_LEVEL - value: debug - - name: PYROSCOPE_FORMAT - value: jfr - - name: PYROSCOPE_PROFILER_EVENT - value: cpu - - name: PYROSCOPE_PROFILER_ALLOC - value: "0" - - name: PYROSCOPE_PROFILER_LOCK - value: "0" - - name: PYROSCOPE_LABELS - value: namespace=$(K8S_NAMESPACE), pod=$(K8S_NAME) - - name: SPRING_CONFIG_ADDITIONALLOCATION - value: /usr/local/zeebe/config/benchmark-config.yaml - - name: JAVA_OPTS - valueFrom: - configMapKeyRef: - key: java-opts - name: zeebe-config - optional: true ports: - - containerPort: 9600 + - containerPort: 8080 name: http - containerPort: 26501 name: command - containerPort: 26502 name: internal + - containerPort: 9600 + name: server + - containerPort: 26500 + name: gateway readinessProbe: httpGet: path: /actuator/health/readiness @@ -174,54 +109,39 @@ spec: timeoutSeconds: 1 resources: limits: - cpu: 1700m - memory: 4Gi + cpu: 960m + memory: 1920Mi requests: - cpu: 1350m - memory: 4Gi + cpu: 800m + memory: 1200Mi volumeMounts: - name: config mountPath: /usr/local/bin/startup.sh subPath: startup.sh - name: data - mountPath: /usr/local/zeebe/data + mountPath: /usr/local/camunda/data - name: exporters mountPath: /exporters - mountPath: /tmp name: tmp - name: config - mountPath: /usr/local/zeebe/config/application.yaml + mountPath: /usr/local/camunda/config/application.yaml subPath: application.yaml - - - mountPath: /usr/local/zeebe/config/benchmark-config.yaml - name: benchmark-config - subPath: benchmark-config.yaml - - mountPath: /pyroscope - name: pyroscope volumes: - name: config configMap: - name: benchmark-test-zeebe-configuration + name: benchmark-test-core-configuration defaultMode: 492 - name: exporters emptyDir: {} - name: tmp emptyDir: {} - - - configMap: - defaultMode: 492 - name: benchmark-config - name: benchmark-config - - emptyDir: {} - name: pyroscope - serviceAccountName: benchmark-test-zeebe + serviceAccountName: benchmark-test-core securityContext: fsGroup: 1001 runAsNonRoot: true seccompProfile: type: RuntimeDefault - nodeSelector: - cloud.google.com/gke-nodepool: n2-standard-2 # yamllint disable affinity: podAntiAffinity: @@ -231,7 +151,7 @@ spec: - key: app.kubernetes.io/component operator: In values: - - zeebe-broker + - core topologyKey: kubernetes.io/hostname # yamllint enable volumeClaimTemplates: @@ -241,7 +161,6 @@ spec: {} spec: accessModes: [ReadWriteOnce] - storageClassName: ssd resources: requests: - storage: "48Gi" \ No newline at end of file + storage: "32Gi" \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden_camunda_platform_test.go b/charts/zeebe-benchmark/test/golden_camunda_platform_test.go index f1341b2..df59bdd 100644 --- a/charts/zeebe-benchmark/test/golden_camunda_platform_test.go +++ b/charts/zeebe-benchmark/test/golden_camunda_platform_test.go @@ -18,7 +18,7 @@ func TestGoldenCamundaPlatformServiceMonitorDefaults(t *testing.T) { chartPath, err := filepath.Abs("../") require.NoError(t, err) - templateNames := []string{"zeebe-service-monitor", "zeebe-gateway-service-monitor", "operate-service-monitor"} + templateNames := []string{"core-service-monitor"} for _, name := range templateNames { suite.Run(t, &golden.TemplateGoldenTest{ @@ -32,7 +32,7 @@ func TestGoldenCamundaPlatformServiceMonitorDefaults(t *testing.T) { } } -func TestGoldenCamundaPlatformZeebeDefaults(t *testing.T) { +func TestGoldenCamundaPlatformCoreDefaults(t *testing.T) { // Test which allows to verify also parent chart templates // This makes sure that properties are correctly set // OR configurations have been changed @@ -47,49 +47,7 @@ func TestGoldenCamundaPlatformZeebeDefaults(t *testing.T) { Release: "benchmark-test", Namespace: "benchmark-" + strings.ToLower(random.UniqueId()), GoldenFileName: "c8-zeebe-" + name, - Templates: []string{"charts/camunda-platform/templates/zeebe/" + name + ".yaml"}, - SetValues: map[string]string{"camunda-platform.operate.enabled": "true"}, - }) - } -} - -func TestGoldenCamundaPlatformZeebeGatewayDefaults(t *testing.T) { - // Test which allows to verify also parent chart templates - // This makes sure that properties are correctly set - // OR configurations have been changed - - chartPath, err := filepath.Abs("../") - require.NoError(t, err) - templateNames := []string{"service", "deployment", "configmap"} - - for _, name := range templateNames { - suite.Run(t, &golden.TemplateGoldenTest{ - ChartPath: chartPath, - Release: "benchmark-test", - Namespace: "benchmark-" + strings.ToLower(random.UniqueId()), - GoldenFileName: "c8-zeebe-gateway-" + name, - Templates: []string{"charts/camunda-platform/templates/zeebe-gateway/" + name + ".yaml"}, - SetValues: map[string]string{"camunda-platform.operate.enabled": "true"}, - }) - } -} - -func TestGoldenCamundaPlatformOperateDefaults(t *testing.T) { - // Test which allows to verify also parent chart templates - // This makes sure that properties are correctly set - // OR configurations have been changed - - chartPath, err := filepath.Abs("../") - require.NoError(t, err) - templateNames := []string{"deployment", "service", "configmap"} - - for _, name := range templateNames { - suite.Run(t, &golden.TemplateGoldenTest{ - ChartPath: chartPath, - Release: "benchmark-test", - Namespace: "benchmark-" + strings.ToLower(random.UniqueId()), - GoldenFileName: "operate-" + name, - Templates: []string{"charts/camunda-platform/templates/operate/" + name + ".yaml"}, + Templates: []string{"charts/camunda-platform/templates/core/" + name + ".yaml"}, SetValues: map[string]string{"camunda-platform.operate.enabled": "true"}, }) } From e67eb5051c76a30e4102a43309f220aef1a33f96 Mon Sep 17 00:00:00 2001 From: rodrigolourencolopes Date: Thu, 21 Nov 2024 15:05:25 +0100 Subject: [PATCH 4/5] fix: fix maintainer name. --- charts/zeebe-benchmark/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/zeebe-benchmark/Chart.yaml b/charts/zeebe-benchmark/Chart.yaml index 1483c76..e69320f 100644 --- a/charts/zeebe-benchmark/Chart.yaml +++ b/charts/zeebe-benchmark/Chart.yaml @@ -17,7 +17,7 @@ dependencies: version: 6.4.0 condition: "prometheus-elasticsearch-exporter.enabled" maintainers: - - name: Zelldon + - name: ChrisKujawa email: christopher.zell@camunda.com annotations: artifacthub.io/links: | From 25a8e051b22e641a0ff41179b2d398816422f525 Mon Sep 17 00:00:00 2001 From: rodrigolourencolopes Date: Thu, 21 Nov 2024 15:21:24 +0100 Subject: [PATCH 5/5] refactor: remove unused, and rename appropriately golden files. --- ...den.yaml => c8-core-configmap.golden.yaml} | 0 ...olden.yaml => c8-core-service.golden.yaml} | 0 ...n.yaml => c8-core-statefulset.golden.yaml} | 0 .../c8-operate-service-monitor.golden.yaml | 23 -- .../c8-zeebe-gateway-configmap.golden.yaml | 40 ---- .../c8-zeebe-gateway-deployment.golden.yaml | 199 ------------------ .../c8-zeebe-gateway-service.golden.yaml | 34 --- .../c8-zeebe-service-monitor.golden.yaml | 23 -- .../test/golden/operate-configmap.golden.yaml | 66 ------ .../golden/operate-deployment.golden.yaml | 171 --------------- .../test/golden/operate-service.golden.yaml | 33 --- .../test/golden_camunda_platform_test.go | 2 +- 12 files changed, 1 insertion(+), 590 deletions(-) rename charts/zeebe-benchmark/test/golden/{c8-zeebe-configmap.golden.yaml => c8-core-configmap.golden.yaml} (100%) rename charts/zeebe-benchmark/test/golden/{c8-zeebe-service.golden.yaml => c8-core-service.golden.yaml} (100%) rename charts/zeebe-benchmark/test/golden/{c8-zeebe-statefulset.golden.yaml => c8-core-statefulset.golden.yaml} (100%) delete mode 100644 charts/zeebe-benchmark/test/golden/c8-operate-service-monitor.golden.yaml delete mode 100644 charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-configmap.golden.yaml delete mode 100644 charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-deployment.golden.yaml delete mode 100644 charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-service.golden.yaml delete mode 100644 charts/zeebe-benchmark/test/golden/c8-zeebe-service-monitor.golden.yaml delete mode 100644 charts/zeebe-benchmark/test/golden/operate-configmap.golden.yaml delete mode 100644 charts/zeebe-benchmark/test/golden/operate-deployment.golden.yaml delete mode 100644 charts/zeebe-benchmark/test/golden/operate-service.golden.yaml diff --git a/charts/zeebe-benchmark/test/golden/c8-zeebe-configmap.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-core-configmap.golden.yaml similarity index 100% rename from charts/zeebe-benchmark/test/golden/c8-zeebe-configmap.golden.yaml rename to charts/zeebe-benchmark/test/golden/c8-core-configmap.golden.yaml diff --git a/charts/zeebe-benchmark/test/golden/c8-zeebe-service.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-core-service.golden.yaml similarity index 100% rename from charts/zeebe-benchmark/test/golden/c8-zeebe-service.golden.yaml rename to charts/zeebe-benchmark/test/golden/c8-core-service.golden.yaml diff --git a/charts/zeebe-benchmark/test/golden/c8-zeebe-statefulset.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-core-statefulset.golden.yaml similarity index 100% rename from charts/zeebe-benchmark/test/golden/c8-zeebe-statefulset.golden.yaml rename to charts/zeebe-benchmark/test/golden/c8-core-statefulset.golden.yaml diff --git a/charts/zeebe-benchmark/test/golden/c8-operate-service-monitor.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-operate-service-monitor.golden.yaml deleted file mode 100644 index dba9299..0000000 --- a/charts/zeebe-benchmark/test/golden/c8-operate-service-monitor.golden.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: zeebe-benchmark/charts/camunda-platform/templates/service-monitor/operate-service-monitor.yaml -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: benchmark-test-camunda-platform-operate - labels: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - release: monitoring -spec: - selector: - matchLabels: - app: camunda-platform - app.kubernetes.io/component: operate - endpoints: - - honorLabels: true - path: /actuator/prometheus - port: management - interval: 30s \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-configmap.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-configmap.golden.yaml deleted file mode 100644 index 8ef9b3f..0000000 --- a/charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-configmap.golden.yaml +++ /dev/null @@ -1,40 +0,0 @@ ---- -# Source: zeebe-benchmark/charts/camunda-platform/templates/zeebe-gateway/configmap.yaml -kind: ConfigMap -metadata: - name: benchmark-test-zeebe-gateway-configuration - labels: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: zeebe-gateway - app.kubernetes.io/version: "SNAPSHOT" -apiVersion: v1 -data: - gateway-log4j2.xml: | - application.yaml: | - - # Camunda Database configuration - camunda.database: - type: elasticsearch - # Cluster name - clusterName: elasticsearch - # Elasticsearch full url - url: "http://benchmark-test-elasticsearch:9200" - - server: - address: "0.0.0.0" - port: "8080" - zeebe: - gateway: - monitoring: - host: 0.0.0.0 - port: "9600" - cluster: - clusterName: benchmark-test-zeebe - port: "26502" - network: - host: 0.0.0.0 - port: "26500" \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-deployment.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-deployment.golden.yaml deleted file mode 100644 index 4a18f94..0000000 --- a/charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-deployment.golden.yaml +++ /dev/null @@ -1,199 +0,0 @@ ---- -# Source: zeebe-benchmark/charts/camunda-platform/templates/zeebe-gateway/deployment.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: benchmark-test-zeebe-gateway - labels: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: zeebe-gateway - app.kubernetes.io/version: "SNAPSHOT" - annotations: - {} -spec: - strategy: - type: RollingUpdate - replicas: 2 - selector: - matchLabels: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: zeebe-gateway - template: - metadata: - labels: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: zeebe-gateway - app.kubernetes.io/version: "SNAPSHOT" - annotations: - checksum/config: 5f4fd8148098be186ae2347fc681e161a687eea366b1dd43133b9dd7036fdcf4 - spec: - imagePullSecrets: - [] - initContainers: - - command: - - wget - - https://github.com/pyroscope-io/pyroscope-java/releases/latest/download/pyroscope.jar - - -O - - /pyroscope/pyroscope.jar - image: alpine - name: pyroscope - securityContext: - allowPrivilegeEscalation: false - privileged: false - readOnlyRootFilesystem: true - runAsUser: 1000 - volumeMounts: - - mountPath: /pyroscope - name: pyroscope - containers: - - name: zeebe-gateway - image: camunda/zeebe:SNAPSHOT - imagePullPolicy: Always - ports: - - containerPort: 9600 - name: http - - containerPort: 26500 - name: gateway - - containerPort: 26502 - name: internal - - containerPort: 8080 - name: rest - env: - - name: CAMUNDA_LICENSE_KEY - valueFrom: - secretKeyRef: - name: benchmark-test-camunda-platform-license - key: CAMUNDA_LICENSE_KEY - - name: ZEEBE_STANDALONE_GATEWAY - value: "true" - - name: ZEEBE_GATEWAY_CLUSTER_MEMBERID - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: ZEEBE_LOG_LEVEL - value: "debug" - - name: JAVA_TOOL_OPTIONS - value: "-XX:+ExitOnOutOfMemoryError" - - name: ZEEBE_GATEWAY_CLUSTER_INITIALCONTACTPOINTS - value: benchmark-test-zeebe:26502 - - name: ZEEBE_GATEWAY_CLUSTER_HOST - valueFrom: - fieldRef: - fieldPath: status.podIP - - name: ZEEBE_LOG_APPENDER - value: Stackdriver - - name: ZEEBE_LOG_STACKDRIVER_SERVICENAME - value: zeebe - - name: ZEEBE_LOG_STACKDRIVER_SERVICEVERSION - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: ATOMIX_LOG_LEVEL - value: INFO - - name: ZEEBE_LOG_LEVEL - value: DEBUG - - name: PYROSCOPE_SERVER_ADDRESS - value: http://pyroscope.pyroscope.svc.cluster.local:4040 - - name: PYROSCOPE_APPLICATION_NAME - value: io.camunda.zeebe.gateway - - name: PYROSCOPE_LOG_LEVEL - value: debug - - name: PYROSCOPE_FORMAT - value: jfr - - name: PYROSCOPE_PROFILER_EVENT - value: cpu - - name: PYROSCOPE_PROFILER_ALLOC - value: "0" - - name: PYROSCOPE_PROFILER_LOCK - value: "0" - - name: PYROSCOPE_LABELS - value: namespace=$(K8S_NAMESPACE), pod=$(K8S_NAME) - - name: SPRING_CONFIG_ADDITIONALLOCATION - value: /usr/local/zeebe/config/benchmark-config.yaml - - name: JAVA_OPTS - valueFrom: - configMapKeyRef: - key: java-opts - name: zeebe-config - optional: true - envFrom: - volumeMounts: - - mountPath: /tmp - name: tmp - - name: config - mountPath: /usr/local/zeebe/config/application.yaml - subPath: application.yaml - - - mountPath: /pyroscope - name: pyroscope - - mountPath: /usr/local/zeebe/config/benchmark-config.yaml - name: benchmark-config - subPath: benchmark-config.yaml - securityContext: - allowPrivilegeEscalation: false - privileged: false - readOnlyRootFilesystem: true - runAsNonRoot: true - runAsUser: 1001 - seccompProfile: - type: RuntimeDefault - readinessProbe: - httpGet: - path: /actuator/health/readiness - scheme: HTTP - port: 9600 - initialDelaySeconds: 30 - periodSeconds: 30 - successThreshold: 1 - failureThreshold: 5 - timeoutSeconds: 1 - resources: - limits: - cpu: 450m - memory: 1Gi - requests: - cpu: 450m - memory: 1Gi - volumes: - - name: tmp - emptyDir: {} - - name: config - configMap: - name: benchmark-test-zeebe-gateway-configuration - defaultMode: 484 - - configMap: - defaultMode: 492 - name: benchmark-config - name: benchmark-config - - emptyDir: {} - name: pyroscope - serviceAccountName: benchmark-test-zeebe-gateway - securityContext: - fsGroup: 1001 - runAsNonRoot: true - seccompProfile: - type: RuntimeDefault - # yamllint disable - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app.kubernetes.io/component - operator: In - values: - - zeebe-gateway - topologyKey: kubernetes.io/hostname - # yamllint enable \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-service.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-service.golden.yaml deleted file mode 100644 index d9e1a7f..0000000 --- a/charts/zeebe-benchmark/test/golden/c8-zeebe-gateway-service.golden.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -# Source: zeebe-benchmark/charts/camunda-platform/templates/zeebe-gateway/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: benchmark-test-zeebe-gateway - labels: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: zeebe-gateway - app.kubernetes.io/version: "SNAPSHOT" - annotations: -spec: - type: ClusterIP - selector: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: zeebe-gateway - ports: - - port: 9600 - protocol: TCP - name: http - - port: 26500 - protocol: TCP - name: gateway - - port: 8080 - protocol: TCP - name: rest \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden/c8-zeebe-service-monitor.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-zeebe-service-monitor.golden.yaml deleted file mode 100644 index 5b3aade..0000000 --- a/charts/zeebe-benchmark/test/golden/c8-zeebe-service-monitor.golden.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Source: zeebe-benchmark/charts/camunda-platform/templates/service-monitor/zeebe-service-monitor.yaml -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: benchmark-test-camunda-platform-zeebe - labels: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - release: monitoring -spec: - selector: - matchLabels: - app: camunda-platform - app.kubernetes.io/component: zeebe-broker - endpoints: - - honorLabels: true - path: /actuator/prometheus - port: http - interval: 30s \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden/operate-configmap.golden.yaml b/charts/zeebe-benchmark/test/golden/operate-configmap.golden.yaml deleted file mode 100644 index 38c3905..0000000 --- a/charts/zeebe-benchmark/test/golden/operate-configmap.golden.yaml +++ /dev/null @@ -1,66 +0,0 @@ ---- -# Source: zeebe-benchmark/charts/camunda-platform/templates/operate/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: benchmark-test-operate-configuration - labels: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: operate - app.kubernetes.io/version: "SNAPSHOT" -data: - application.yaml: | - spring: - profiles: - active: "auth" - - # Camunda Database configuration - camunda.database: - type: elasticsearch - # Cluster name - clusterName: elasticsearch - # Elasticsearch full url - url: "http://benchmark-test-elasticsearch:9200" - - # Operate configuration file - camunda.operate: - - # ELS instance to store Operate data - elasticsearch: - # Cluster name - clusterName: elasticsearch - # Host - host: benchmark-test-elasticsearch - # Transport port - port: 9200 - # Elasticsearch full url - url: "http://benchmark-test-elasticsearch:9200" - # ELS instance to export Zeebe data to - zeebeElasticsearch: - # Cluster name - clusterName: elasticsearch - # Host - host: benchmark-test-elasticsearch - # Transport port - port: 9200 - # Index prefix, configured in Zeebe Elasticsearch exporter - prefix: zeebe-record - # Elasticsearch full url - url: "http://benchmark-test-elasticsearch:9200" - # Zeebe instance - zeebe: - # Gateway address - gatewayAddress: "benchmark-test-zeebe-gateway:26500" - archiver: - ilmEnabled: true - ilmMinAgeForDeleteArchivedIndices: 30m - logging: - level: - ROOT: INFO - io.camunda.operate: INFO - #Spring Boot Actuator endpoints to be exposed - management.endpoints.web.exposure.include: health,info,conditions,configprops,prometheus,loggers,usage-metrics,backups \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden/operate-deployment.golden.yaml b/charts/zeebe-benchmark/test/golden/operate-deployment.golden.yaml deleted file mode 100644 index 051c9b1..0000000 --- a/charts/zeebe-benchmark/test/golden/operate-deployment.golden.yaml +++ /dev/null @@ -1,171 +0,0 @@ ---- -# Source: zeebe-benchmark/charts/camunda-platform/templates/operate/deployment.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: benchmark-test-operate - labels: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: operate - app.kubernetes.io/version: "SNAPSHOT" - annotations: - {} -spec: - strategy: - type: Recreate - replicas: 1 - selector: - matchLabels: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: operate - template: - metadata: - labels: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: operate - app.kubernetes.io/version: "SNAPSHOT" - annotations: - checksum/config: ceb62825f95f54158a4e89ebd5a4e5d6fc000b670795273e68a685be017246b6 - spec: - imagePullSecrets: - [] - initContainers: - - name: migration - image: camunda/operate:SNAPSHOT - command: ['/bin/sh', '/usr/local/operate/bin/migrate'] - securityContext: - allowPrivilegeEscalation: false - privileged: false - readOnlyRootFilesystem: true - runAsNonRoot: true - runAsUser: 1001 - seccompProfile: - type: RuntimeDefault - env: - resources: - limits: - cpu: 2000m - memory: 2Gi - requests: - cpu: 600m - memory: 1Gi - volumeMounts: - - name: config - mountPath: /usr/local/operate/config/application.yaml - subPath: application.yaml - - name: tmp - mountPath: /tmp - - name: camunda - mountPath: /camunda - containers: - - name: operate - image: camunda/operate:SNAPSHOT - imagePullPolicy: Always - securityContext: - allowPrivilegeEscalation: false - privileged: false - readOnlyRootFilesystem: true - runAsNonRoot: true - runAsUser: 1001 - seccompProfile: - type: RuntimeDefault - env: - - name: CAMUNDA_LICENSE_KEY - valueFrom: - secretKeyRef: - name: benchmark-test-camunda-platform-license - key: CAMUNDA_LICENSE_KEY - - name: ZEEBE_CLIENT_CONFIG_PATH - value: /tmp/zeebe_auth_cache - # the host name of Operate that is used when connecting with the Zeebe cluster - # via atomix-cluster (SWIM) - - name: ZEEBE_GATEWAY_CLUSTER_HOST - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - # the unique member id (in this case the pod name) that is used as identifier inside the SWIM cluster - - name: ZEEBE_GATEWAY_CLUSTER_MEMBERID - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.name - # the name of the atomix cluster (SWIM) to connect to (must be the same as for the Zeebe cluster) - - name: ZEEBE_GATEWAY_CLUSTER_CLUSTERNAME - value: benchmark-test-zeebe - # the port the service expects requests/messages from the atomix cluster (must be exposed internally) - - name: ZEEBE_GATEWAY_CLUSTER_PORT - value: "26502" - # the initial contact point to join the SWIM (atomix) cluster - - name: ZEEBE_GATEWAY_CLUSTER_INITIALCONTACTPOINTS - value: benchmark-test-zeebe:26502 - - name: OPERATE_LOG_APPENDER - value: Stackdriver - - name: OPERATE_LOG_STACKDRIVER_SERVICENAME - value: operate - - name: OPERATE_LOG_STACKDRIVER_SERVICEVERSION - valueFrom: - fieldRef: - fieldPath: metadata.namespace - envFrom: - resources: - limits: - cpu: 2000m - memory: 2Gi - requests: - cpu: 600m - memory: 400Mi - ports: - - containerPort: 8080 - name: http - protocol: TCP - - containerPort: 9600 - name: management - - containerPort: 26502 - name: internal - protocol: TCP - readinessProbe: - httpGet: - path: /actuator/health/readiness - scheme: HTTP - port: management - initialDelaySeconds: 30 - periodSeconds: 30 - successThreshold: 1 - failureThreshold: 5 - timeoutSeconds: 1 - volumeMounts: - - name: config - mountPath: /usr/local/operate/config/application.yaml - subPath: application.yaml - - name: tmp - mountPath: /tmp - - name: camunda - mountPath: /camunda - volumes: - - name: config - configMap: - name: benchmark-test-operate-configuration - defaultMode: 484 - - name: tmp - emptyDir: {} - - name: camunda - emptyDir: {} - serviceAccountName: benchmark-test-operate - securityContext: - fsGroup: 1001 - runAsNonRoot: true - seccompProfile: - type: RuntimeDefault \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden/operate-service.golden.yaml b/charts/zeebe-benchmark/test/golden/operate-service.golden.yaml deleted file mode 100644 index 803472d..0000000 --- a/charts/zeebe-benchmark/test/golden/operate-service.golden.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# Source: zeebe-benchmark/charts/camunda-platform/templates/operate/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: benchmark-test-operate - labels: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: operate - app.kubernetes.io/version: "SNAPSHOT" - annotations: -spec: - type: ClusterIP - ports: - - port: 80 - name: http - targetPort: 8080 - protocol: TCP - - port: 9600 - name: management - targetPort: 9600 - protocol: TCP - selector: - app: camunda-platform - app.kubernetes.io/name: camunda-platform - app.kubernetes.io/instance: benchmark-test - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/part-of: camunda-platform - app.kubernetes.io/component: operate \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden_camunda_platform_test.go b/charts/zeebe-benchmark/test/golden_camunda_platform_test.go index df59bdd..f2aef1c 100644 --- a/charts/zeebe-benchmark/test/golden_camunda_platform_test.go +++ b/charts/zeebe-benchmark/test/golden_camunda_platform_test.go @@ -46,7 +46,7 @@ func TestGoldenCamundaPlatformCoreDefaults(t *testing.T) { ChartPath: chartPath, Release: "benchmark-test", Namespace: "benchmark-" + strings.ToLower(random.UniqueId()), - GoldenFileName: "c8-zeebe-" + name, + GoldenFileName: "c8-core-" + name, Templates: []string{"charts/camunda-platform/templates/core/" + name + ".yaml"}, SetValues: map[string]string{"camunda-platform.operate.enabled": "true"}, })