From 4325047cb045e33fab214f45d3eca49f399bdc8b Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Mon, 30 Jul 2018 15:27:14 -0700 Subject: Refactor OOM robot changes into demo/testsuite Refactor OOM-specific robot overrides to make them generic to both HEAT and OOM; remove OOM-specific robot overrides to prevent dual-maintenance between OOM robot and HEAT robot. Change-Id: I0030d8978cdbd50a12400aaba2f21778745f0431 Issue-ID: INT-605 Signed-off-by: Gary Wu --- kubernetes/robot/templates/configmap.yaml | 8 -------- kubernetes/robot/templates/deployment.yaml | 12 ------------ 2 files changed, 20 deletions(-) (limited to 'kubernetes/robot/templates') diff --git a/kubernetes/robot/templates/configmap.yaml b/kubernetes/robot/templates/configmap.yaml index ab4a10bf9b..e4096b0b06 100644 --- a/kubernetes/robot/templates/configmap.yaml +++ b/kubernetes/robot/templates/configmap.yaml @@ -22,14 +22,6 @@ data: --- apiVersion: v1 kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-resources-configmap - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/config/robot/resources/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap metadata: name: {{ include "common.fullname" . }}-lighttpd-authorization-configmap namespace: {{ include "common.namespace" . }} diff --git a/kubernetes/robot/templates/deployment.yaml b/kubernetes/robot/templates/deployment.yaml index e5cc1d3a0f..12977601e0 100644 --- a/kubernetes/robot/templates/deployment.yaml +++ b/kubernetes/robot/templates/deployment.yaml @@ -69,15 +69,6 @@ spec: readOnly: true - name: robot-eteshare mountPath: /share/config - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/policy_interface.robot - subPath: policy_interface.robot - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/sdngc_interface.robot - subPath: sdngc_interface.robot - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/oof_interface.robot - subPath: oof_interface.robot - name: robot-lighttpd-authorization mountPath: /etc/lighttpd/authorization subPath: authorization @@ -110,9 +101,6 @@ spec: configMap: name: {{ include "common.fullname" . }}-eteshare-configmap defaultMode: 0755 - - name: robot-resources - configMap: - name: {{ include "common.fullname" . }}-resources-configmap - name: robot-lighttpd-authorization configMap: name: {{ include "common.fullname" . }}-lighttpd-authorization-configmap -- cgit 1.2.3-korg