ansible/roles/microservices/files/robocar/car/deployments.yaml

@@ -103,12 +103,11 @@ spec:
     spec:
       containers:
         - name: camera
-          image: git.cyrilix.bzh/robocars/robocar-oak-camera
+          image: docker.io/cyrilix/robocar-oak-camera
           args:
             - "--image-width=$(CAMERA_WIDTH)"
             - "--image-height=$(CAMERA_HEIGHT)"
             - "--objects-threshold=$(THRESHOLD_OBJECTS)"
-            - "--log=info"
           securityContext:
             runAsUser: 1234
             privileged: true
@@ -147,7 +146,7 @@ spec:
             - name: THRESHOLD_OBJECTS
               valueFrom:
                 configMapKeyRef:
-                  key: OBJECTS_THRESHOLD
+                  key: THRESHOLD
                   name: robocar-objects
             - name: CAMERA_WIDTH
               valueFrom:

ansible/roles/microservices/files/robocar/car/kustomization.yaml

@@ -16,5 +16,5 @@ images:
   - name: docker.io/cyrilix/robocar-pca9685
     newTag: v0.6.4
 
-  - name: git.cyrilix.bzh/robocars/robocar-oak-camera
+  - name: docker.io/cyrilix/robocar-oak-camera
-    newTag: v0.2.0-28-g7ebd909
+    newTag: v0.2.0

ansible/roles/microservices/files/robocar/common/configmap.yaml

@@ -46,21 +46,8 @@ data:
   ############
   # Throttle #
   ############
-
+  THROTTLE_MIN: "0.2"
-  ## For manual driving
+  THROTTLE_MAX: "0.3"
-  #####################
-  # THROTTLE_MIN: "0.10"
-  # THROTTLE_MAX: "0.12"
-
-  ## Secure auto-pilot
-  ####################
-  THROTTLE_MIN: "0.10"
-  THROTTLE_MAX: "0.12"
-
-  ## Speed auto-pilot
-  ###################
-  # THROTTLE_MIN: "0.11"
-  # THROTTLE_MAX: "0.13"
 
 
 ---
@@ -141,6 +128,7 @@ data:
   MODEL_IMAGE_WIDTH: "160"
   MODEL_IMAGE_HEIGHT: "120"
   HORIZON: "20"
+
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -185,11 +173,8 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: robocar-objects
+  name: android
 data:
-  OBJECTS_THRESHOLD: "0.2"
-
-  # To delete?
   thresholds.json: |
     {
       "threshold_steps": [ 0.07, 0.08, 0.09, 0.1, 0.125, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0 ],

ansible/roles/microservices/files/robocar/common/deployments.yaml

@@ -107,7 +107,7 @@ spec:
             type: CharDevice
         - name: robocar
           configMap:
-            name: robocar-objects
+            name: android
 
 ---
 apiVersion: apps/v1
@@ -321,7 +321,7 @@ spec:
           - "-mqtt-retain=false"
           - "--image-width=$(IMAGE_WIDTH)"
           - "--image-height=$(IMAGE_HEIGHT)"
-          - "--enable-objects-correction=false"
+          - "--enable-objects-correction=true"
           - "--enable-objects-correction-user=false"
           - "--grid-map-config=/etc/robocar/grid.json"
           - "--objects-move-factors-config=/etc/robocar/omf.json"

ansible/roles/microservices/files/robocar/common/kustomization.yaml

@@ -3,7 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - namespace.yaml
   - deployments.yaml
   - services.yaml
   - configmap.yaml

ansible/roles/microservices/files/robocar/common/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: robocar

ansible/roles/microservices/files/robocar/common/secrets.yaml

@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: mqtt-credentials
-  namespace: robocar
 stringData:
   MQTT_USERNAME: satanas
   MQTT_PASSWORD: satanas

ansible/roles/microservices/files/robocar/reloader/kustomization.yaml

@@ -3,7 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - namespace.yaml
   - https://github.com/stakater/Reloader/deployments/kubernetes
 
 namespace: reloader

ansible/roles/microservices/files/robocar/reloader/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: reloader