diff options
| author | Sebastian Colomar <sebastian.colomar@gmail.com> | 2020-05-12 10:37:17 +0200 |
|---|---|---|
| committer | Sebastian Colomar <sebastian.colomar@gmail.com> | 2020-05-12 10:37:17 +0200 |
| commit | 8d5150d075dc384fd80608606d865714ec828c33 (patch) | |
| tree | 2203d33e2b4a179203a3af01ceff0666c5786615 | |
| parent | dca04dcbac88e80925cb78b2961266a97940cd33 (diff) | |
| parent | 2689a2c6322a6d57251702f90ece5f707f813b41 (diff) | |
Merge branch 'version-0.5' of github.com:alejandro-colomar/rob_cam into version-0.5
| -rw-r--r-- | kubernetes/cam.conf | 4 | ||||
| -rw-r--r-- | kubernetes/kube-compose.yaml | 72 | ||||
| -rw-r--r-- | kubernetes/rob.conf | 11 | ||||
| -rw-r--r-- | kubernetes/secrets.yaml | 39 |
4 files changed, 95 insertions, 31 deletions
diff --git a/kubernetes/cam.conf b/kubernetes/cam.conf deleted file mode 100644 index 65bc87b..0000000 --- a/kubernetes/cam.conf +++ /dev/null @@ -1,4 +0,0 @@ -CAMERA_IDX="0" -DELAY_US="10000" -ROB_ADDR="rob" -ROB_PORT="13100" diff --git a/kubernetes/kube-compose.yaml b/kubernetes/kube-compose.yaml index 21e278a..f310f58 100644 --- a/kubernetes/kube-compose.yaml +++ b/kubernetes/kube-compose.yaml @@ -45,27 +45,55 @@ spec: image: alejandrocolomar/rob_cam:rob_0.5 env: - name: DELAY_LOGIN - value: "1000000" + valueFrom: + secretKeyRef: + name: rob-secret + key: DELAY_LOGIN - name: DELAY_US - value: "100000" + valueFrom: + secretKeyRef: + name: rob-secret + key: DELAY_US - name: ROB_CAMS_MAX - value: "1" + valueFrom: + secretKeyRef: + name: rob-secret + key: ROB_CAMS_MAX - name: ROB_PORT - value: "13100" + valueFrom: + secretKeyRef: + name: rob-secret + key: ROB_PORT - name: ROBOT_ADDR - value: "robot" + valueFrom: + secretKeyRef: + name: rob-secret + key: ROBOT_ADDR - name: ROBOT_PASSWD - value: "" + valueFrom: + secretKeyRef: + name: rob-secret + key: ROBOT_PASSWD - name: ROBOT_PORT - value: "30002" + valueFrom: + secretKeyRef: + name: rob-secret + key: ROBOT_PORT - name: ROBOT_STATUS_FNAME - value: "status.log" -# - name: ROBOT_TYPE -# value: "kwr" + valueFrom: + secretKeyRef: + name: rob-secret + key: ROBOT_STATUS_FNAME - name: ROBOT_TYPE - value: "ur" + valueFrom: + secretKeyRef: + name: rob-secret + key: ROBOT_TYPE - name: ROBOT_USER - value: "" + valueFrom: + secretKeyRef: + name: rob-secret + key: ROBOT_USER --- apiVersion: apps/v1 kind: Deployment @@ -97,13 +125,25 @@ spec: privileged: true env: - name: CAMERA_IDX - value: "0" + valueFrom: + secretKeyRef: + name: cam-secret + key: CAMERA_IDX - name: DELAY_US - value: "10000" + valueFrom: + secretKeyRef: + name: cam-secret + key: DELAY_US - name: ROB_ADDR - value: "rob" + valueFrom: + secretKeyRef: + name: cam-secret + key: ROB_ADDR - name: ROB_PORT - value: "13100" + valueFrom: + secretKeyRef: + name: cam-secret + key: ROB_PORT volumes: - name: dev-video0 hostPath: diff --git a/kubernetes/rob.conf b/kubernetes/rob.conf deleted file mode 100644 index bde93db..0000000 --- a/kubernetes/rob.conf +++ /dev/null @@ -1,11 +0,0 @@ -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="" diff --git a/kubernetes/secrets.yaml b/kubernetes/secrets.yaml new file mode 100644 index 0000000..79f1cd7 --- /dev/null +++ b/kubernetes/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 secrets.yaml ; +#kubectl delete --filename secrets.yaml ; +################################################################################ |