From 930bd69e63894941e4b2e4612f5c43bd6276a604 Mon Sep 17 00:00:00 2001
From: Mandeep Khinda <mandeep.khinda@amdocs.com>
Date: Tue, 20 Mar 2018 21:00:33 +0000
Subject: fixing standardized robot

-fixed communication via kube dns
-using fullname to avoid possible conflicts
-removed unused values
-set image to 1.2-STAGING-latest (for master)
-set demo artifacts to the master version 1.2.0-SNAPSHOT
-removed dependency on other reviews

Issue-ID: OOM-728

Change-Id: I60530215374149dd9d0e0706e37712ed8291ab6c
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
---
 kubernetes/robot/templates/configmap.yaml  | 6 +++---
 kubernetes/robot/templates/deployment.yaml | 8 ++++----
 kubernetes/robot/templates/service.yaml    | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kubernetes/robot/templates')

diff --git a/kubernetes/robot/templates/configmap.yaml b/kubernetes/robot/templates/configmap.yaml
index dad3af43f9..ab4a10bf9b 100644
--- a/kubernetes/robot/templates/configmap.yaml
+++ b/kubernetes/robot/templates/configmap.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.name" . }}-eteshare-configmap
+  name: {{ include "common.fullname" . }}-eteshare-configmap
   namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/eteshare/config/*").AsConfig . | indent 2 }}
@@ -23,7 +23,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.name" . }}-resources-configmap
+  name: {{ include "common.fullname" . }}-resources-configmap
   namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/robot/resources/*").AsConfig . | indent 2 }}
@@ -31,7 +31,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.name" . }}-lighttpd-authorization-configmap
+  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 513e4cec7e..3403810d20 100644
--- a/kubernetes/robot/templates/deployment.yaml
+++ b/kubernetes/robot/templates/deployment.yaml
@@ -15,7 +15,7 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ include "common.name" . }}
+  name: {{ include "common.fullname" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
@@ -84,13 +84,13 @@ spec:
             path: /etc/localtime
         - name: robot-eteshare
           configMap:
-            name: {{ include "common.name" . }}-eteshare-configmap
+            name: {{ include "common.fullname" . }}-eteshare-configmap
             defaultMode: 0755
         - name: robot-resources
           configMap:
-            name: {{ include "common.name" . }}-resources-configmap
+            name: {{ include "common.fullname" . }}-resources-configmap
         - name: robot-lighttpd-authorization
           configMap:
-            name: {{ include "common.name" . }}-lighttpd-authorization-configmap
+            name: {{ include "common.fullname" . }}-lighttpd-authorization-configmap
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/robot/templates/service.yaml b/kubernetes/robot/templates/service.yaml
index c71fca5ff6..f9f2805f00 100644
--- a/kubernetes/robot/templates/service.yaml
+++ b/kubernetes/robot/templates/service.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "common.name" . }}
+  name: {{ include "common.fullname" . }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
-- 
cgit 1.2.3-korg