Move test controller and change liveness probe for coordinator. (#169)

Author: rghetia

.travis.yml

@@ -9,4 +9,4 @@ install:
 - sudo mv skaffold /usr/local/bin
 
 script:
-- cd interoptest && skaffold build --profile travis-ci
+- cd interoptest && ./build_and_run.sh

interoptest/build_and_run.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+# First build
+echo "Building containers.."
+skaffold build --profile travis-ci
+
+# Run the containers
+# [TODO:rghetia] invoke skaffold run after minikube issue is sorted out.
+# skaffold run
+# sleep 60
+
+# Run tests
+# cd ./src/testcontroller
+# sudo pip install -r requirements.txt
+# python run.py

interoptest/kubernetes-manifests/loadbalancer.yaml

@@ -22,5 +22,5 @@ spec:
     app: testcoordinator
   ports:
   - name: http
-    port: 10000
-    targetPort: 10000
+    port: 10003
+    targetPort: 10003

interoptest/kubernetes-manifests/testcoordinator.yaml

@@ -28,28 +28,28 @@ spec:
         image: gcr.io/opencensus-interoptest/testcoordinator
         imagePullPolicy: Never
         ports:
-        - containerPort: 10000
+        - containerPort: 10003
           name: testcoordinator
         env:
         - name: PORT
-          value: "10000"
+          value: "10003"
         resources:
           requests:
             cpu: 200m
             memory: 180Mi
           limits:
             cpu: 300m
             memory: 300Mi
-        readinessProbe:
-          tcpSocket:
-            port: 10000
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        livenessProbe:
-          tcpSocket:
-            port: 10000
-          initialDelaySeconds: 10
-          periodSeconds: 10
+#        readinessProbe:
+#          tcpSocket:
+#            port: 10003
+#          initialDelaySeconds: 5
+#          periodSeconds: 10
+#        livenessProbe:
+#          tcpSocket:
+#            port: 10003
+#          initialDelaySeconds: 10
+#          periodSeconds: 10
 ---
 apiVersion: v1
 kind: Service
@@ -61,5 +61,5 @@ spec:
     app: testcoordinator
   ports:
   - name: testcoordinator
-    port: 10000
-    targetPort: 10000
+    port: 10003
+    targetPort: 10003

interoptest/interoperability_test_pb2.py …tcontroller/interoperability_test_pb2.pyinteroptest/interoperability_test_pb2.py renamed to interoptest/src/testcontroller/interoperability_test_pb2.py interoptest/interoperability_test_pb2.py renamed to interoptest/src/testcontroller/interoperability_test_pb2.py

@@ -25,7 +25,7 @@
   -v --verbose            Verbose output
   -t --timeout=<timeout>  Seconds to wait for service calls [default: 60]
   -o --host=<host>        Test service host [default: localhost]
-  -p --port=<port>        Test service port [default: 10000]
+  -p --port=<port>        Test service port [default: 10003]
 
 """
 

…optest/interoperability_test_pb2_grpc.py …roller/interoperability_test_pb2_grpc.pyinteroptest/interoperability_test_pb2_grpc.py renamed to interoptest/src/testcontroller/interoperability_test_pb2_grpc.py interoptest/interoperability_test_pb2_grpc.py renamed to interoptest/src/testcontroller/interoperability_test_pb2_grpc.py

@@ -16,6 +16,6 @@ FROM alpine as release
 RUN apk add --no-cache ca-certificates curl
 
 COPY --from=builder /testcoordinator /testcoordinator
-EXPOSE 10000
+EXPOSE 10003
 ENTRYPOINT ["/testcoordinator"]
 

interoptest/requirements.txt …test/src/testcontroller/requirements.txtinteroptest/requirements.txt renamed to interoptest/src/testcontroller/requirements.txt interoptest/requirements.txt renamed to interoptest/src/testcontroller/requirements.txt

@@ -73,9 +73,9 @@ func main() {
 }
 
 func parseFlags() (regSrvAddr, receiverAddr, interopSrvAddr string) {
-	regSrvAddrPtr := flag.String("registration_service_address", "localhost:10002", "Address of the registration service")
-	recieverAddrPtr := flag.String("oc_receiver_address", "localhost:10001", "Address of OC Agent trace receiver")
-	interopSrvAddrPtr := flag.String("interop_service_address", "localhost:10003", "Address of the interop test service")
+	regSrvAddrPtr := flag.String("registration_service_address", "0.0.0.0:10002", "Address of the registration service")
+	recieverAddrPtr := flag.String("oc_receiver_address", "0.0.0.0:10001", "Address of OC Agent trace receiver")
+	interopSrvAddrPtr := flag.String("interop_service_address", "0.0.0.0:10003", "Address of the interop test service")
 	flag.Parse()
 	return *regSrvAddrPtr, *recieverAddrPtr, *interopSrvAddrPtr
 }