chore(k8s): bump robocar-throttle image

debug(arduino): disable debug logs
refactor: move steering/throttle pin after car rebuilding
2022-06-07 18:54:36 +02:00 · 2022-06-07 18:53:46 +02:00 · 2022-06-07 18:53:13 +02:00 · 2022-06-07 18:52:36 +02:00 · 2022-06-07 18:51:53 +02:00 · 2022-05-30 16:16:33 +02:00
6 changed files with 60 additions and 108 deletions
--- a/ansible/roles/microservices/files/robocar/car/configmap.yaml
+++ b/ansible/roles/microservices/files/robocar/car/configmap.yaml
@@ -1,13 +0,0 @@
---
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: robocar-pca9685
-data:
-  ################
-  # STEERING PWM #
-  ################
-  STEERING_LEFT_PWM: "1092"
-  STEERING_RIGHT_PWM: "1986"
-  STEERING_CENTER_PWM: "1583"
-
--- a/ansible/roles/microservices/files/robocar/car/deployments.yaml
+++ b/ansible/roles/microservices/files/robocar/car/deployments.yaml
@@ -166,7 +166,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: pca9685-steering
+  name: pca9685
  annotations:
    reloader.stakater.com/auto: "true"
 spec:
@@ -184,15 +184,19 @@ spec:
    spec:
      containers:
        - name: pca9685
-          image: docker.io/cyrilix/robocar-pca9685-python
+          image: docker.io/cyrilix/robocar-pca9685
          args:
-          - "steering"
-          - "--i2c-bus=1"
-          - "--i2c-address=40"
-          - "--pca9685-channel=0"
-          - "--left-pulse=$(STEERING_LEFT_PWM)"
-          - "--right-pulse=$(STEERING_RIGHT_PWM)"
-          - "--debug"
+          - "--mqtt-retain=false"
+          - "--throttle-channel=15"
+          - "--steering-channel=14"
+          - "--throttle-zero-pwm=$(THROTTLE_ZERO_PWM)"
+          - "--throttle-min-pwm=$(THROTTLE_MIN_PWM)"
+          - "--throttle-max-pwm=$(THROTTLE_MAX_PWM)"
+          - "--steering-left-pwm=$(STEERING_LEFT_PWM)"
+          - "--steering-right-pwm=$(STEERING_RIGHT_PWM)"
+          - "--steering-center-pwm=$(STEERING_CENTER_PWM)"
+          - "--update-pwm-frequency=25"
+          - "--log=info"
          securityContext:
            runAsUser: 1234
            runAsGroup: 998 # Set 998/i2c group to access to i2c device
@@ -204,7 +208,7 @@ spec:
            - name: MQTT_BROKER
              valueFrom:
                configMapKeyRef:
-                  key: MQTT_BROKER_HOST
+                  key: MQTT_BROKER
                  name: robocar
            - name: MQTT_USERNAME
              valueFrom:
@@ -217,8 +221,13 @@ spec:
                  key: MQTT_PASSWORD
                  name: mqtt-credentials
            - name: MQTT_CLIENT_ID
-              value: rc-pca9685-steering
-            - name: MQTT_TOPIC
+              value: rc-pca9685
+            - name: MQTT_TOPIC_THROTTLE
+              valueFrom:
+                configMapKeyRef:
+                  key: MQTT_TOPIC_THROTTLE
+                  name: robocar
+            - name: MQTT_TOPIC_STEERING
              valueFrom:
                configMapKeyRef:
                  key: MQTT_TOPIC_STEERING
@@ -228,89 +237,33 @@ spec:
            - name: STEERING_LEFT_PWM
              valueFrom:
                configMapKeyRef:
-                  name: robocar-pca9685
+                  name: robocar-steering-pwm
                  key: STEERING_LEFT_PWM
            - name: STEERING_RIGHT_PWM
              valueFrom:
                configMapKeyRef:
-                  name: robocar-pca9685
+                  name: robocar-steering-pwm
                  key: STEERING_RIGHT_PWM
            - name: STEERING_CENTER_PWM
              valueFrom:
                configMapKeyRef:
-                  name: robocar-pca9685
+                  name: robocar-steering-pwm
                  key: STEERING_CENTER_PWM
-            - name: TZ
-              value: "Europe/Paris"
-      volumes:
-        - name: i2c
-          hostPath:
-            path: /dev/i2c-1
-            type: CharDevice
---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: pca9685-throttle
-  annotations:
-    reloader.stakater.com/auto: "true"
-spec:
-  revisionHistoryLimit: 0
-  replicas: 1
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      component: pca9685
-  template:
-    metadata:
-      labels:
-        component: pca9685
-    spec:
-      containers:
-        - name: pca9685-throttle
-          image: docker.io/cyrilix/robocar-pca9685-python
-          args:
-            - "throttle"
-            - "--zero-pulse=378"
-            - "--min-pulse=250"
-            - "--max-pulse=500"
-            - "--i2c-bus=1"
-            - "--i2c-address=40"
-            - "--pca9685-channel=1"
-            - "--debug"
-          securityContext:
-            runAsUser: 1234
-            runAsGroup: 998 # Set 998/i2c group to access to i2c device
-            privileged: true
-          volumeMounts:
-            - mountPath: /dev/i2c-1
-              name: i2c
-          env:
-            - name: MQTT_BROKER
-              valueFrom:
-                configMapKeyRef:
-                  key: MQTT_BROKER_HOST
-                  name: robocar
-            - name: MQTT_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  key: MQTT_USERNAME
-                  name: mqtt-credentials
-            - name: MQTT_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  key: MQTT_PASSWORD
-                  name: mqtt-credentials
-            - name: MQTT_CLIENT_ID
-              value: rc-pca9685-throttle
-            - name: MQTT_TOPIC
-              valueFrom:
-                configMapKeyRef:
-                  key: MQTT_TOPIC_THROTTLE
-                  name: robocar
-            - name: MQTT_QOS
-              value: "0"
+            - name: THROTTLE_MIN_PWM
+              valueFrom:
+                configMapKeyRef:
+                  name: robocar-throttle-pwm
+                  key: THROTTLE_MIN_PWM
+            - name: THROTTLE_MAX_PWM
+              valueFrom:
+                configMapKeyRef:
+                  name: robocar-throttle-pwm
+                  key: THROTTLE_MAX_PWM
+            - name: THROTTLE_ZERO_PWM
+              valueFrom:
+                configMapKeyRef:
+                  name: robocar-throttle-pwm
+                  key: THROTTLE_ZERO_PWM
            - name: TZ
              value: "Europe/Paris"
      volumes:
--- a/ansible/roles/microservices/files/robocar/car/kustomization.yaml
+++ b/ansible/roles/microservices/files/robocar/car/kustomization.yaml
@@ -7,14 +7,13 @@ namespace: robocar
 resources:
  - ../common
  - deployments.yaml
-  - configmap.yaml

 images:
  - name: docker.io/cyrilix/robocar-camera
    newTag: v0.3.0

-  - name: docker.io/cyrilix/robocar-pca9685-python
-    newTag: v0.1.0-12-g2966f92
+  - name: docker.io/cyrilix/robocar-pca9685
+    newTag: v0.6.0

  - name: docker.io/cyrilix/robocar-oak-camera
    newTag: v0.1.0
--- a/ansible/roles/microservices/files/robocar/common/configmap.yaml
+++ b/ansible/roles/microservices/files/robocar/common/configmap.yaml
@@ -4,6 +4,8 @@ metadata:
  name: robocar
 data:
  # Broker configuration
+  #MQTT_BROKER_HOST: 192.168.217.19
+  #MQTT_BROKER: "tcp://192.168.217.19:1883"
  MQTT_BROKER_HOST: 192.168.2.221
  MQTT_BROKER: "tcp://192.168.2.221:1883"
  #MQTT_BROKER: "tcp://mqtt.robocar.svc.cluster.local:1883"
@@ -55,7 +57,18 @@ data:
  STEERING_LEFT_PWM: "1002"
  STEERING_RIGHT_PWM: "1985"
  STEERING_CENTER_PWM: "1491"
-
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: robocar-throttle-pwm
+data:
+  ################
+  # THROTTLE PWM #
+  ################
+  THROTTLE_MIN_PWM: "1092"
+  THROTTLE_MAX_PWM: "1986"
+  THROTTLE_ZERO_PWM: "1583"
 ---
 apiVersion: v1
 kind: ConfigMap
--- a/ansible/roles/microservices/files/robocar/common/deployments.yaml
+++ b/ansible/roles/microservices/files/robocar/common/deployments.yaml
@@ -30,7 +30,7 @@ spec:
            - "--steering-center-pwm=$(STEERING_CENTER_PWM)"
            - "-log=info"
          volumeMounts:
-            - mountPath: "/dev/ttyAMA1"
+            - mountPath: "/dev/ttyAMA0"
              name: serial
          securityContext:
            privileged: true
@@ -96,7 +96,7 @@ spec:
      volumes:
        - name: serial
          hostPath:
-            path: /dev/ttyAMA1
+            path: /dev/ttyAMA0
            type: CharDevice

 ---
@@ -525,7 +525,7 @@ spec:
        image: docker.io/cyrilix/robocar-record
        args:
        - "-mqtt-retain=true"
-        - "-debug=false"
+        - "-debug=true"
        securityContext:
          runAsUser: 1234
          runAsGroup: 1234
--- a/ansible/roles/microservices/files/robocar/common/kustomization.yaml
+++ b/ansible/roles/microservices/files/robocar/common/kustomization.yaml
@@ -10,7 +10,7 @@ resources:

 images:
  - name: docker.io/cyrilix/robocar-arduino
-    newTag: v0.6.0
+    newTag: v0.7.0

  - name: docker.io/cyrilix/robocar-led
    newTag: v0.5.0
@@ -19,7 +19,7 @@ images:
    newTag: v0.4.0

  - name: docker.io/cyrilix/robocar-throttle
-    newTag: v0.4.0
+    newTag: v0.4.1

  - name: docker.io/cyrilix/robocar-record
    newTag: v0.5.0
Author	SHA1	Message	Date
Cyrille Nofficial	d558415684	chore(k8s): bump robocar-throttle image	2022-06-07 18:54:36 +02:00
Cyrille Nofficial	74d54c14b5	debug(arduino): disable debug logs	2022-06-07 18:53:46 +02:00
Cyrille Nofficial	6d6cd5b26e	refactor: move steering/throttle pin after car rebuilding	2022-06-07 18:53:13 +02:00
Cyrille Nofficial	b21171cecb	freeze arduino image	2022-06-07 18:52:36 +02:00
Cyrille Nofficial	bbf4328e6c	refactor: unify pwm config for arduino and pca9685	2022-06-07 18:51:53 +02:00
Cyrille Nofficial	e1602339ee	freeze: robocar-pca9685 OK	2022-05-30 16:16:33 +02:00
Cyrille Nofficial	1dde1786f6	fix: bad throttle pwm parameters	2022-05-30 15:01:00 +02:00
Cyrille Nofficial	d3071a5abf	clean: pca9685 deployment	2022-05-30 14:28:33 +02:00
Cyrille Nofficial	e0955aac8f	It's working!	2022-05-30 14:24:48 +02:00