summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Colomar <sebastian.colomar@gmail.com>2020-05-28 12:19:45 +0200
committerSebastian Colomar <sebastian.colomar@gmail.com>2020-05-28 12:19:45 +0200
commitb0cead4580ae83a79f30d925623cf9ae7587e4c0 (patch)
treea9dfa8f34190254026141ded2db92834d34f5f88
parenta02ad11f7cf01543bfbf140c657ba8ea85b1ba92 (diff)
Fix alphabetical order in YAML
-rw-r--r--etc/docker/compose/docker-compose.yaml12
-rw-r--r--etc/docker/kubernetes/kube-compose.yaml92
2 files changed, 52 insertions, 52 deletions
diff --git a/etc/docker/compose/docker-compose.yaml b/etc/docker/compose/docker-compose.yaml
index 2f2255f..b7c0efe 100644
--- a/etc/docker/compose/docker-compose.yaml
+++ b/etc/docker/compose/docker-compose.yaml
@@ -9,7 +9,8 @@ version: "2"
services:
cam:
- image: alejandrocolomar/rob_cam:cam_0.5
+ depends_on:
+ - rob
devices:
- "/dev/video0:/dev/video0"
environment:
@@ -17,12 +18,12 @@ services:
- DELAY_US=10000
- ROB_ADDR=rob
- ROB_PORT=13100
- depends_on:
- - rob
+ image: alejandrocolomar/rob_cam:cam_0.5
restart: always
rob:
- image: alejandrocolomar/rob_cam:rob_0.5
+ depends_on:
+ - robot
environment:
- DELAY_LOGIN=1000000
- DELAY_US=100000
@@ -35,8 +36,7 @@ services:
# - ROBOT_TYPE=kwr
- ROBOT_TYPE=ur
- ROBOT_USER=
- depends_on:
- - robot
+ image: alejandrocolomar/rob_cam:rob_0.5
restart: always
robot:
diff --git a/etc/docker/kubernetes/kube-compose.yaml b/etc/docker/kubernetes/kube-compose.yaml
index 40c68b3..a50a7cd 100644
--- a/etc/docker/kubernetes/kube-compose.yaml
+++ b/etc/docker/kubernetes/kube-compose.yaml
@@ -18,8 +18,8 @@ spec:
spec:
containers:
-
- name: robot
image: alejandrocolomar/rob_cam:ur-sim_0.5
+ name: robot
---
apiVersion: apps/v1
kind: Deployment
@@ -34,79 +34,79 @@ spec:
labels:
name: rob
spec:
- initContainers:
- -
- name: init
- image: busybox
- command:
- - sh
- - -c
- - sleep 1
containers:
-
- name: rob
- image: alejandrocolomar/rob_cam:rob_0.5
env:
-
name: DELAY_LOGIN
valueFrom:
secretKeyRef:
- name: rob-secret
key: DELAY_LOGIN
+ name: rob-secret
-
name: DELAY_US
valueFrom:
secretKeyRef:
- name: rob-secret
key: DELAY_US
+ name: rob-secret
-
name: ROB_CAMS_MAX
valueFrom:
secretKeyRef:
- name: rob-secret
key: ROB_CAMS_MAX
+ name: rob-secret
-
name: ROB_PORT
valueFrom:
secretKeyRef:
- name: rob-secret
key: ROB_PORT
+ name: rob-secret
-
name: ROBOT_ADDR
valueFrom:
secretKeyRef:
- name: rob-secret
key: ROBOT_ADDR
+ name: rob-secret
-
name: ROBOT_PASSWD
valueFrom:
secretKeyRef:
- name: rob-secret
key: ROBOT_PASSWD
+ name: rob-secret
-
name: ROBOT_PORT
valueFrom:
secretKeyRef:
- name: rob-secret
key: ROBOT_PORT
+ name: rob-secret
-
name: ROBOT_STATUS_FNAME
valueFrom:
secretKeyRef:
- name: rob-secret
key: ROBOT_STATUS_FNAME
+ name: rob-secret
-
name: ROBOT_TYPE
valueFrom:
secretKeyRef:
- name: rob-secret
key: ROBOT_TYPE
+ name: rob-secret
-
name: ROBOT_USER
valueFrom:
secretKeyRef:
- name: rob-secret
key: ROBOT_USER
+ name: rob-secret
+ image: alejandrocolomar/rob_cam:rob_0.5
+ name: rob
+ initContainers:
+ -
+ command:
+ - sh
+ - -c
+ - sleep 1
+ image: busybox
+ name: init
---
apiVersion: apps/v1
kind: Deployment
@@ -121,74 +121,74 @@ spec:
labels:
name: cam
spec:
- initContainers:
- -
- name: init
- image: busybox
- command:
- - sh
- - -c
- - sleep 2
containers:
-
- name: cam
- image: alejandrocolomar/rob_cam:cam_0.5
- volumeMounts:
- -
- name: dev-video0
- mountPath: /dev/video0
- securityContext:
- privileged: true
env:
-
name: CAMERA_IDX
valueFrom:
secretKeyRef:
- name: cam-secret
key: CAMERA_IDX
+ name: cam-secret
-
name: DELAY_US
valueFrom:
secretKeyRef:
- name: cam-secret
key: DELAY_US
+ name: cam-secret
-
name: ROB_ADDR
valueFrom:
secretKeyRef:
- name: cam-secret
key: ROB_ADDR
+ name: cam-secret
-
name: ROB_PORT
valueFrom:
secretKeyRef:
- name: cam-secret
key: ROB_PORT
+ name: cam-secret
+ image: alejandrocolomar/rob_cam:cam_0.5
+ name: cam
+ securityContext:
+ privileged: true
+ volumeMounts:
+ -
+ mountPath: /dev/video0
+ name: dev-video0
+ initContainers:
+ -
+ command:
+ - sh
+ - -c
+ - sleep 2
+ image: busybox
+ name: init
volumes:
-
- name: dev-video0
hostPath:
path: /dev/video0
+ name: dev-video0
---
apiVersion: v1
kind: Service
metadata:
name: robot
spec:
- selector:
- name: robot
ports:
- port: 30002
+ selector:
+ name: robot
---
apiVersion: v1
kind: Service
metadata:
name: rob
spec:
- selector:
- name: rob
ports:
- port: 13100
+ selector:
+ name: rob
################################################################################
#sudo apt-get update && sudo apt-get install -y apt-transport-https curl ;