Skip to content
Snippets Groups Projects
Commit e3b733a6 authored by Sören Henning's avatar Sören Henning
Browse files

Merge branch 'issue-30-add-doc-kube-res' into 'master' 

Recreate additional Kubernetes resources on each benchmark subexperiment

Closes #30

See merge request !16
parents e18006d3 4d25f4f1
No related branches found
No related tags found
1 merge request!16Recreate additional Kubernetes resources on each benchmark subexperiment
Pipeline #519 passed with warnings
Stage: build
    Stage: test
      Stage: check
        Hide whitespace changes
        Inline Side-by-side
        Showing
        with 30 additions and 42 deletions
        execution/run_uc1-new.sh
        + 8
        − 1
        View file @ e3b733a6
        ...@@ -34,7 +34,11 @@ echo "$WORKLOAD_GENERATOR_YAML" | kubectl apply -f - ...@@ -34,7 +34,11 @@ echo "$WORKLOAD_GENERATOR_YAML" | kubectl apply -f -
        # Start application # Start application
        REPLICAS=$INSTANCES REPLICAS=$INSTANCES
        #kubectl apply -f uc3-application/aggregation-deployment.yaml # When not using `sed` anymore, use `kubectl apply -f uc1-application`
        kubectl apply -f uc1-application/aggregation-service.yaml
        kubectl apply -f uc1-application/jmx-configmap.yaml
        kubectl apply -f uc1-application/service-monitor.yaml
        #kubectl apply -f uc1-application/aggregation-deployment.yaml
        APPLICATION_YAML=$(sed "s/{{CPU_LIMIT}}/$CPU_LIMIT/g; s/{{MEMORY_LIMIT}}/$MEMORY_LIMIT/g; s/{{KAFKA_STREAMS_COMMIT_INTERVAL_MS}}/$KAFKA_STREAMS_COMMIT_INTERVAL_MS/g" uc1-application/aggregation-deployment.yaml) APPLICATION_YAML=$(sed "s/{{CPU_LIMIT}}/$CPU_LIMIT/g; s/{{MEMORY_LIMIT}}/$MEMORY_LIMIT/g; s/{{KAFKA_STREAMS_COMMIT_INTERVAL_MS}}/$KAFKA_STREAMS_COMMIT_INTERVAL_MS/g" uc1-application/aggregation-deployment.yaml)
        echo "$APPLICATION_YAML" | kubectl apply -f - echo "$APPLICATION_YAML" | kubectl apply -f -
        kubectl scale deployment titan-ccp-aggregation --replicas=$REPLICAS kubectl scale deployment titan-ccp-aggregation --replicas=$REPLICAS
        ...@@ -52,6 +56,9 @@ deactivate ...@@ -52,6 +56,9 @@ deactivate
        #sed "s/{{INSTANCES}}/1/g" uc1-workload-generator/deployment.yaml | kubectl delete -f - #sed "s/{{INSTANCES}}/1/g" uc1-workload-generator/deployment.yaml | kubectl delete -f -
        #sed "s/{{NUM_SENSORS}}/$NUM_SENSORS/g; s/{{INSTANCES}}/$WL_INSTANCES/g" uc1-workload-generator/deployment.yaml | kubectl delete -f - #sed "s/{{NUM_SENSORS}}/$NUM_SENSORS/g; s/{{INSTANCES}}/$WL_INSTANCES/g" uc1-workload-generator/deployment.yaml | kubectl delete -f -
        echo "$WORKLOAD_GENERATOR_YAML" | kubectl delete -f - echo "$WORKLOAD_GENERATOR_YAML" | kubectl delete -f -
        kubectl delete -f uc1-application/aggregation-service.yaml
        kubectl delete -f uc1-application/jmx-configmap.yaml
        kubectl delete -f uc1-application/service-monitor.yaml
        #kubectl delete -f uc1-application/aggregation-deployment.yaml #kubectl delete -f uc1-application/aggregation-deployment.yaml
        echo "$APPLICATION_YAML" | kubectl delete -f - echo "$APPLICATION_YAML" | kubectl delete -f -
        ......
        execution/run_uc2-new.sh
        + 7
        − 0
        View file @ e3b733a6
        ...@@ -30,6 +30,10 @@ sed "s/{{NUM_NESTED_GROUPS}}/$NUM_NESTED_GROUPS/g" uc2-workload-generator/deploy ...@@ -30,6 +30,10 @@ sed "s/{{NUM_NESTED_GROUPS}}/$NUM_NESTED_GROUPS/g" uc2-workload-generator/deploy
        # Start application # Start application
        REPLICAS=$INSTANCES REPLICAS=$INSTANCES
        # When not using `sed` anymore, use `kubectl apply -f uc2-application`
        kubectl apply -f uc2-application/aggregation-service.yaml
        kubectl apply -f uc2-application/jmx-configmap.yaml
        kubectl apply -f uc2-application/service-monitor.yaml
        #kubectl apply -f uc2-application/aggregation-deployment.yaml #kubectl apply -f uc2-application/aggregation-deployment.yaml
        APPLICATION_YAML=$(sed "s/{{CPU_LIMIT}}/$CPU_LIMIT/g; s/{{MEMORY_LIMIT}}/$MEMORY_LIMIT/g; s/{{KAFKA_STREAMS_COMMIT_INTERVAL_MS}}/$KAFKA_STREAMS_COMMIT_INTERVAL_MS/g" uc2-application/aggregation-deployment.yaml) APPLICATION_YAML=$(sed "s/{{CPU_LIMIT}}/$CPU_LIMIT/g; s/{{MEMORY_LIMIT}}/$MEMORY_LIMIT/g; s/{{KAFKA_STREAMS_COMMIT_INTERVAL_MS}}/$KAFKA_STREAMS_COMMIT_INTERVAL_MS/g" uc2-application/aggregation-deployment.yaml)
        echo "$APPLICATION_YAML" | kubectl apply -f - echo "$APPLICATION_YAML" | kubectl apply -f -
        ...@@ -45,6 +49,9 @@ deactivate ...@@ -45,6 +49,9 @@ deactivate
        # Stop wl and app # Stop wl and app
        kubectl delete -f uc2-workload-generator/deployment.yaml kubectl delete -f uc2-workload-generator/deployment.yaml
        kubectl delete -f uc2-application/aggregation-service.yaml
        kubectl delete -f uc2-application/jmx-configmap.yaml
        kubectl delete -f uc2-application/service-monitor.yaml
        #kubectl delete -f uc2-application/aggregation-deployment.yaml #kubectl delete -f uc2-application/aggregation-deployment.yaml
        echo "$APPLICATION_YAML" | kubectl delete -f - echo "$APPLICATION_YAML" | kubectl delete -f -
        ......
        execution/run_uc3-new.sh
        + 8
        − 1
        View file @ e3b733a6
        ...@@ -34,6 +34,10 @@ echo "$WORKLOAD_GENERATOR_YAML" | kubectl apply -f - ...@@ -34,6 +34,10 @@ echo "$WORKLOAD_GENERATOR_YAML" | kubectl apply -f -
        # Start application # Start application
        REPLICAS=$INSTANCES REPLICAS=$INSTANCES
        # When not using `sed` anymore, use `kubectl apply -f uc3-application`
        kubectl apply -f uc3-application/aggregation-service.yaml
        kubectl apply -f uc3-application/jmx-configmap.yaml
        kubectl apply -f uc3-application/service-monitor.yaml
        #kubectl apply -f uc3-application/aggregation-deployment.yaml #kubectl apply -f uc3-application/aggregation-deployment.yaml
        APPLICATION_YAML=$(sed "s/{{CPU_LIMIT}}/$CPU_LIMIT/g; s/{{MEMORY_LIMIT}}/$MEMORY_LIMIT/g; s/{{KAFKA_STREAMS_COMMIT_INTERVAL_MS}}/$KAFKA_STREAMS_COMMIT_INTERVAL_MS/g" uc3-application/aggregation-deployment.yaml) APPLICATION_YAML=$(sed "s/{{CPU_LIMIT}}/$CPU_LIMIT/g; s/{{MEMORY_LIMIT}}/$MEMORY_LIMIT/g; s/{{KAFKA_STREAMS_COMMIT_INTERVAL_MS}}/$KAFKA_STREAMS_COMMIT_INTERVAL_MS/g" uc3-application/aggregation-deployment.yaml)
        echo "$APPLICATION_YAML" | kubectl apply -f - echo "$APPLICATION_YAML" | kubectl apply -f -
        ...@@ -51,7 +55,10 @@ deactivate ...@@ -51,7 +55,10 @@ deactivate
        #kubectl delete -f uc3-workload-generator/deployment.yaml #kubectl delete -f uc3-workload-generator/deployment.yaml
        #sed "s/{{INSTANCES}}/1/g" uc3-workload-generator/deployment.yaml | kubectl delete -f - #sed "s/{{INSTANCES}}/1/g" uc3-workload-generator/deployment.yaml | kubectl delete -f -
        echo "$WORKLOAD_GENERATOR_YAML" | kubectl delete -f - echo "$WORKLOAD_GENERATOR_YAML" | kubectl delete -f -
        #kubectl delete -f uc1-application/aggregation-deployment.yaml kubectl delete -f uc3-application/aggregation-service.yaml
        kubectl delete -f uc3-application/jmx-configmap.yaml
        kubectl delete -f uc3-application/service-monitor.yaml
        #kubectl delete -f uc3-application/aggregation-deployment.yaml
        #sed "s/{{CPU_LIMIT}}/1000m/g; s/{{MEMORY_LIMIT}}/4Gi/g; s/{{KAFKA_STREAMS_COMMIT_INTERVAL_MS}}/100/g" uc3-application/aggregation-deployment.yaml | kubectl delete -f - #sed "s/{{CPU_LIMIT}}/1000m/g; s/{{MEMORY_LIMIT}}/4Gi/g; s/{{KAFKA_STREAMS_COMMIT_INTERVAL_MS}}/100/g" uc3-application/aggregation-deployment.yaml | kubectl delete -f -
        echo "$APPLICATION_YAML" | kubectl delete -f - echo "$APPLICATION_YAML" | kubectl delete -f -
        ......
        execution/run_uc4-new.sh
        + 7
        − 0
        View file @ e3b733a6
        ...@@ -32,6 +32,10 @@ sed "s/{{NUM_SENSORS}}/$NUM_SENSORS/g" uc4-workload-generator/deployment.yaml | ...@@ -32,6 +32,10 @@ sed "s/{{NUM_SENSORS}}/$NUM_SENSORS/g" uc4-workload-generator/deployment.yaml |
        # Start application # Start application
        REPLICAS=$INSTANCES REPLICAS=$INSTANCES
        #AGGREGATION_DURATION_DAYS=$DIM_VALUE #AGGREGATION_DURATION_DAYS=$DIM_VALUE
        # When not using `sed` anymore, use `kubectl apply -f uc4-application`
        kubectl apply -f uc4-application/aggregation-service.yaml
        kubectl apply -f uc4-application/jmx-configmap.yaml
        kubectl apply -f uc4-application/service-monitor.yaml
        #kubectl apply -f uc4-application/aggregation-deployment.yaml #kubectl apply -f uc4-application/aggregation-deployment.yaml
        #sed "s/{{AGGREGATION_DURATION_DAYS}}/$AGGREGATION_DURATION_DAYS/g" uc4-application/aggregation-deployment.yaml | kubectl apply -f - #sed "s/{{AGGREGATION_DURATION_DAYS}}/$AGGREGATION_DURATION_DAYS/g" uc4-application/aggregation-deployment.yaml | kubectl apply -f -
        APPLICATION_YAML=$(sed "s/{{CPU_LIMIT}}/$CPU_LIMIT/g; s/{{MEMORY_LIMIT}}/$MEMORY_LIMIT/g; s/{{KAFKA_STREAMS_COMMIT_INTERVAL_MS}}/$KAFKA_STREAMS_COMMIT_INTERVAL_MS/g" uc4-application/aggregation-deployment.yaml) APPLICATION_YAML=$(sed "s/{{CPU_LIMIT}}/$CPU_LIMIT/g; s/{{MEMORY_LIMIT}}/$MEMORY_LIMIT/g; s/{{KAFKA_STREAMS_COMMIT_INTERVAL_MS}}/$KAFKA_STREAMS_COMMIT_INTERVAL_MS/g" uc4-application/aggregation-deployment.yaml)
        ...@@ -48,6 +52,9 @@ deactivate ...@@ -48,6 +52,9 @@ deactivate
        # Stop wl and app # Stop wl and app
        kubectl delete -f uc4-workload-generator/deployment.yaml kubectl delete -f uc4-workload-generator/deployment.yaml
        kubectl delete -f uc4-application/aggregation-service.yaml
        kubectl delete -f uc4-application/jmx-configmap.yaml
        kubectl delete -f uc4-application/service-monitor.yaml
        #kubectl delete -f uc4-application/aggregation-deployment.yaml #kubectl delete -f uc4-application/aggregation-deployment.yaml
        echo "$APPLICATION_YAML" | kubectl delete -f - echo "$APPLICATION_YAML" | kubectl delete -f -
        ......
        execution/uc1-workload-generator/jmx-configmap.yaml deleted 100644 → 0
        + 0
        − 10
        View file @ e18006d3
        apiVersion: v1
        kind: ConfigMap
        metadata:
        name: load-generator-jmx-configmap
        data:
        jmx-kafka-prometheus.yml: |+
        jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:5555/jmxrmi
        lowercaseOutputName: true
        lowercaseOutputLabelNames: true
        ssl: false
        execution/uc2-workload-generator/jmx-configmap.yaml deleted 100644 → 0
        + 0
        − 10
        View file @ e18006d3
        apiVersion: v1
        kind: ConfigMap
        metadata:
        name: load-generator-jmx-configmap
        data:
        jmx-kafka-prometheus.yml: |+
        jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:5555/jmxrmi
        lowercaseOutputName: true
        lowercaseOutputLabelNames: true
        ssl: false
        execution/uc3-workload-generator/jmx-configmap.yaml deleted 100644 → 0
        + 0
        − 10
        View file @ e18006d3
        apiVersion: v1
        kind: ConfigMap
        metadata:
        name: load-generator-jmx-configmap
        data:
        jmx-kafka-prometheus.yml: |+
        jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:5555/jmxrmi
        lowercaseOutputName: true
        lowercaseOutputLabelNames: true
        ssl: false
        execution/uc4-workload-generator/jmx-configmap.yaml deleted 100644 → 0
        + 0
        − 10
        View file @ e18006d3
        apiVersion: v1
        kind: ConfigMap
        metadata:
        name: load-generator-jmx-configmap
        data:
        jmx-kafka-prometheus.yml: |+
        jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:5555/jmxrmi
        lowercaseOutputName: true
        lowercaseOutputLabelNames: true
        ssl: false
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment