Skip to content

Commit

Permalink
Remove environment specific configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
SoerenHenning committed Feb 1, 2024
1 parent 84cd2f6 commit 1a94d1c
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 29 deletions.
6 changes: 3 additions & 3 deletions kubernetes/shuffle-flink/jobmanager-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
terminationGracePeriodSeconds: 0
containers:
- name: jobmanager
image: shufflebench/shuffle-flink:latest # Adjust image to yours
image: ghcr.io/dynatrace-research/shufflebench/shuffle-flink:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
value: "theodolite-kafka-kafka-bootstrap:9092"
Expand All @@ -29,6 +29,8 @@ spec:
value: "0.2"
- name: MATCHER_ZIPF_S
value: "0.0"
- name: CONSUMER_INIT_COUNT_RANDOM
value: "true"
resources:
limits:
memory: 2Gi
Expand Down Expand Up @@ -62,5 +64,3 @@ spec:
path: flink-conf.yaml
- key: log4j-console.properties
path: log4j-console.properties
nodeSelector:
type: sut
4 changes: 1 addition & 3 deletions kubernetes/shuffle-flink/taskmanager-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
terminationGracePeriodSeconds: 0
containers:
- name: taskmanager
image: shufflebench/shuffle-flink:latest # Adjust image to yours
image: ghcr.io/dynatrace-research/shufflebench/shuffle-flink:latest
resources:
limits:
memory: 4Gi
Expand Down Expand Up @@ -49,5 +49,3 @@ spec:
path: flink-conf.yaml
- key: log4j-console.properties
path: log4j-console.properties
nodeSelector:
type: sut
6 changes: 3 additions & 3 deletions kubernetes/shuffle-hzcast/shuffle-hzcast-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
terminationGracePeriodSeconds: 0
containers:
- name: shuffle-hzcast
image: shufflebench/shuffle-hzcast:latest # Adjust image to yours
image: ghcr.io/dynatrace-research/shufflebench/shuffle-hzcast:latest
ports:
- containerPort: 5701
env:
Expand All @@ -33,6 +33,8 @@ spec:
value: "0.2"
- name: MATCHER_ZIPF_S
value: "0.0"
- name: CONSUMER_INIT_COUNT_RANDOM
value: "true"
#- name: HAZELCAST_JET_JOB_PROCESSINGGUARANTEE
#value: "NONE"
#value: "AT_LEAST_ONCE"
Expand Down Expand Up @@ -70,5 +72,3 @@ spec:
- name: jmx-config
configMap:
name: shuffle-hzcast-jmx-configmap
nodeSelector:
type: sut
6 changes: 3 additions & 3 deletions kubernetes/shuffle-kstreams/shuffle-kstreams-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
terminationGracePeriodSeconds: 0
containers:
- name: shuffle-kstreams
image: shufflebench/shuffle-kstreams:latest # Adjust image to yours
image: ghcr.io/dynatrace-research/shufflebench/shuffle-kstreams:latest
ports:
- containerPort: 5555
name: jmx
Expand All @@ -28,6 +28,8 @@ spec:
value: "0.2"
- name: MATCHER_ZIPF_S
value: "0.0"
- name: CONSUMER_INIT_COUNT_RANDOM
value: "true"
- name: "KAFKASTREAMS__COMMIT_INTERVAL_MS__"
value: "5000"
# - name: "KAFKASTREAMS__MAX_POLL_RECORDS__"
Expand Down Expand Up @@ -63,5 +65,3 @@ spec:
- name: jmx-config
configMap:
name: shuffle-kstreams-jmx-configmap
nodeSelector:
type: sut
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ spec:
terminationGracePeriodSeconds: 0
containers:
- name: shuffle-latency-exporter
image: shufflebench/latency-exporter:latest # Adjust image to yours
image: ghcr.io/dynatrace-research/shufflebench/latency-exporter:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
value: "theodolite-kafka-kafka-bootstrap:9092"
nodeSelector:
type: infra
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
terminationGracePeriodSeconds: 0
containers:
- name: shuffle-load-generator
image: shufflebench/load-generator:latest # Adjust image to yours
image: ghcr.io/dynatrace-research/shufflebench/load-generator:latest
env:
- name: SEED_STRING
valueFrom:
Expand All @@ -30,5 +30,3 @@ spec:
value: "250000"
- name: "RECORD_SIZE_BYTES"
value: "1024"
nodeSelector:
type: infra
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: spark-master
image: shufflebench/shuffle-spark:latest # Adjust image to yours
image: ghcr.io/dynatrace-research/shufflebench/shuffle-spark:latest
command: ["/spark-master"]
ports:
- containerPort: 7077
Expand All @@ -24,16 +24,18 @@ spec:
memory: 1Gi
cpu: 300m
- name: spark-submit
image: shufflebench/shuffle-spark:latest # Adjust image to yours
image: ghcr.io/dynatrace-research/shufflebench/shuffle-spark:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
value: "theodolite-kafka-kafka-bootstrap:9092"
- name: MATCHER_ZIPF_NUM_RULES
value: "10000"
value: "1000000"
- name: MATCHER_ZIPF_TOTAL_SELECTIVITY
value: "0.2"
- name: MATCHER_ZIPF_S
value: "0.0"
- name: CONSUMER_INIT_COUNT_RANDOM
value: "true"
# - name: SPARK_MAX_OFFSETS_PER_TRIGGER
# value: "10000000"
- name: SPARK_EXECUTOR_MEMORY
Expand Down Expand Up @@ -66,8 +68,11 @@ spec:
volumeMounts:
- name: shared-data
mountPath: /tmp/spark/ # to store the checkpoints
- name: sparkfilemonitor
image: shufflebench/shuffle-spark:spark-file-monitor # Adjust image to yours
- name: offset-committer
image: ghcr.io/dynatrace-research/shufflebench/shuffle-spark-offset-committer:latest
env:
- name: KAFKA_BOOTSTRAP_SERVERS
value: "theodolite-kafka-kafka-bootstrap:9092"
resources:
limits:
memory: "256Mi"
Expand All @@ -78,5 +83,3 @@ spec:
volumes:
- name: shared-data
emptyDir: {}
nodeSelector:
type: sut
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ spec:
spec:
containers:
- name: spark-worker
image: shuffle-spark:latest # Adjust image to yours
imagePullPolicy: Always
#image: shuffle-spark:latest # Adjust image to yours
image: shuffle-spark:latest
imagePullPolicy: Never
command: ["/spark-worker"]
volumeMounts:
- name: shared-data
Expand All @@ -29,5 +30,3 @@ spec:
volumes:
- name: shared-data
emptyDir: {}
nodeSelector:
type: sut

0 comments on commit 1a94d1c

Please sign in to comment.