summaryrefslogtreecommitdiffstats
path: root/kubernetes/robot/templates
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-07-30 10:28:46 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-08-08 13:42:41 -0700
commitdd00f7941f8d0b4720e310ab3225b5f56d06bf1f (patch)
tree80d605cbdeeada2e7856a827849da7d696ee0f89 /kubernetes/robot/templates
parent3f56c825b4da4a2eb0b6bbdee4e985970324fa52 (diff)
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>
Diffstat (limited to 'kubernetes/robot/templates')
-rw-r--r--kubernetes/robot/templates/configmap.yaml4
-rw-r--r--kubernetes/robot/templates/deployment.yaml25
2 files changed, 0 insertions, 29 deletions
diff --git a/kubernetes/robot/templates/configmap.yaml b/kubernetes/robot/templates/configmap.yaml
index e4096b0b06..6664c0d9a1 100644
--- a/kubernetes/robot/templates/configmap.yaml
+++ b/kubernetes/robot/templates/configmap.yaml
@@ -23,7 +23,3 @@ data:
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-lighttpd-authorization-configmap
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/authorization").AsConfig . | indent 2 }}
diff --git a/kubernetes/robot/templates/deployment.yaml b/kubernetes/robot/templates/deployment.yaml
index 12977601e0..3b076029d9 100644
--- a/kubernetes/robot/templates/deployment.yaml
+++ b/kubernetes/robot/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"