From d3a5f600d86570d9bca5caac5367377d2e645e72 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Wed, 12 Feb 2020 12:38:09 -0500 Subject: [PATCH] Update API version attributes --- .../k8s-templates/http-transfomer-log/http.yaml | 3 +++ kubernetes/k8s-templates/http-transfomer-log/log.yaml | 3 +++ .../transform-processor-kafka.yaml | 5 ++++- kubernetes/k8s-templates/kafka-deployment.yaml | 5 ++++- kubernetes/k8s-templates/kafka-svc.yaml | 2 +- kubernetes/k8s-templates/kafka-zk-deployment.yaml | 5 ++++- kubernetes/k8s-templates/kafka-zk-svc.yaml | 2 +- kubernetes/k8s-templates/log.yaml | 3 +++ kubernetes/k8s-templates/time.yaml | 3 +++ kubernetes/runK8SAcceptanceTests.sh | 11 +++++++++-- 10 files changed, 35 insertions(+), 7 deletions(-) diff --git a/kubernetes/k8s-templates/http-transfomer-log/http.yaml b/kubernetes/k8s-templates/http-transfomer-log/http.yaml index 87b5b6b..e7ed01d 100644 --- a/kubernetes/k8s-templates/http-transfomer-log/http.yaml +++ b/kubernetes/k8s-templates/http-transfomer-log/http.yaml @@ -8,6 +8,9 @@ metadata: component: http-source spec: replicas: 1 + selector: + matchLabels: + app: http-source template: metadata: labels: diff --git a/kubernetes/k8s-templates/http-transfomer-log/log.yaml b/kubernetes/k8s-templates/http-transfomer-log/log.yaml index 2030ced..bebfeee 100644 --- a/kubernetes/k8s-templates/http-transfomer-log/log.yaml +++ b/kubernetes/k8s-templates/http-transfomer-log/log.yaml @@ -8,6 +8,9 @@ metadata: component: log spec: replicas: 1 + selector: + matchLabels: + app: log template: metadata: labels: diff --git a/kubernetes/k8s-templates/http-transfomer-log/transform-processor-kafka.yaml b/kubernetes/k8s-templates/http-transfomer-log/transform-processor-kafka.yaml index e8a153b..7fbf3ef 100644 --- a/kubernetes/k8s-templates/http-transfomer-log/transform-processor-kafka.yaml +++ b/kubernetes/k8s-templates/http-transfomer-log/transform-processor-kafka.yaml @@ -8,6 +8,9 @@ metadata: component: transform-processor-kafka spec: replicas: 1 + selector: + matchLabels: + app: transform-processor-kafka template: metadata: labels: @@ -31,7 +34,7 @@ spec: value: transformer-out - name: TRANSFORMER_EXPRESSION value: payload.toUpperCase() - - name: LOGGING_FILE_NAME + - name: LOGGING_FILE value: transform-processor-kafka.log - name: MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE value: logfile,health,info diff --git a/kubernetes/k8s-templates/kafka-deployment.yaml b/kubernetes/k8s-templates/kafka-deployment.yaml index ab5e981..2a96d58 100644 --- a/kubernetes/k8s-templates/kafka-deployment.yaml +++ b/kubernetes/k8s-templates/kafka-deployment.yaml @@ -4,10 +4,13 @@ metadata: name: kafka-broker labels: app: kafka - type: stream-ats + type: stream-ats-kafka component: kafka-broker spec: replicas: 1 + selector: + matchLabels: + app: kafka template: metadata: labels: diff --git a/kubernetes/k8s-templates/kafka-svc.yaml b/kubernetes/k8s-templates/kafka-svc.yaml index 52f1120..c8303d4 100644 --- a/kubernetes/k8s-templates/kafka-svc.yaml +++ b/kubernetes/k8s-templates/kafka-svc.yaml @@ -5,7 +5,7 @@ metadata: labels: app: kafka component: kafka-broker - type: stream-ats + type: stream-ats-kafka spec: ports: - port: 9092 diff --git a/kubernetes/k8s-templates/kafka-zk-deployment.yaml b/kubernetes/k8s-templates/kafka-zk-deployment.yaml index 9a24e50..c184edf 100644 --- a/kubernetes/k8s-templates/kafka-zk-deployment.yaml +++ b/kubernetes/k8s-templates/kafka-zk-deployment.yaml @@ -4,10 +4,13 @@ metadata: name: kafka-zk labels: app: kafka - type: stream-ats + type: stream-ats-kafka component: kafka-zk spec: replicas: 1 + selector: + matchLabels: + app: kafka-zk template: metadata: labels: diff --git a/kubernetes/k8s-templates/kafka-zk-svc.yaml b/kubernetes/k8s-templates/kafka-zk-svc.yaml index 3d82a5a..7d2b15c 100644 --- a/kubernetes/k8s-templates/kafka-zk-svc.yaml +++ b/kubernetes/k8s-templates/kafka-zk-svc.yaml @@ -5,7 +5,7 @@ metadata: labels: app: kafka component: kafka-zk - type: stream-ats + type: stream-ats-kafka spec: ports: - name: client diff --git a/kubernetes/k8s-templates/log.yaml b/kubernetes/k8s-templates/log.yaml index 1bd05e5..5e66ae0 100644 --- a/kubernetes/k8s-templates/log.yaml +++ b/kubernetes/k8s-templates/log.yaml @@ -8,6 +8,9 @@ metadata: component: log spec: replicas: 1 + selector: + matchLabels: + app: log template: metadata: labels: diff --git a/kubernetes/k8s-templates/time.yaml b/kubernetes/k8s-templates/time.yaml index 0c4f9a2..c2657b1 100644 --- a/kubernetes/k8s-templates/time.yaml +++ b/kubernetes/k8s-templates/time.yaml @@ -8,6 +8,9 @@ metadata: component: time spec: replicas: 1 + selector: + matchLabels: + app: time template: metadata: labels: diff --git a/kubernetes/runK8SAcceptanceTests.sh b/kubernetes/runK8SAcceptanceTests.sh index 653485c..d38e040 100755 --- a/kubernetes/runK8SAcceptanceTests.sh +++ b/kubernetes/runK8SAcceptanceTests.sh @@ -66,6 +66,11 @@ function delete_acceptance_test_components() { kubectl delete pod,deployment,rc,service -l type="stream-ats" } +function delete_acceptance_test_infra() { + + kubectl delete pod,deployment,rc,service -l type="stream-ats-kafka" +} + #Main script starting SECONDS=0 @@ -102,7 +107,7 @@ then duration=$SECONDS echo "Total time: Build took $(($duration / 60)) minutes and $(($duration % 60)) seconds to complete." - + delete_acceptance_test_infra exit $BUILD_RETURN_VALUE fi @@ -123,10 +128,12 @@ then duration=$SECONDS echo "Total time: Build took $(($duration / 60)) minutes and $(($duration % 60)) seconds to complete." - + delete_acceptance_test_infra exit $BUILD_RETURN_VALUE fi +delete_acceptance_test_infra + duration=$SECONDS echo "Cumulative Build Time Across All Tests: Build took $(($duration / 60)) minutes and $(($duration % 60)) seconds to complete."