From 6344b1083e82c2d3e523e2407275a0aec1330f3d Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Mon, 30 Jul 2018 10:28:46 -0700
Subject: Use VNF heat templates in the testsuite image

Change to use the VNF templates already cloned inside
the testsuite docker image intead of relying on an
external copy.

Also remove unnessary ConfigMaps and initContainers
as a result of this change.

Change-Id: Idedb48169e497d3485dcb89279d1ed5f3356105a
Issue-ID: INT-605
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 templates/deployment.yaml | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'templates/deployment.yaml')

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index 1297760..3b07602 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -30,21 +30,6 @@ spec:
         app: {{ include "common.name" . }}
         release: {{ .Release.Name }}
     spec:
-      initContainers:
-      - name: {{ include "common.name" . }}-inject-demo-project
-        command:
-        - /bin/bash
-        - -c
-        - >
-          git clone -b {{ .Values.config.gerritBranch }} --single-branch {{ .Values.config.gerritProject }} /tmp/gerrit;
-          echo "Clone complete. Copying from /tmp/gerrit/heat to /share";
-          cp -rf /tmp/gerrit/heat /share;
-          echo "Done.";
-        image: "{{ .Values.global.ubuntuInitRepository }}/{{ .Values.ubuntuInitImage }}"
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        volumeMounts:
-        - name: demodir
-          mountPath: "/share"
       containers:
       - name: {{ include "common.name" . }}
         image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@ -69,11 +54,6 @@ spec:
           readOnly: true
         - name: robot-eteshare
           mountPath: /share/config
-        - name: robot-lighttpd-authorization
-          mountPath: /etc/lighttpd/authorization
-          subPath: authorization
-        - name: demodir
-          mountPath: /share
         - name: robot-logs
           mountPath: /share/logs
         resources:
@@ -101,10 +81,5 @@ spec:
         configMap:
           name: {{ include "common.fullname" . }}-eteshare-configmap
           defaultMode: 0755
-      - name: robot-lighttpd-authorization
-        configMap:
-          name: {{ include "common.fullname" . }}-lighttpd-authorization-configmap
-      - name: demodir
-        emptyDir: {}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
-- 
cgit 1.2.3-korg