From 74ad7088013fed153c9f218ac3c78f23d549534a Mon Sep 17 00:00:00 2001 From: Sebastian Colomar Date: Thu, 28 May 2020 05:35:17 +0200 Subject: Use bind as a DNS for internal network --- bind/Dockerfile | 15 ++++++++++ bind/Dockerfile-devel | 34 +++++++++++++++++++++ bind/etc/docker/swarm/release/dns-blue.yaml | 35 ++++++++++++++++++++++ bind/etc/docker/swarm/release/dns.yaml | 35 ++++++++++++++++++++++ bind/run/configs/etc/bind/named.conf | 20 +++++++++++++ bind/run/secrets/var/bind/master/10.168 | 9 ++++++ .../secrets/var/bind/master/alejandro-colomar.com | 11 +++++++ 7 files changed, 159 insertions(+) create mode 100644 bind/Dockerfile create mode 100644 bind/Dockerfile-devel create mode 100644 bind/etc/docker/swarm/release/dns-blue.yaml create mode 100644 bind/etc/docker/swarm/release/dns.yaml create mode 100644 bind/run/configs/etc/bind/named.conf create mode 100644 bind/run/secrets/var/bind/master/10.168 create mode 100644 bind/run/secrets/var/bind/master/alejandro-colomar.com diff --git a/bind/Dockerfile b/bind/Dockerfile new file mode 100644 index 0000000..74f4a57 --- /dev/null +++ b/bind/Dockerfile @@ -0,0 +1,15 @@ +############################################################################### +# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # +# Copyright (C) 2020 Alejandro Colomar Andrés # +# SPDX-License-Identifier: GPL-2.0-only # +############################################################################### + +## alpine:latest +FROM alpine@sha256:39eda93d15866957feaee28f8fc5adb545276a64147445c64992ef69804dbf01 \ + AS dns + +RUN apk add --no-cache --upgrade bind + +CMD ["named", "-c", "/etc/bind/named.conf", "-g"] + +############################################################################### diff --git a/bind/Dockerfile-devel b/bind/Dockerfile-devel new file mode 100644 index 0000000..d9c3dd6 --- /dev/null +++ b/bind/Dockerfile-devel @@ -0,0 +1,34 @@ +############################################################################### +# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # +# Copyright (C) 2020 Alejandro Colomar Andrés # +# SPDX-License-Identifier: GPL-2.0-only # +############################################################################### + +## alpine/git:latest +FROM alpine/git@sha256:8d2aedf3898243892d170f033603b40a55e0b0a8ab68ba9762f9c0dae40b5c8d \ + AS git + +RUN \ + git clone \ + --single-branch \ + --branch bind \ + https://github.com/alejandro-colomar/dns.alejandro-colomar.git \ + /repo + +############################################################################### + +## alpine:latest +FROM alpine@sha256:39eda93d15866957feaee28f8fc5adb545276a64147445c64992ef69804dbf01 \ + AS dns + +RUN apk add --no-cache --upgrade bind + +## configure dns server +COPY --from=git /repo/run/configs/etc/bind/named.conf \ + /etc/bind/named.conf +COPY --from=git /repo/run/secrets/var/bind/master \ + /run/secrets/var/bind/master + +CMD ["named", "-c", "/etc/bind/named.conf", "-g"] + +############################################################################### diff --git a/bind/etc/docker/swarm/release/dns-blue.yaml b/bind/etc/docker/swarm/release/dns-blue.yaml new file mode 100644 index 0000000..c3b541a --- /dev/null +++ b/bind/etc/docker/swarm/release/dns-blue.yaml @@ -0,0 +1,35 @@ +######################################################################### +# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # +# SPDX-License-Identifier: GPL-2.0-only # +######################################################################### + +configs: + named: + file: /run/configs/etc/bind/named.conf + +secrets: + forward: + file: /run/secrets/var/bind/master/alejandro-colomar.com + reverse: + file: /run/secrets/var/bind/master/10.168 + +services: + dns: + configs: + - mode: 0440 + source: named + target: /etc/bind/named.conf + deploy: + mode: global + image: "alejandrocolomar/dns.alejandro-colomar:v0.1" + ports: + - "5353:53/udp" + secrets: + - mode: 0440 + source: forward + target: var/bind/master/alejandro-colomar.com + - mode: 0440 + source: reverse + target: var/bind/master/10.168 + +version: '3.8' diff --git a/bind/etc/docker/swarm/release/dns.yaml b/bind/etc/docker/swarm/release/dns.yaml new file mode 100644 index 0000000..3833cd4 --- /dev/null +++ b/bind/etc/docker/swarm/release/dns.yaml @@ -0,0 +1,35 @@ +######################################################################### +# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # +# SPDX-License-Identifier: GPL-2.0-only # +######################################################################### + +configs: + named: + file: /run/configs/etc/bind/named.conf + +secrets: + forward: + file: /run/secrets/var/bind/master/alejandro-colomar.com + reverse: + file: /run/secrets/var/bind/master/10.168 + +services: + dns: + configs: + - mode: 0440 + source: named + target: /etc/bind/named.conf + deploy: + mode: global + image: "alejandrocolomar/dns.alejandro-colomar:v0.1" + ports: + - "53:53/udp" + secrets: + - mode: 0440 + source: forward + target: var/bind/master/alejandro-colomar.com + - mode: 0440 + source: reverse + target: var/bind/master/10.168 + +version: '3.8' diff --git a/bind/run/configs/etc/bind/named.conf b/bind/run/configs/etc/bind/named.conf new file mode 100644 index 0000000..c3356b1 --- /dev/null +++ b/bind/run/configs/etc/bind/named.conf @@ -0,0 +1,20 @@ +options { + allow-query { any; }; + allow-recursion { none; }; + allow-transfer { none; }; + directory "/var/bind"; + listen-on-v6 { none; }; + pid-file "/var/run/named/named.pid"; + recursion no; +}; + +zone "alejandro-colomar.com" { + file "/run/secrets/var/bind/master/alejandro-colomar.com"; + type master; +}; + +zone "168.10.in-addr.arpa" IN { + file "/run/secrets/var/bind/master/10.168"; + type master; +}; + diff --git a/bind/run/secrets/var/bind/master/10.168 b/bind/run/secrets/var/bind/master/10.168 new file mode 100644 index 0000000..75e8b60 --- /dev/null +++ b/bind/run/secrets/var/bind/master/10.168 @@ -0,0 +1,9 @@ +$TTL 604800 +@ IN SOA dns.alejandro-colomar.com. root.dns.alejandro-colomar.com. ( + 1 + 604800 + 86400 + 2419200 + 604800 ) + IN NS dns.alejandro-colomar.com. +100.6 IN PTR robot.alejandro-colomar.com. diff --git a/bind/run/secrets/var/bind/master/alejandro-colomar.com b/bind/run/secrets/var/bind/master/alejandro-colomar.com new file mode 100644 index 0000000..18358ac --- /dev/null +++ b/bind/run/secrets/var/bind/master/alejandro-colomar.com @@ -0,0 +1,11 @@ +$TTL 604800 +@ IN SOA dns.alejandro-colomar.com. root.dns.alejandro-colomar.com. ( + 2 + 604800 + 86400 + 2419200 + 604800 ) + IN NS dns.alejandro-colomar.com. +dns IN A 127.0.0.1 +kube-apiserver IN CNAME dns +robot IN A 10.168.6.100 -- cgit v1.2.3 From 7de48eccabf3c98af493323e5db68ef7ab6d0b7f Mon Sep 17 00:00:00 2001 From: Sebastian Colomar Date: Thu, 28 May 2020 11:13:24 +0200 Subject: Move docker-compose files to docker/compose --- docker/compose/docker-compose.yaml | 49 ++++++++++++++++++++++++++++++++++++++ docker/docker-compose.yaml | 49 -------------------------------------- docker/docker-compose.yaml-PASSED | 0 3 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 docker/compose/docker-compose.yaml delete mode 100644 docker/docker-compose.yaml delete mode 100644 docker/docker-compose.yaml-PASSED diff --git a/docker/compose/docker-compose.yaml b/docker/compose/docker-compose.yaml new file mode 100644 index 0000000..2f2255f --- /dev/null +++ b/docker/compose/docker-compose.yaml @@ -0,0 +1,49 @@ +############################################################################### +# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # +# Copyright (C) 2020 Alejandro Colomar Andrés # +# SPDX-License-Identifier: GPL-2.0-only # +############################################################################### + +version: "2" + +services: + + cam: + image: alejandrocolomar/rob_cam:cam_0.5 + devices: + - "/dev/video0:/dev/video0" + environment: + - CAMERA_IDX=0 + - DELAY_US=10000 + - ROB_ADDR=rob + - ROB_PORT=13100 + depends_on: + - rob + restart: always + + rob: + image: alejandrocolomar/rob_cam:rob_0.5 + environment: + - DELAY_LOGIN=1000000 + - DELAY_US=100000 + - ROB_CAMS_MAX=1 + - ROB_PORT=13100 + - ROBOT_ADDR=robot + - ROBOT_PASSWD= + - ROBOT_PORT=30002 + - ROBOT_STATUS_FNAME=status.log +# - ROBOT_TYPE=kwr + - ROBOT_TYPE=ur + - ROBOT_USER= + depends_on: + - robot + restart: always + + robot: + image: alejandrocolomar/rob_cam:ur-sim_0.5 + restart: always + +################################################################################ +#sudo docker-compose up -d ; +#sudo docker-compose down ; +################################################################################ diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml deleted file mode 100644 index 2f2255f..0000000 --- a/docker/docker-compose.yaml +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################### -# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # -# Copyright (C) 2020 Alejandro Colomar Andrés # -# SPDX-License-Identifier: GPL-2.0-only # -############################################################################### - -version: "2" - -services: - - cam: - image: alejandrocolomar/rob_cam:cam_0.5 - devices: - - "/dev/video0:/dev/video0" - environment: - - CAMERA_IDX=0 - - DELAY_US=10000 - - ROB_ADDR=rob - - ROB_PORT=13100 - depends_on: - - rob - restart: always - - rob: - image: alejandrocolomar/rob_cam:rob_0.5 - environment: - - DELAY_LOGIN=1000000 - - DELAY_US=100000 - - ROB_CAMS_MAX=1 - - ROB_PORT=13100 - - ROBOT_ADDR=robot - - ROBOT_PASSWD= - - ROBOT_PORT=30002 - - ROBOT_STATUS_FNAME=status.log -# - ROBOT_TYPE=kwr - - ROBOT_TYPE=ur - - ROBOT_USER= - depends_on: - - robot - restart: always - - robot: - image: alejandrocolomar/rob_cam:ur-sim_0.5 - restart: always - -################################################################################ -#sudo docker-compose up -d ; -#sudo docker-compose down ; -################################################################################ diff --git a/docker/docker-compose.yaml-PASSED b/docker/docker-compose.yaml-PASSED deleted file mode 100644 index e69de29..0000000 -- cgit v1.2.3 From 85858fb046f930fe174b26f6d7b330cbf79fa248 Mon Sep 17 00:00:00 2001 From: Sebastian Colomar Date: Thu, 28 May 2020 11:16:30 +0200 Subject: Move conf files to common folder --- bind/etc/docker/swarm/release/dns-blue.yaml | 35 ---------------------- bind/etc/docker/swarm/release/dns.yaml | 35 ---------------------- bind/run/configs/etc/bind/named.conf | 20 ------------- bind/run/secrets/var/bind/master/10.168 | 9 ------ .../secrets/var/bind/master/alejandro-colomar.com | 11 ------- docker/swarm/release/dns-blue.yaml | 34 +++++++++++++++++++++ docker/swarm/release/dns.yaml | 34 +++++++++++++++++++++ run/configs/etc/bind/named.conf | 20 +++++++++++++ run/secrets/var/bind/master/10.168 | 9 ++++++ run/secrets/var/bind/master/alejandro-colomar.com | 11 +++++++ 10 files changed, 108 insertions(+), 110 deletions(-) delete mode 100644 bind/etc/docker/swarm/release/dns-blue.yaml delete mode 100644 bind/etc/docker/swarm/release/dns.yaml delete mode 100644 bind/run/configs/etc/bind/named.conf delete mode 100644 bind/run/secrets/var/bind/master/10.168 delete mode 100644 bind/run/secrets/var/bind/master/alejandro-colomar.com create mode 100644 docker/swarm/release/dns-blue.yaml create mode 100644 docker/swarm/release/dns.yaml create mode 100644 run/configs/etc/bind/named.conf create mode 100644 run/secrets/var/bind/master/10.168 create mode 100644 run/secrets/var/bind/master/alejandro-colomar.com diff --git a/bind/etc/docker/swarm/release/dns-blue.yaml b/bind/etc/docker/swarm/release/dns-blue.yaml deleted file mode 100644 index c3b541a..0000000 --- a/bind/etc/docker/swarm/release/dns-blue.yaml +++ /dev/null @@ -1,35 +0,0 @@ -######################################################################### -# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # -# SPDX-License-Identifier: GPL-2.0-only # -######################################################################### - -configs: - named: - file: /run/configs/etc/bind/named.conf - -secrets: - forward: - file: /run/secrets/var/bind/master/alejandro-colomar.com - reverse: - file: /run/secrets/var/bind/master/10.168 - -services: - dns: - configs: - - mode: 0440 - source: named - target: /etc/bind/named.conf - deploy: - mode: global - image: "alejandrocolomar/dns.alejandro-colomar:v0.1" - ports: - - "5353:53/udp" - secrets: - - mode: 0440 - source: forward - target: var/bind/master/alejandro-colomar.com - - mode: 0440 - source: reverse - target: var/bind/master/10.168 - -version: '3.8' diff --git a/bind/etc/docker/swarm/release/dns.yaml b/bind/etc/docker/swarm/release/dns.yaml deleted file mode 100644 index 3833cd4..0000000 --- a/bind/etc/docker/swarm/release/dns.yaml +++ /dev/null @@ -1,35 +0,0 @@ -######################################################################### -# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # -# SPDX-License-Identifier: GPL-2.0-only # -######################################################################### - -configs: - named: - file: /run/configs/etc/bind/named.conf - -secrets: - forward: - file: /run/secrets/var/bind/master/alejandro-colomar.com - reverse: - file: /run/secrets/var/bind/master/10.168 - -services: - dns: - configs: - - mode: 0440 - source: named - target: /etc/bind/named.conf - deploy: - mode: global - image: "alejandrocolomar/dns.alejandro-colomar:v0.1" - ports: - - "53:53/udp" - secrets: - - mode: 0440 - source: forward - target: var/bind/master/alejandro-colomar.com - - mode: 0440 - source: reverse - target: var/bind/master/10.168 - -version: '3.8' diff --git a/bind/run/configs/etc/bind/named.conf b/bind/run/configs/etc/bind/named.conf deleted file mode 100644 index c3356b1..0000000 --- a/bind/run/configs/etc/bind/named.conf +++ /dev/null @@ -1,20 +0,0 @@ -options { - allow-query { any; }; - allow-recursion { none; }; - allow-transfer { none; }; - directory "/var/bind"; - listen-on-v6 { none; }; - pid-file "/var/run/named/named.pid"; - recursion no; -}; - -zone "alejandro-colomar.com" { - file "/run/secrets/var/bind/master/alejandro-colomar.com"; - type master; -}; - -zone "168.10.in-addr.arpa" IN { - file "/run/secrets/var/bind/master/10.168"; - type master; -}; - diff --git a/bind/run/secrets/var/bind/master/10.168 b/bind/run/secrets/var/bind/master/10.168 deleted file mode 100644 index 75e8b60..0000000 --- a/bind/run/secrets/var/bind/master/10.168 +++ /dev/null @@ -1,9 +0,0 @@ -$TTL 604800 -@ IN SOA dns.alejandro-colomar.com. root.dns.alejandro-colomar.com. ( - 1 - 604800 - 86400 - 2419200 - 604800 ) - IN NS dns.alejandro-colomar.com. -100.6 IN PTR robot.alejandro-colomar.com. diff --git a/bind/run/secrets/var/bind/master/alejandro-colomar.com b/bind/run/secrets/var/bind/master/alejandro-colomar.com deleted file mode 100644 index 18358ac..0000000 --- a/bind/run/secrets/var/bind/master/alejandro-colomar.com +++ /dev/null @@ -1,11 +0,0 @@ -$TTL 604800 -@ IN SOA dns.alejandro-colomar.com. root.dns.alejandro-colomar.com. ( - 2 - 604800 - 86400 - 2419200 - 604800 ) - IN NS dns.alejandro-colomar.com. -dns IN A 127.0.0.1 -kube-apiserver IN CNAME dns -robot IN A 10.168.6.100 diff --git a/docker/swarm/release/dns-blue.yaml b/docker/swarm/release/dns-blue.yaml new file mode 100644 index 0000000..06ef41d --- /dev/null +++ b/docker/swarm/release/dns-blue.yaml @@ -0,0 +1,34 @@ +######################################################################### +# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # +# SPDX-License-Identifier: GPL-2.0-only # +######################################################################### + +configs: + named: + file: /run/configs/etc/bind/named.conf + +secrets: + forward: + file: /run/secrets/var/bind/master/alejandro-colomar.com + reverse: + file: /run/secrets/var/bind/master/10.168 + +services: + dns: + configs: + - mode: 0440 + source: named + target: /etc/bind/named.conf + deploy: + mode: global + image: "alejandrocolomar/rob_cam:dns_0.5" + ports: + - "5353:53/udp" + secrets: + - mode: 0440 + source: forward + target: var/bind/master/alejandro-colomar.com + source: reverse + target: var/bind/master/10.168 + +version: '3.8' diff --git a/docker/swarm/release/dns.yaml b/docker/swarm/release/dns.yaml new file mode 100644 index 0000000..10b5ee1 --- /dev/null +++ b/docker/swarm/release/dns.yaml @@ -0,0 +1,34 @@ +######################################################################### +# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # +# SPDX-License-Identifier: GPL-2.0-only # +######################################################################### + +configs: + named: + file: /run/configs/etc/bind/named.conf + +secrets: + forward: + file: /run/secrets/var/bind/master/alejandro-colomar.com + reverse: + file: /run/secrets/var/bind/master/10.168 + +services: + dns: + configs: + - mode: 0440 + source: named + target: /etc/bind/named.conf + deploy: + mode: global + image: "alejandrocolomar/rob_cam:dns_0.5" + ports: + - "53:53/udp" + secrets: + - mode: 0440 + source: forward + target: var/bind/master/alejandro-colomar.com + source: reverse + target: var/bind/master/10.168 + +version: '3.8' diff --git a/run/configs/etc/bind/named.conf b/run/configs/etc/bind/named.conf new file mode 100644 index 0000000..e05e8f7 --- /dev/null +++ b/run/configs/etc/bind/named.conf @@ -0,0 +1,20 @@ +options { + allow-query { any; }; + allow-recursion { none; }; + allow-transfer { none; }; + directory "/var/bind"; + listen-on-v6 { none; }; + pid-file "/var/run/named/named.pid"; + recursion no; +}; + +zone "alejandro-colomar.com" { + file "master/alejandro-colomar.com"; + type master; +}; + +zone "168.10.in-addr.arpa" IN { + file "master/10.168"; + type master; +}; + diff --git a/run/secrets/var/bind/master/10.168 b/run/secrets/var/bind/master/10.168 new file mode 100644 index 0000000..75e8b60 --- /dev/null +++ b/run/secrets/var/bind/master/10.168 @@ -0,0 +1,9 @@ +$TTL 604800 +@ IN SOA dns.alejandro-colomar.com. root.dns.alejandro-colomar.com. ( + 1 + 604800 + 86400 + 2419200 + 604800 ) + IN NS dns.alejandro-colomar.com. +100.6 IN PTR robot.alejandro-colomar.com. diff --git a/run/secrets/var/bind/master/alejandro-colomar.com b/run/secrets/var/bind/master/alejandro-colomar.com new file mode 100644 index 0000000..18358ac --- /dev/null +++ b/run/secrets/var/bind/master/alejandro-colomar.com @@ -0,0 +1,11 @@ +$TTL 604800 +@ IN SOA dns.alejandro-colomar.com. root.dns.alejandro-colomar.com. ( + 2 + 604800 + 86400 + 2419200 + 604800 ) + IN NS dns.alejandro-colomar.com. +dns IN A 127.0.0.1 +kube-apiserver IN CNAME dns +robot IN A 10.168.6.100 -- cgit v1.2.3 From 743e5b2c4f758178dd2d683ca8c700eb743dce54 Mon Sep 17 00:00:00 2001 From: Sebastian Colomar Date: Thu, 28 May 2020 11:17:00 +0200 Subject: Fix devel Dockerfile --- bind/Dockerfile-devel | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bind/Dockerfile-devel b/bind/Dockerfile-devel index d9c3dd6..1ee30fc 100644 --- a/bind/Dockerfile-devel +++ b/bind/Dockerfile-devel @@ -11,8 +11,8 @@ FROM alpine/git@sha256:8d2aedf3898243892d170f033603b40a55e0b0a8ab68ba9762f9c0dae RUN \ git clone \ --single-branch \ - --branch bind \ - https://github.com/alejandro-colomar/dns.alejandro-colomar.git \ + --branch version-0.5 \ + https://github.com/alejandro-colomar/rob_cam.git \ /repo ############################################################################### @@ -24,11 +24,13 @@ FROM alpine@sha256:39eda93d15866957feaee28f8fc5adb545276a64147445c64992ef69804db RUN apk add --no-cache --upgrade bind ## configure dns server -COPY --from=git /repo/run/configs/etc/bind/named.conf \ +COPY --from=git /repo/bind/run/configs/etc/bind/named.conf \ /etc/bind/named.conf -COPY --from=git /repo/run/secrets/var/bind/master \ +COPY --from=git /repo/bind/run/secrets/var/bind/master \ /run/secrets/var/bind/master +RUN ln --symbolic /run/secrets/var/bind/master /var/bind + CMD ["named", "-c", "/etc/bind/named.conf", "-g"] ############################################################################### -- cgit v1.2.3 From 31be1ab2bdc1e48aa09621eb1d85c67e58176bc0 Mon Sep 17 00:00:00 2001 From: Sebastian Colomar Date: Thu, 28 May 2020 11:50:05 +0200 Subject: Correct syntax for YAML files --- docker/swarm/release/dns-blue.yaml | 6 ++-- docker/swarm/release/dns.yaml | 6 ++-- kubernetes/kube-compose.yaml | 63 +++++++++++++++++++++++++------------- 3 files changed, 50 insertions(+), 25 deletions(-) diff --git a/docker/swarm/release/dns-blue.yaml b/docker/swarm/release/dns-blue.yaml index 06ef41d..ecc94cf 100644 --- a/docker/swarm/release/dns-blue.yaml +++ b/docker/swarm/release/dns-blue.yaml @@ -16,7 +16,8 @@ secrets: services: dns: configs: - - mode: 0440 + - + mode: 0440 source: named target: /etc/bind/named.conf deploy: @@ -25,7 +26,8 @@ services: ports: - "5353:53/udp" secrets: - - mode: 0440 + - + mode: 0440 source: forward target: var/bind/master/alejandro-colomar.com source: reverse diff --git a/docker/swarm/release/dns.yaml b/docker/swarm/release/dns.yaml index 10b5ee1..f30b1fa 100644 --- a/docker/swarm/release/dns.yaml +++ b/docker/swarm/release/dns.yaml @@ -16,7 +16,8 @@ secrets: services: dns: configs: - - mode: 0440 + - + mode: 0440 source: named target: /etc/bind/named.conf deploy: @@ -25,7 +26,8 @@ services: ports: - "53:53/udp" secrets: - - mode: 0440 + - + mode: 0440 source: forward target: var/bind/master/alejandro-colomar.com source: reverse diff --git a/kubernetes/kube-compose.yaml b/kubernetes/kube-compose.yaml index 3146d09..40c68b3 100644 --- a/kubernetes/kube-compose.yaml +++ b/kubernetes/kube-compose.yaml @@ -17,7 +17,8 @@ spec: name: robot spec: containers: - - name: robot + - + name: robot image: alejandrocolomar/rob_cam:ur-sim_0.5 --- apiVersion: apps/v1 @@ -34,62 +35,74 @@ spec: name: rob spec: initContainers: - - name: init + - + name: init image: busybox command: - sh - -c - sleep 1 containers: - - name: rob + - + name: rob image: alejandrocolomar/rob_cam:rob_0.5 env: - - name: DELAY_LOGIN + - + name: DELAY_LOGIN valueFrom: secretKeyRef: name: rob-secret key: DELAY_LOGIN - - name: DELAY_US + - + name: DELAY_US valueFrom: secretKeyRef: name: rob-secret key: DELAY_US - - name: ROB_CAMS_MAX + - + name: ROB_CAMS_MAX valueFrom: secretKeyRef: name: rob-secret key: ROB_CAMS_MAX - - name: ROB_PORT + - + name: ROB_PORT valueFrom: secretKeyRef: name: rob-secret key: ROB_PORT - - name: ROBOT_ADDR + - + name: ROBOT_ADDR valueFrom: secretKeyRef: name: rob-secret key: ROBOT_ADDR - - name: ROBOT_PASSWD + - + name: ROBOT_PASSWD valueFrom: secretKeyRef: name: rob-secret key: ROBOT_PASSWD - - name: ROBOT_PORT + - + name: ROBOT_PORT valueFrom: secretKeyRef: name: rob-secret key: ROBOT_PORT - - name: ROBOT_STATUS_FNAME + - + name: ROBOT_STATUS_FNAME valueFrom: secretKeyRef: name: rob-secret key: ROBOT_STATUS_FNAME - - name: ROBOT_TYPE + - + name: ROBOT_TYPE valueFrom: secretKeyRef: name: rob-secret key: ROBOT_TYPE - - name: ROBOT_USER + - + name: ROBOT_USER valueFrom: secretKeyRef: name: rob-secret @@ -109,43 +122,51 @@ spec: name: cam spec: initContainers: - - name: init + - + name: init image: busybox command: - sh - -c - sleep 2 containers: - - name: cam + - + name: cam image: alejandrocolomar/rob_cam:cam_0.5 volumeMounts: - - name: dev-video0 + - + name: dev-video0 mountPath: /dev/video0 securityContext: privileged: true env: - - name: CAMERA_IDX + - + name: CAMERA_IDX valueFrom: secretKeyRef: name: cam-secret key: CAMERA_IDX - - name: DELAY_US + - + name: DELAY_US valueFrom: secretKeyRef: name: cam-secret key: DELAY_US - - name: ROB_ADDR + - + name: ROB_ADDR valueFrom: secretKeyRef: name: cam-secret key: ROB_ADDR - - name: ROB_PORT + - + name: ROB_PORT valueFrom: secretKeyRef: name: cam-secret key: ROB_PORT volumes: - - name: dev-video0 + - + name: dev-video0 hostPath: path: /dev/video0 --- -- cgit v1.2.3 From 7f2acb271129faf4f3075124f7e412fcc182acb9 Mon Sep 17 00:00:00 2001 From: Sebastian Colomar Date: Thu, 28 May 2020 12:11:58 +0200 Subject: Fix typo in secrets --- docker/swarm/release/dns-blue.yaml | 2 ++ docker/swarm/release/dns.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docker/swarm/release/dns-blue.yaml b/docker/swarm/release/dns-blue.yaml index ecc94cf..1cc4981 100644 --- a/docker/swarm/release/dns-blue.yaml +++ b/docker/swarm/release/dns-blue.yaml @@ -30,6 +30,8 @@ services: mode: 0440 source: forward target: var/bind/master/alejandro-colomar.com + - + mode: 0440 source: reverse target: var/bind/master/10.168 diff --git a/docker/swarm/release/dns.yaml b/docker/swarm/release/dns.yaml index f30b1fa..173d3a6 100644 --- a/docker/swarm/release/dns.yaml +++ b/docker/swarm/release/dns.yaml @@ -30,6 +30,8 @@ services: mode: 0440 source: forward target: var/bind/master/alejandro-colomar.com + - + mode: 0440 source: reverse target: var/bind/master/10.168 -- cgit v1.2.3 From a02ad11f7cf01543bfbf140c657ba8ea85b1ba92 Mon Sep 17 00:00:00 2001 From: Sebastian Colomar Date: Thu, 28 May 2020 12:13:41 +0200 Subject: Move conf files to etc --- docker/compose/docker-compose.yaml | 49 -------- docker/swarm/release/dns-blue.yaml | 38 ------ docker/swarm/release/dns.yaml | 38 ------ etc/docker/compose/docker-compose.yaml | 49 ++++++++ etc/docker/kubernetes/kube-compose.yaml | 216 ++++++++++++++++++++++++++++++++ etc/docker/kubernetes/kube-secrets.yaml | 39 ++++++ etc/docker/swarm/release/dns-blue.yaml | 38 ++++++ etc/docker/swarm/release/dns.yaml | 38 ++++++ kubernetes/kube-compose.yaml | 216 -------------------------------- kubernetes/kube-compose.yaml-PASSED | 0 kubernetes/kube-secrets.yaml | 39 ------ 11 files changed, 380 insertions(+), 380 deletions(-) delete mode 100644 docker/compose/docker-compose.yaml delete mode 100644 docker/swarm/release/dns-blue.yaml delete mode 100644 docker/swarm/release/dns.yaml create mode 100644 etc/docker/compose/docker-compose.yaml create mode 100644 etc/docker/kubernetes/kube-compose.yaml create mode 100644 etc/docker/kubernetes/kube-secrets.yaml create mode 100644 etc/docker/swarm/release/dns-blue.yaml create mode 100644 etc/docker/swarm/release/dns.yaml delete mode 100644 kubernetes/kube-compose.yaml delete mode 100644 kubernetes/kube-compose.yaml-PASSED delete mode 100644 kubernetes/kube-secrets.yaml diff --git a/docker/compose/docker-compose.yaml b/docker/compose/docker-compose.yaml deleted file mode 100644 index 2f2255f..0000000 --- a/docker/compose/docker-compose.yaml +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################### -# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # -# Copyright (C) 2020 Alejandro Colomar Andrés # -# SPDX-License-Identifier: GPL-2.0-only # -############################################################################### - -version: "2" - -services: - - cam: - image: alejandrocolomar/rob_cam:cam_0.5 - devices: - - "/dev/video0:/dev/video0" - environment: - - CAMERA_IDX=0 - - DELAY_US=10000 - - ROB_ADDR=rob - - ROB_PORT=13100 - depends_on: - - rob - restart: always - - rob: - image: alejandrocolomar/rob_cam:rob_0.5 - environment: - - DELAY_LOGIN=1000000 - - DELAY_US=100000 - - ROB_CAMS_MAX=1 - - ROB_PORT=13100 - - ROBOT_ADDR=robot - - ROBOT_PASSWD= - - ROBOT_PORT=30002 - - ROBOT_STATUS_FNAME=status.log -# - ROBOT_TYPE=kwr - - ROBOT_TYPE=ur - - ROBOT_USER= - depends_on: - - robot - restart: always - - robot: - image: alejandrocolomar/rob_cam:ur-sim_0.5 - restart: always - -################################################################################ -#sudo docker-compose up -d ; -#sudo docker-compose down ; -################################################################################ diff --git a/docker/swarm/release/dns-blue.yaml b/docker/swarm/release/dns-blue.yaml deleted file mode 100644 index 1cc4981..0000000 --- a/docker/swarm/release/dns-blue.yaml +++ /dev/null @@ -1,38 +0,0 @@ -######################################################################### -# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # -# SPDX-License-Identifier: GPL-2.0-only # -######################################################################### - -configs: - named: - file: /run/configs/etc/bind/named.conf - -secrets: - forward: - file: /run/secrets/var/bind/master/alejandro-colomar.com - reverse: - file: /run/secrets/var/bind/master/10.168 - -services: - dns: - configs: - - - mode: 0440 - source: named - target: /etc/bind/named.conf - deploy: - mode: global - image: "alejandrocolomar/rob_cam:dns_0.5" - ports: - - "5353:53/udp" - secrets: - - - mode: 0440 - source: forward - target: var/bind/master/alejandro-colomar.com - - - mode: 0440 - source: reverse - target: var/bind/master/10.168 - -version: '3.8' diff --git a/docker/swarm/release/dns.yaml b/docker/swarm/release/dns.yaml deleted file mode 100644 index 173d3a6..0000000 --- a/docker/swarm/release/dns.yaml +++ /dev/null @@ -1,38 +0,0 @@ -######################################################################### -# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # -# SPDX-License-Identifier: GPL-2.0-only # -######################################################################### - -configs: - named: - file: /run/configs/etc/bind/named.conf - -secrets: - forward: - file: /run/secrets/var/bind/master/alejandro-colomar.com - reverse: - file: /run/secrets/var/bind/master/10.168 - -services: - dns: - configs: - - - mode: 0440 - source: named - target: /etc/bind/named.conf - deploy: - mode: global - image: "alejandrocolomar/rob_cam:dns_0.5" - ports: - - "53:53/udp" - secrets: - - - mode: 0440 - source: forward - target: var/bind/master/alejandro-colomar.com - - - mode: 0440 - source: reverse - target: var/bind/master/10.168 - -version: '3.8' diff --git a/etc/docker/compose/docker-compose.yaml b/etc/docker/compose/docker-compose.yaml new file mode 100644 index 0000000..2f2255f --- /dev/null +++ b/etc/docker/compose/docker-compose.yaml @@ -0,0 +1,49 @@ +############################################################################### +# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # +# Copyright (C) 2020 Alejandro Colomar Andrés # +# SPDX-License-Identifier: GPL-2.0-only # +############################################################################### + +version: "2" + +services: + + cam: + image: alejandrocolomar/rob_cam:cam_0.5 + devices: + - "/dev/video0:/dev/video0" + environment: + - CAMERA_IDX=0 + - DELAY_US=10000 + - ROB_ADDR=rob + - ROB_PORT=13100 + depends_on: + - rob + restart: always + + rob: + image: alejandrocolomar/rob_cam:rob_0.5 + environment: + - DELAY_LOGIN=1000000 + - DELAY_US=100000 + - ROB_CAMS_MAX=1 + - ROB_PORT=13100 + - ROBOT_ADDR=robot + - ROBOT_PASSWD= + - ROBOT_PORT=30002 + - ROBOT_STATUS_FNAME=status.log +# - ROBOT_TYPE=kwr + - ROBOT_TYPE=ur + - ROBOT_USER= + depends_on: + - robot + restart: always + + robot: + image: alejandrocolomar/rob_cam:ur-sim_0.5 + restart: always + +################################################################################ +#sudo docker-compose up -d ; +#sudo docker-compose down ; +################################################################################ diff --git a/etc/docker/kubernetes/kube-compose.yaml b/etc/docker/kubernetes/kube-compose.yaml new file mode 100644 index 0000000..40c68b3 --- /dev/null +++ b/etc/docker/kubernetes/kube-compose.yaml @@ -0,0 +1,216 @@ +############################################################################### +# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # +# SPDX-License-Identifier: GPL-2.0-only # +############################################################################### +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: robot +spec: + selector: + matchLabels: + name: robot + template: + metadata: + labels: + name: robot + spec: + containers: + - + name: robot + image: alejandrocolomar/rob_cam:ur-sim_0.5 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: rob +spec: + selector: + matchLabels: + name: rob + template: + metadata: + 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: DELAY_US + valueFrom: + secretKeyRef: + name: rob-secret + key: DELAY_US + - + name: ROB_CAMS_MAX + valueFrom: + secretKeyRef: + name: rob-secret + key: ROB_CAMS_MAX + - + name: ROB_PORT + valueFrom: + secretKeyRef: + name: rob-secret + key: ROB_PORT + - + name: ROBOT_ADDR + valueFrom: + secretKeyRef: + name: rob-secret + key: ROBOT_ADDR + - + name: ROBOT_PASSWD + valueFrom: + secretKeyRef: + name: rob-secret + key: ROBOT_PASSWD + - + name: ROBOT_PORT + valueFrom: + secretKeyRef: + name: rob-secret + key: ROBOT_PORT + - + name: ROBOT_STATUS_FNAME + valueFrom: + secretKeyRef: + name: rob-secret + key: ROBOT_STATUS_FNAME + - + name: ROBOT_TYPE + valueFrom: + secretKeyRef: + name: rob-secret + key: ROBOT_TYPE + - + name: ROBOT_USER + valueFrom: + secretKeyRef: + name: rob-secret + key: ROBOT_USER +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cam +spec: + selector: + matchLabels: + name: cam + template: + metadata: + 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: DELAY_US + valueFrom: + secretKeyRef: + name: cam-secret + key: DELAY_US + - + name: ROB_ADDR + valueFrom: + secretKeyRef: + name: cam-secret + key: ROB_ADDR + - + name: ROB_PORT + valueFrom: + secretKeyRef: + name: cam-secret + key: ROB_PORT + volumes: + - + name: dev-video0 + hostPath: + path: /dev/video0 +--- +apiVersion: v1 +kind: Service +metadata: + name: robot +spec: + selector: + name: robot + ports: + - port: 30002 +--- +apiVersion: v1 +kind: Service +metadata: + name: rob +spec: + selector: + name: rob + ports: + - port: 13100 + +################################################################################ +#sudo apt-get update && sudo apt-get install -y apt-transport-https curl ; +#echo deb http://apt.kubernetes.io/ kubernetes-xenial main \ +# | sudo tee -a /etc/apt/sources.list.d/kubernetes.list ; +#curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg \ +# | sudo apt-key add - ; +#sudo apt-get update && sudo apt-get install -y docker-ce ; +#sudo apt-get install -y kubelet kubeadm kubectl ; +#sudo apt-mark hold kubelet kubeadm kubectl ; +#ip=< PRIVATE IP OF THE KUBERNETES MASTER > ; +#echo $ip k8smaster | sudo tee -a /etc/hosts ; +#sudo kubeadm init \ +# --control-plane-endpoint=k8smaster \ +# --pod-network-cidr=192.168.0.0/16 \ +# --ignore-preflight-errors=all ; +#mkdir -p $HOME/.kube ; +#sudo cp /etc/kubernetes/admin.conf $HOME/.kube/config ; +#sudo chown $(id -u):$(id -g) $HOME/.kube/config ; +#kubectl apply -f https://docs.projectcalico.org/v3.8/manifests/calico.yaml ; +#echo "source <(kubectl completion bash)" >> ~/.bashrc ; +#kubectl taint node ideapad node-role.kubernetes.io/master:NoSchedule- ; +#kubectl apply --filename . --recursive ; +#kubectl delete --filename . --recursive ; +################################################################################ diff --git a/etc/docker/kubernetes/kube-secrets.yaml b/etc/docker/kubernetes/kube-secrets.yaml new file mode 100644 index 0000000..7ab36ba --- /dev/null +++ b/etc/docker/kubernetes/kube-secrets.yaml @@ -0,0 +1,39 @@ +############################################################################### +# Copyright (C) 2020 Alejandro Colomar Andrés # +# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # +# SPDX-License-Identifier: GPL-2.0-only # +############################################################################### +--- +apiVersion: v1 +kind: Secret +metadata: + name: cam-secret +stringData: + CAMERA_IDX: "0" + DELAY_US: "10000" + ROB_ADDR: "rob" + ROB_PORT: "13100" +type: Opaque +--- +apiVersion: v1 +kind: Secret +metadata: + name: rob-secret +stringData: + DELAY_LOGIN: "1000000" + DELAY_US: "100000" + ROB_CAMS_MAX: "1" + ROB_PORT: "13100" + ROBOT_ADDR: "robot" + ROBOT_PASSWD: "" + ROBOT_PORT: "30002" + ROBOT_STATUS_FNAME: "status.log" +# ROBOT_TYPE: "kwr" + ROBOT_TYPE: "ur" + ROBOT_USER: "" +type: Opaque +--- +################################################################################ +#kubectl apply --filename kube-secrets.yaml ; +#kubectl delete --filename kube-secrets.yaml ; +################################################################################ diff --git a/etc/docker/swarm/release/dns-blue.yaml b/etc/docker/swarm/release/dns-blue.yaml new file mode 100644 index 0000000..1cc4981 --- /dev/null +++ b/etc/docker/swarm/release/dns-blue.yaml @@ -0,0 +1,38 @@ +######################################################################### +# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # +# SPDX-License-Identifier: GPL-2.0-only # +######################################################################### + +configs: + named: + file: /run/configs/etc/bind/named.conf + +secrets: + forward: + file: /run/secrets/var/bind/master/alejandro-colomar.com + reverse: + file: /run/secrets/var/bind/master/10.168 + +services: + dns: + configs: + - + mode: 0440 + source: named + target: /etc/bind/named.conf + deploy: + mode: global + image: "alejandrocolomar/rob_cam:dns_0.5" + ports: + - "5353:53/udp" + secrets: + - + mode: 0440 + source: forward + target: var/bind/master/alejandro-colomar.com + - + mode: 0440 + source: reverse + target: var/bind/master/10.168 + +version: '3.8' diff --git a/etc/docker/swarm/release/dns.yaml b/etc/docker/swarm/release/dns.yaml new file mode 100644 index 0000000..173d3a6 --- /dev/null +++ b/etc/docker/swarm/release/dns.yaml @@ -0,0 +1,38 @@ +######################################################################### +# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # +# SPDX-License-Identifier: GPL-2.0-only # +######################################################################### + +configs: + named: + file: /run/configs/etc/bind/named.conf + +secrets: + forward: + file: /run/secrets/var/bind/master/alejandro-colomar.com + reverse: + file: /run/secrets/var/bind/master/10.168 + +services: + dns: + configs: + - + mode: 0440 + source: named + target: /etc/bind/named.conf + deploy: + mode: global + image: "alejandrocolomar/rob_cam:dns_0.5" + ports: + - "53:53/udp" + secrets: + - + mode: 0440 + source: forward + target: var/bind/master/alejandro-colomar.com + - + mode: 0440 + source: reverse + target: var/bind/master/10.168 + +version: '3.8' diff --git a/kubernetes/kube-compose.yaml b/kubernetes/kube-compose.yaml deleted file mode 100644 index 40c68b3..0000000 --- a/kubernetes/kube-compose.yaml +++ /dev/null @@ -1,216 +0,0 @@ -############################################################################### -# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # -# SPDX-License-Identifier: GPL-2.0-only # -############################################################################### ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: robot -spec: - selector: - matchLabels: - name: robot - template: - metadata: - labels: - name: robot - spec: - containers: - - - name: robot - image: alejandrocolomar/rob_cam:ur-sim_0.5 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: rob -spec: - selector: - matchLabels: - name: rob - template: - metadata: - 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: DELAY_US - valueFrom: - secretKeyRef: - name: rob-secret - key: DELAY_US - - - name: ROB_CAMS_MAX - valueFrom: - secretKeyRef: - name: rob-secret - key: ROB_CAMS_MAX - - - name: ROB_PORT - valueFrom: - secretKeyRef: - name: rob-secret - key: ROB_PORT - - - name: ROBOT_ADDR - valueFrom: - secretKeyRef: - name: rob-secret - key: ROBOT_ADDR - - - name: ROBOT_PASSWD - valueFrom: - secretKeyRef: - name: rob-secret - key: ROBOT_PASSWD - - - name: ROBOT_PORT - valueFrom: - secretKeyRef: - name: rob-secret - key: ROBOT_PORT - - - name: ROBOT_STATUS_FNAME - valueFrom: - secretKeyRef: - name: rob-secret - key: ROBOT_STATUS_FNAME - - - name: ROBOT_TYPE - valueFrom: - secretKeyRef: - name: rob-secret - key: ROBOT_TYPE - - - name: ROBOT_USER - valueFrom: - secretKeyRef: - name: rob-secret - key: ROBOT_USER ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cam -spec: - selector: - matchLabels: - name: cam - template: - metadata: - 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: DELAY_US - valueFrom: - secretKeyRef: - name: cam-secret - key: DELAY_US - - - name: ROB_ADDR - valueFrom: - secretKeyRef: - name: cam-secret - key: ROB_ADDR - - - name: ROB_PORT - valueFrom: - secretKeyRef: - name: cam-secret - key: ROB_PORT - volumes: - - - name: dev-video0 - hostPath: - path: /dev/video0 ---- -apiVersion: v1 -kind: Service -metadata: - name: robot -spec: - selector: - name: robot - ports: - - port: 30002 ---- -apiVersion: v1 -kind: Service -metadata: - name: rob -spec: - selector: - name: rob - ports: - - port: 13100 - -################################################################################ -#sudo apt-get update && sudo apt-get install -y apt-transport-https curl ; -#echo deb http://apt.kubernetes.io/ kubernetes-xenial main \ -# | sudo tee -a /etc/apt/sources.list.d/kubernetes.list ; -#curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg \ -# | sudo apt-key add - ; -#sudo apt-get update && sudo apt-get install -y docker-ce ; -#sudo apt-get install -y kubelet kubeadm kubectl ; -#sudo apt-mark hold kubelet kubeadm kubectl ; -#ip=< PRIVATE IP OF THE KUBERNETES MASTER > ; -#echo $ip k8smaster | sudo tee -a /etc/hosts ; -#sudo kubeadm init \ -# --control-plane-endpoint=k8smaster \ -# --pod-network-cidr=192.168.0.0/16 \ -# --ignore-preflight-errors=all ; -#mkdir -p $HOME/.kube ; -#sudo cp /etc/kubernetes/admin.conf $HOME/.kube/config ; -#sudo chown $(id -u):$(id -g) $HOME/.kube/config ; -#kubectl apply -f https://docs.projectcalico.org/v3.8/manifests/calico.yaml ; -#echo "source <(kubectl completion bash)" >> ~/.bashrc ; -#kubectl taint node ideapad node-role.kubernetes.io/master:NoSchedule- ; -#kubectl apply --filename . --recursive ; -#kubectl delete --filename . --recursive ; -################################################################################ diff --git a/kubernetes/kube-compose.yaml-PASSED b/kubernetes/kube-compose.yaml-PASSED deleted file mode 100644 index e69de29..0000000 diff --git a/kubernetes/kube-secrets.yaml b/kubernetes/kube-secrets.yaml deleted file mode 100644 index 7ab36ba..0000000 --- a/kubernetes/kube-secrets.yaml +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################### -# Copyright (C) 2020 Alejandro Colomar Andrés # -# Copyright (C) 2020 Sebastian Francisco Colomar Bauza # -# SPDX-License-Identifier: GPL-2.0-only # -############################################################################### ---- -apiVersion: v1 -kind: Secret -metadata: - name: cam-secret -stringData: - CAMERA_IDX: "0" - DELAY_US: "10000" - ROB_ADDR: "rob" - ROB_PORT: "13100" -type: Opaque ---- -apiVersion: v1 -kind: Secret -metadata: - name: rob-secret -stringData: - DELAY_LOGIN: "1000000" - DELAY_US: "100000" - ROB_CAMS_MAX: "1" - ROB_PORT: "13100" - ROBOT_ADDR: "robot" - ROBOT_PASSWD: "" - ROBOT_PORT: "30002" - ROBOT_STATUS_FNAME: "status.log" -# ROBOT_TYPE: "kwr" - ROBOT_TYPE: "ur" - ROBOT_USER: "" -type: Opaque ---- -################################################################################ -#kubectl apply --filename kube-secrets.yaml ; -#kubectl delete --filename kube-secrets.yaml ; -################################################################################ -- cgit v1.2.3 From b0cead4580ae83a79f30d925623cf9ae7587e4c0 Mon Sep 17 00:00:00 2001 From: Sebastian Colomar Date: Thu, 28 May 2020 12:19:45 +0200 Subject: Fix alphabetical order in YAML --- etc/docker/compose/docker-compose.yaml | 12 ++--- etc/docker/kubernetes/kube-compose.yaml | 92 ++++++++++++++++----------------- 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 ; -- cgit v1.2.3