From 9eee6ac9daa5b82946b4f7c7eaa817ae3e1f4cab Mon Sep 17 00:00:00 2001
From: Michael O'Brien <frank.obrien@amdocs.com>
Date: Mon, 25 Jun 2018 13:59:31 -0400
Subject: logging library use and k8s

Change-Id: I264f6dd5270543a216612c50fd5806458e0e806a
Issue-ID: LOG-135
Signed-off-by: Michael O'Brien <frank.obrien@amdocs.com>
---
 .../logdemo/templates/all-services.yaml            | 10 ++---
 .../templates/log-mock-demo-deployment.yaml        | 43 ----------------------
 .../templates/log-mock-service-deployment.yaml     | 43 ++++++++++++++++++++++
 3 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 reference/logging-kubernetes/logdemo/templates/log-mock-demo-deployment.yaml
 create mode 100644 reference/logging-kubernetes/logdemo/templates/log-mock-service-deployment.yaml

(limited to 'reference/logging-kubernetes/logdemo/templates')

diff --git a/reference/logging-kubernetes/logdemo/templates/all-services.yaml b/reference/logging-kubernetes/logdemo/templates/all-services.yaml
index 9e4f694..dc57183 100644
--- a/reference/logging-kubernetes/logdemo/templates/all-services.yaml
+++ b/reference/logging-kubernetes/logdemo/templates/all-services.yaml
@@ -2,13 +2,13 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: logdemo
-  name: logdemo
-  namespace: "{{ .Values.nsPrefix }}-logdemo"
+    app: logservice
+  name: logservice
+  namespace: "{{ .Values.nsPrefix }}-logservice"
 spec:
   ports:
   - port: 8080
-    nodePort: {{ .Values.nodePortPrefix }}99
+    nodePort: {{ .Values.nodePortPrefix }}98
   selector:
-    app: logdemo
+    app: logservice
   type: NodePort
diff --git a/reference/logging-kubernetes/logdemo/templates/log-mock-demo-deployment.yaml b/reference/logging-kubernetes/logdemo/templates/log-mock-demo-deployment.yaml
deleted file mode 100644
index afd513e..0000000
--- a/reference/logging-kubernetes/logdemo/templates/log-mock-demo-deployment.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-#{{ if not .Values.disableLogdemoLogdemo }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: logdemo
-  namespace: "{{ .Values.nsPrefix }}-logdemo"
-spec:
-  selector:
-    matchLabels:
-      app: logdemo
-  template:
-    metadata:
-       labels:
-        app: logdemo
-       name: logdemo
-    spec:
-      containers:
-      - image: {{ .Values.image.logdemo }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: logdemo
-        volumeMounts:
-        - name: localtime
-          mountPath: /etc/localtime
-          readOnly: true
-        - name: logdemo-eteshare
-          mountPath: /share
-        ports:
-        - containerPort: 8080
-        readinessProbe:
-          tcpSocket:
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-        - name: logdemo-eteshare
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/logdemo/eteshare
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/reference/logging-kubernetes/logdemo/templates/log-mock-service-deployment.yaml b/reference/logging-kubernetes/logdemo/templates/log-mock-service-deployment.yaml
new file mode 100644
index 0000000..92bcbe8
--- /dev/null
+++ b/reference/logging-kubernetes/logdemo/templates/log-mock-service-deployment.yaml
@@ -0,0 +1,43 @@
+#{{ if not .Values.disableLogserviceLogservice }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: logservice
+  namespace: "{{ .Values.nsPrefix }}-logservice"
+spec:
+  selector:
+    matchLabels:
+      app: logservice
+  template:
+    metadata:
+       labels:
+        app: logservice
+       name: logservice
+    spec:
+      containers:
+      - image: {{ .Values.image.logservice }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: logservice
+        volumeMounts:
+        - name: localtime
+          mountPath: /etc/localtime
+          readOnly: true
+        - name: logservice-eteshare
+          mountPath: /share
+        ports:
+        - containerPort: 8080
+        readinessProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      volumes:
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
+        - name: logservice-eteshare
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/logservice/eteshare
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
-- 
cgit