From 10d510b16ad0e7a1217be89369fcb3acbb257b8b Mon Sep 17 00:00:00 2001 From: vaibhav_16dec Date: Wed, 17 Jan 2018 15:40:59 +0000 Subject: Robot config seggregation Issue-ID: OOM-560 Change-Id: Iee9c7c78c6eb53b14b31d6e31f1539040daa88ba Signed-off-by: vaibhav_16dec --- templates/robot-dep-configmap.yaml | 25 +++++++++++++++++++++++++ templates/robot-deployment.yaml | 33 ++++++++++++++++----------------- 2 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 templates/robot-dep-configmap.yaml (limited to 'templates') diff --git a/templates/robot-dep-configmap.yaml b/templates/robot-dep-configmap.yaml new file mode 100644 index 0000000..94e359d --- /dev/null +++ b/templates/robot-dep-configmap.yaml @@ -0,0 +1,25 @@ +#{{ if not .Values.disableRobot }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: robot-eteshare-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/eteshare/config/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: robot-resources-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/robot/resources/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: lighttpd-authorization-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/authorization").AsConfig . | indent 2 }} +#{{ end }} diff --git a/templates/robot-deployment.yaml b/templates/robot-deployment.yaml index a978ff4..9f936e8 100644 --- a/templates/robot-deployment.yaml +++ b/templates/robot-deployment.yaml @@ -24,15 +24,19 @@ spec: mountPath: /etc/localtime readOnly: true - name: robot-eteshare - mountPath: /share - - name: robot-resources-asdc-interface + mountPath: /share/config + - name: robot-resources mountPath: /var/opt/OpenECOMP_ETE/robot/resources/asdc_interface.robot - - name: robot-resources-policy-interface + subPath: asdc_interface.robot + - name: robot-resources mountPath: /var/opt/OpenECOMP_ETE/robot/resources/policy_interface.robot - - name: robot-resources-sdngc-interface + subPath: policy_interface.robot + - name: robot-resources mountPath: /var/opt/OpenECOMP_ETE/robot/resources/sdngc_interface.robot + subPath: sdngc_interface.robot - name: lighttpd-authorization mountPath: /etc/lighttpd/authorization + subPath: authorization ports: - containerPort: 88 readinessProbe: @@ -45,20 +49,15 @@ spec: hostPath: path: /etc/localtime - name: robot-eteshare - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/eteshare - - name: robot-resources-asdc-interface - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/resources/asdc_interface.robot - - name: robot-resources-policy-interface - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/resources/policy_interface.robot - - name: robot-resources-sdngc-interface - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/resources/sdngc_interface.robot + configMap: + name: robot-eteshare-configmap + defaultMode: 0755 + - name: robot-resources + configMap: + name: robot-resources-configmap - name: lighttpd-authorization - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/authorization + configMap: + name: lighttpd-authorization-configmap imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} -- cgit 1.2.3-korg