From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 8 Aug 2018 21:07:29 +0000 (-0700)
Subject: Bug fix on gerrit 58053 rebase.
X-Git-Tag: 3.0.0-ONAP~460
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=08986330f2c71e54ae28a0f0aeaeb5fbfc8cea94;p=oom.git

Bug fix on gerrit 58053 rebase.

An extraneous block of text in the robot configmap
was left in during the rebase of gerrit 58053
patchset 3.  This fixes the issue.

Change-Id: I0a705720adfc3e40581b411329d194cda4588a48
Issue-ID: INT-605
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/kubernetes/robot/templates/configmap.yaml b/kubernetes/robot/templates/configmap.yaml
index 6664c0d9a1..42579e16e4 100644
--- a/kubernetes/robot/templates/configmap.yaml
+++ b/kubernetes/robot/templates/configmap.yaml
@@ -19,7 +19,3 @@ metadata:
   namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/eteshare/config/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata: