From 1ca03f340db8c8d03c2517efce4e926b11d51fcc Mon Sep 17 00:00:00 2001 From: "remco.westerhoud" Date: Tue, 3 Dec 2024 13:40:55 +0100 Subject: [PATCH] test: update golden files I have autogenerated these because there were so many changes --- .../test/golden/c8-core-configmap.golden.yaml | 27 ++++- .../c8-core-service-monitor.golden.yaml | 2 +- .../golden/c8-core-statefulset.golden.yaml | 105 +++++++++++++++--- .../test/golden/publisher.golden.yaml | 2 +- .../test/golden/starter-extended.golden.yaml | 2 +- .../test/golden/starter.golden.yaml | 2 +- .../test/golden/timer.golden.yaml | 2 +- .../test/golden/workers.golden.yaml | 4 +- 8 files changed, 117 insertions(+), 29 deletions(-) diff --git a/charts/zeebe-benchmark/test/golden/c8-core-configmap.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-core-configmap.golden.yaml index 345597a..e67b8d6 100644 --- a/charts/zeebe-benchmark/test/golden/c8-core-configmap.golden.yaml +++ b/charts/zeebe-benchmark/test/golden/c8-core-configmap.golden.yaml @@ -16,14 +16,14 @@ 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 + echo "export ZEEBE_BROKER_CLUSTER_NODEID=${ZEEBE_BROKER_CLUSTER_NODEID}" exec /usr/local/camunda/bin/camunda application.yaml: | spring: profiles: - active: auth + active: "operate,tasklist,broker,auth" management: server: @@ -64,10 +64,13 @@ data: # zeebe.broker.cluster cluster: + # The value of "nodeId" is set via the "ZEEBE_BROKER_CLUSTER_NODEID" env var. + # As it depends on the Pod name, which cannot be templated at the installation time. + # nodeId: 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 + - benchmark-test-zeebe-0.${K8S_SERVICE_NAME}:26502 + - benchmark-test-zeebe-1.${K8S_SERVICE_NAME}:26502 + - benchmark-test-zeebe-2.${K8S_SERVICE_NAME}:26502 clusterSize: "3" replicationFactor: "3" partitionsCount: "3" @@ -93,12 +96,20 @@ data: url: "http://benchmark-test-elasticsearch:9200" index: prefix: "zeebe-record" + retention: + enabled: true + minimumAge: "10m" + policyName: "core-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: "core-record-retention-policy" createSchema: true camunda: @@ -147,6 +158,9 @@ data: zeebe: # Gateway address gatewayAddress: "benchmark-test-core:26500" + archiver: + ilmEnabled: true + ilmMinAgeForDeleteArchivedIndices: 10m # # Camunda Tasklist Configuration. @@ -188,5 +202,8 @@ data: # Gateway address gatewayAddress: benchmark-test-core:26500 restAddress: "http://benchmark-test-core:8080" + archiver: + ilmEnabled: true + ilmMinAgeForDeleteArchivedIndices: 10m log4j2.xml: | \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden/c8-core-service-monitor.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-core-service-monitor.golden.yaml index 3e75b1c..067a093 100644 --- a/charts/zeebe-benchmark/test/golden/c8-core-service-monitor.golden.yaml +++ b/charts/zeebe-benchmark/test/golden/c8-core-service-monitor.golden.yaml @@ -19,5 +19,5 @@ spec: endpoints: - honorLabels: true path: /actuator/prometheus - port: http + port: server interval: 30s \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden/c8-core-statefulset.golden.yaml b/charts/zeebe-benchmark/test/golden/c8-core-statefulset.golden.yaml index 3ff4c54..37d6866 100644 --- a/charts/zeebe-benchmark/test/golden/c8-core-statefulset.golden.yaml +++ b/charts/zeebe-benchmark/test/golden/c8-core-statefulset.golden.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - name: benchmark-test-core + name: benchmark-test-zeebe labels: app: camunda-platform app.kubernetes.io/name: camunda-platform @@ -38,22 +38,36 @@ spec: app.kubernetes.io/component: core app.kubernetes.io/version: "8.7.0-alpha1" annotations: - checksum/config: 0af99dfd865b4e2b8dcd8ea4defec2b16e5ffee41fa37cedc969f502c6d3824e + checksum/config: d57a555064a5668dd925af7c3d1e55397fcdb3734f9d3856ff80dcd918ef5ce5 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: core image: camunda/camunda:8.7.0-alpha1 imagePullPolicy: Always securityContext: - allowPrivilegeEscalation: false - privileged: false + allowPrivilegeEscalation: true + privileged: true readOnlyRootFilesystem: true runAsNonRoot: true - runAsUser: 1001 + runAsUser: 1000 seccompProfile: type: RuntimeDefault command: ["bash", "/usr/local/bin/startup.sh"] @@ -75,17 +89,58 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: VALUES_CAMUNDA_CORE_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: benchmark-test-core-identity-secret - key: core-secret - name: JAVA_TOOL_OPTIONS - value: "-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/usr/local/zeebe/data -XX:ErrorFile=/usr/local/zeebe/data/zeebe_error%p.log -XX:+ExitOnOutOfMemoryError" + value: "-XX:MaxRAMPercentage=25.0 -XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/usr/local/camunda/data -XX:ErrorFile=/usr/local/camunda/data/zeebe_error%p.log -Xlog:gc*:file=/usr/local/camunda/data/gc.log:time:filecount=7,filesize=8M" - 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/camunda/config/benchmark-config.yaml + - name: JAVA_OPTS + valueFrom: + configMapKeyRef: + key: java-opts + name: zeebe-config + optional: true + - name: SPRING_PROFILES_ACTIVE + value: auth,broker ports: - containerPort: 8080 name: http @@ -109,11 +164,11 @@ spec: timeoutSeconds: 1 resources: limits: - cpu: 960m - memory: 1920Mi + cpu: 1700m + memory: 4Gi requests: - cpu: 800m - memory: 1200Mi + cpu: 1350m + memory: 4Gi volumeMounts: - name: config mountPath: /usr/local/bin/startup.sh @@ -127,6 +182,12 @@ spec: - name: config mountPath: /usr/local/camunda/config/application.yaml subPath: application.yaml + + - mountPath: /usr/local/camunda/config/benchmark-config.yaml + name: benchmark-config + subPath: benchmark-config.yaml + - mountPath: /pyroscope + name: pyroscope volumes: - name: config configMap: @@ -136,12 +197,21 @@ spec: emptyDir: {} - name: tmp emptyDir: {} + + - configMap: + defaultMode: 492 + name: benchmark-config + name: benchmark-config + - emptyDir: {} + name: pyroscope 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: @@ -161,6 +231,7 @@ spec: {} spec: accessModes: [ReadWriteOnce] + storageClassName: ssd resources: requests: - storage: "32Gi" \ No newline at end of file + storage: "48Gi" \ No newline at end of file diff --git a/charts/zeebe-benchmark/test/golden/publisher.golden.yaml b/charts/zeebe-benchmark/test/golden/publisher.golden.yaml index eecfac0..96ddaa3 100644 --- a/charts/zeebe-benchmark/test/golden/publisher.golden.yaml +++ b/charts/zeebe-benchmark/test/golden/publisher.golden.yaml @@ -25,7 +25,7 @@ spec: - name: JDK_JAVA_OPTIONS value: >- -Dconfig.override_with_env_vars=true - -Dapp.brokerUrl=benchmark-test-zeebe-gateway:26500 + -Dapp.brokerUrl=benchmark-test-core:26500 -Dapp.starter.rate=25 -Dzeebe.client.requestTimeout=62000 -XX:+HeapDumpOnOutOfMemoryError diff --git a/charts/zeebe-benchmark/test/golden/starter-extended.golden.yaml b/charts/zeebe-benchmark/test/golden/starter-extended.golden.yaml index e164be3..36207e3 100644 --- a/charts/zeebe-benchmark/test/golden/starter-extended.golden.yaml +++ b/charts/zeebe-benchmark/test/golden/starter-extended.golden.yaml @@ -25,7 +25,7 @@ spec: - name: JDK_JAVA_OPTIONS value: >- -Dconfig.override_with_env_vars=true - -Dapp.brokerUrl=benchmark-test-zeebe-gateway:26500 + -Dapp.brokerUrl=benchmark-test-core:26500 -Dapp.starter.rate=150 -Dapp.starter.durationLimit=0 -Dzeebe.client.requestTimeout=62000 diff --git a/charts/zeebe-benchmark/test/golden/starter.golden.yaml b/charts/zeebe-benchmark/test/golden/starter.golden.yaml index 1b39b2c..c59ea99 100644 --- a/charts/zeebe-benchmark/test/golden/starter.golden.yaml +++ b/charts/zeebe-benchmark/test/golden/starter.golden.yaml @@ -25,7 +25,7 @@ spec: - name: JDK_JAVA_OPTIONS value: >- -Dconfig.override_with_env_vars=true - -Dapp.brokerUrl=benchmark-test-zeebe-gateway:26500 + -Dapp.brokerUrl=benchmark-test-core:26500 -Dapp.starter.rate=150 -Dapp.starter.durationLimit=0 -Dzeebe.client.requestTimeout=62000 diff --git a/charts/zeebe-benchmark/test/golden/timer.golden.yaml b/charts/zeebe-benchmark/test/golden/timer.golden.yaml index 74a5c11..d471e1e 100644 --- a/charts/zeebe-benchmark/test/golden/timer.golden.yaml +++ b/charts/zeebe-benchmark/test/golden/timer.golden.yaml @@ -25,7 +25,7 @@ spec: - name: JDK_JAVA_OPTIONS value: >- -Dconfig.override_with_env_vars=true - -Dapp.brokerUrl=benchmark-test-zeebe-gateway:26500 + -Dapp.brokerUrl=benchmark-test-core:26500 -Dapp.starter.rate=25 -Dzeebe.client.requestTimeout=62000 -XX:+HeapDumpOnOutOfMemoryError diff --git a/charts/zeebe-benchmark/test/golden/workers.golden.yaml b/charts/zeebe-benchmark/test/golden/workers.golden.yaml index 291b37e..0c1a116 100644 --- a/charts/zeebe-benchmark/test/golden/workers.golden.yaml +++ b/charts/zeebe-benchmark/test/golden/workers.golden.yaml @@ -25,7 +25,7 @@ spec: - name: JDK_JAVA_OPTIONS value: >- -Dconfig.override_with_env_vars=true - -Dapp.brokerUrl=benchmark-test-zeebe-gateway:26500 + -Dapp.brokerUrl=benchmark-test-core:26500 -Dzeebe.client.requestTimeout=62000 -Dapp.worker.capacity=60 -Dapp.worker.threads=10 @@ -74,7 +74,7 @@ spec: - name: JDK_JAVA_OPTIONS value: >- -Dconfig.override_with_env_vars=true - -Dapp.brokerUrl=benchmark-test-zeebe-gateway:26500 + -Dapp.brokerUrl=benchmark-test-core:26500 -Dzeebe.client.requestTimeout=62000 -Dapp.worker.capacity=10 -Dapp.worker.pollingDelay=1ms