From 9d1cdf70020f5d57c4be4a0120bfb88f2d8ecdc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <post@soeren-henning.de>
Date: Wed, 9 Sep 2020 14:03:07 +0200
Subject: [PATCH] Add nodeSelectors for all resources
---
execution/infrastructure/grafana/values.yaml | 5 ++++-
execution/infrastructure/kafka-lag-exporter/values.yaml | 3 +++
execution/infrastructure/kafka/kafka-client.yaml | 4 +++-
execution/infrastructure/kafka/values.yaml | 6 ++++++
execution/infrastructure/prometheus/helm-values.yaml | 2 ++
execution/infrastructure/prometheus/prometheus.yaml | 5 ++++-
execution/uc1-application/aggregation-deployment.yaml | 4 +++-
execution/uc1-workload-generator/deployment.yaml | 3 ++-
execution/uc2-application/aggregation-deployment.yaml | 4 +++-
execution/uc2-workload-generator/deployment.yaml | 3 ++-
execution/uc3-application/aggregation-deployment.yaml | 4 +++-
execution/uc3-workload-generator/deployment.yaml | 3 ++-
execution/uc4-application/aggregation-deployment.yaml | 4 +++-
execution/uc4-workload-generator/deployment.yaml | 3 ++-
14 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/execution/infrastructure/grafana/values.yaml b/execution/infrastructure/grafana/values.yaml
index 211a72a61..ab5ca4e19 100644
--- a/execution/infrastructure/grafana/values.yaml
+++ b/execution/infrastructure/grafana/values.yaml
@@ -51,4 +51,7 @@ sidecar:
service:
nodePort: 31199
- type: NodePort
\ No newline at end of file
+ type: NodePort
+
+nodeSelector:
+ env: dev
diff --git a/execution/infrastructure/kafka-lag-exporter/values.yaml b/execution/infrastructure/kafka-lag-exporter/values.yaml
index b83a91128..a18f8b134 100644
--- a/execution/infrastructure/kafka-lag-exporter/values.yaml
+++ b/execution/infrastructure/kafka-lag-exporter/values.yaml
@@ -1,3 +1,6 @@
+nodeSelector:
+ env: dev
+
clusters:
- name: "my-confluent-cp-kafka"
bootstrapBrokers: "my-confluent-cp-kafka:9092"
diff --git a/execution/infrastructure/kafka/kafka-client.yaml b/execution/infrastructure/kafka/kafka-client.yaml
index 4c7d3ed23..371fb31c2 100644
--- a/execution/infrastructure/kafka/kafka-client.yaml
+++ b/execution/infrastructure/kafka/kafka-client.yaml
@@ -9,4 +9,6 @@ spec:
command:
- sh
- -c
- - "exec tail -f /dev/null"
\ No newline at end of file
+ - "exec tail -f /dev/null"
+ nodeSelector:
+ env: dev
\ No newline at end of file
diff --git a/execution/infrastructure/kafka/values.yaml b/execution/infrastructure/kafka/values.yaml
index 51dcb09d5..b05ad5500 100644
--- a/execution/infrastructure/kafka/values.yaml
+++ b/execution/infrastructure/kafka/values.yaml
@@ -22,6 +22,8 @@ cp-zookeeper:
# requests:
# cpu: 100m
# memory: 128Mi
+ nodeSelector:
+ env: dev
## ------------------------------------------------------
## Kafka
@@ -47,6 +49,8 @@ cp-kafka:
# requests:
# cpu: 100m
# memory: 128Mi
+ nodeSelector:
+ env: dev
configurationOverrides:
#"offsets.topic.replication.factor": "3"
"message.max.bytes": "134217728" # 128 MB
@@ -78,6 +82,8 @@ cp-schema-registry:
# requests:
# cpu: 100m
# memory: 128Mi
+ nodeSelector:
+ env: dev
cp-kafka-rest:
enabled: false
diff --git a/execution/infrastructure/prometheus/helm-values.yaml b/execution/infrastructure/prometheus/helm-values.yaml
index bf503fe48..f6c319806 100644
--- a/execution/infrastructure/prometheus/helm-values.yaml
+++ b/execution/infrastructure/prometheus/helm-values.yaml
@@ -36,6 +36,8 @@ nodeExporter:
prometheusOperator:
enabled: true
+ nodeSelector:
+ env: dev
prometheus:
enabled: false
diff --git a/execution/infrastructure/prometheus/prometheus.yaml b/execution/infrastructure/prometheus/prometheus.yaml
index 2cec39877..e14ebd4dd 100644
--- a/execution/infrastructure/prometheus/prometheus.yaml
+++ b/execution/infrastructure/prometheus/prometheus.yaml
@@ -11,5 +11,8 @@ spec:
resources:
requests:
memory: 400Mi
+ nodeSelector:
+ env: dev
#scrapeInterval: 1s
- enableAdminAPI: true
\ No newline at end of file
+ enableAdminAPI: true
+
\ No newline at end of file
diff --git a/execution/uc1-application/aggregation-deployment.yaml b/execution/uc1-application/aggregation-deployment.yaml
index aa9d26559..60e827110 100644
--- a/execution/uc1-application/aggregation-deployment.yaml
+++ b/execution/uc1-application/aggregation-deployment.yaml
@@ -50,4 +50,6 @@ spec:
volumes:
- name: jmx-config
configMap:
- name: aggregation-jmx-configmap
\ No newline at end of file
+ name: aggregation-jmx-configmap
+ nodeSelector:
+ env: dev
diff --git a/execution/uc1-workload-generator/deployment.yaml b/execution/uc1-workload-generator/deployment.yaml
index f1bdfeb0e..d1018a4f4 100644
--- a/execution/uc1-workload-generator/deployment.yaml
+++ b/execution/uc1-workload-generator/deployment.yaml
@@ -28,4 +28,5 @@ spec:
fieldPath: metadata.name
- name: INSTANCES
value: "{{INSTANCES}}"
-
\ No newline at end of file
+ nodeSelector:
+ env: dev
diff --git a/execution/uc2-application/aggregation-deployment.yaml b/execution/uc2-application/aggregation-deployment.yaml
index c18d9a20a..a5d7b0c83 100644
--- a/execution/uc2-application/aggregation-deployment.yaml
+++ b/execution/uc2-application/aggregation-deployment.yaml
@@ -50,4 +50,6 @@ spec:
volumes:
- name: jmx-config
configMap:
- name: aggregation-jmx-configmap
\ No newline at end of file
+ name: aggregation-jmx-configmap
+ nodeSelector:
+ env: dev
diff --git a/execution/uc2-workload-generator/deployment.yaml b/execution/uc2-workload-generator/deployment.yaml
index c4a7ca606..ddea819a4 100644
--- a/execution/uc2-workload-generator/deployment.yaml
+++ b/execution/uc2-workload-generator/deployment.yaml
@@ -25,4 +25,5 @@ spec:
value: "4"
- name: NUM_NESTED_GROUPS
value: "{{NUM_NESTED_GROUPS}}"
-
\ No newline at end of file
+ nodeSelector:
+ env: dev
diff --git a/execution/uc3-application/aggregation-deployment.yaml b/execution/uc3-application/aggregation-deployment.yaml
index df470790f..326c586fb 100644
--- a/execution/uc3-application/aggregation-deployment.yaml
+++ b/execution/uc3-application/aggregation-deployment.yaml
@@ -52,4 +52,6 @@ spec:
volumes:
- name: jmx-config
configMap:
- name: aggregation-jmx-configmap
\ No newline at end of file
+ name: aggregation-jmx-configmap
+ nodeSelector:
+ env: dev
diff --git a/execution/uc3-workload-generator/deployment.yaml b/execution/uc3-workload-generator/deployment.yaml
index 5c8d0dde0..ad537d878 100644
--- a/execution/uc3-workload-generator/deployment.yaml
+++ b/execution/uc3-workload-generator/deployment.yaml
@@ -28,4 +28,5 @@ spec:
fieldPath: metadata.name
- name: INSTANCES
value: "{{INSTANCES}}"
-
\ No newline at end of file
+ nodeSelector:
+ env: dev
diff --git a/execution/uc4-application/aggregation-deployment.yaml b/execution/uc4-application/aggregation-deployment.yaml
index 7c2df7d75..aac952fc2 100644
--- a/execution/uc4-application/aggregation-deployment.yaml
+++ b/execution/uc4-application/aggregation-deployment.yaml
@@ -54,4 +54,6 @@ spec:
volumes:
- name: jmx-config
configMap:
- name: aggregation-jmx-configmap
\ No newline at end of file
+ name: aggregation-jmx-configmap
+ nodeSelector:
+ env: dev
diff --git a/execution/uc4-workload-generator/deployment.yaml b/execution/uc4-workload-generator/deployment.yaml
index 9f7ad9ae2..85b7f86b6 100644
--- a/execution/uc4-workload-generator/deployment.yaml
+++ b/execution/uc4-workload-generator/deployment.yaml
@@ -21,4 +21,5 @@ spec:
value: "my-confluent-cp-kafka:9092"
- name: NUM_SENSORS
value: "{{NUM_SENSORS}}"
-
\ No newline at end of file
+ nodeSelector:
+ env: dev
--
GitLab