summaryrefslogtreecommitdiffstats
path: root/reference/logging-kubernetes/logdemo
diff options
context:
space:
mode:
authorAvdhut Kholkar <avdhut.kholkar@amdocs.com>2018-07-12 05:34:37 +0000
committerGerrit Code Review <gerrit@onap.org>2018-07-12 05:34:37 +0000
commitaf1410de64d463905dd6deee62efdd88ff616ce8 (patch)
tree01b7286bfd927f34481bab8a4b4920a6a0407e48 /reference/logging-kubernetes/logdemo
parent1ec5963cd18cd70b6aabe5fe70ab3734dd9f3307 (diff)
parent9eee6ac9daa5b82946b4f7c7eaa817ae3e1f4cab (diff)
Merge "logging library use and k8s"
Diffstat (limited to 'reference/logging-kubernetes/logdemo')
-rw-r--r--reference/logging-kubernetes/logdemo/templates/all-services.yaml10
-rw-r--r--reference/logging-kubernetes/logdemo/templates/log-mock-service-deployment.yaml (renamed from reference/logging-kubernetes/logdemo/templates/log-mock-demo-deployment.yaml)22
-rw-r--r--reference/logging-kubernetes/logdemo/values.yaml2
3 files changed, 17 insertions, 17 deletions
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-service-deployment.yaml
index afd513e..92bcbe8 100644
--- a/reference/logging-kubernetes/logdemo/templates/log-mock-demo-deployment.yaml
+++ b/reference/logging-kubernetes/logdemo/templates/log-mock-service-deployment.yaml
@@ -1,28 +1,28 @@
-#{{ if not .Values.disableLogdemoLogdemo }}
+#{{ if not .Values.disableLogserviceLogservice }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: logdemo
- namespace: "{{ .Values.nsPrefix }}-logdemo"
+ name: logservice
+ namespace: "{{ .Values.nsPrefix }}-logservice"
spec:
selector:
matchLabels:
- app: logdemo
+ app: logservice
template:
metadata:
labels:
- app: logdemo
- name: logdemo
+ app: logservice
+ name: logservice
spec:
containers:
- - image: {{ .Values.image.logdemo }}
+ - image: {{ .Values.image.logservice }}
imagePullPolicy: {{ .Values.pullPolicy }}
- name: logdemo
+ name: logservice
volumeMounts:
- name: localtime
mountPath: /etc/localtime
readOnly: true
- - name: logdemo-eteshare
+ - name: logservice-eteshare
mountPath: /share
ports:
- containerPort: 8080
@@ -35,9 +35,9 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: logdemo-eteshare
+ - name: logservice-eteshare
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/logdemo/eteshare
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/logservice/eteshare
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
#{{ end }}
diff --git a/reference/logging-kubernetes/logdemo/values.yaml b/reference/logging-kubernetes/logdemo/values.yaml
index 53e3fc6..a13dbe3 100644
--- a/reference/logging-kubernetes/logdemo/values.yaml
+++ b/reference/logging-kubernetes/logdemo/values.yaml
@@ -3,5 +3,5 @@ pullPolicy: Always
nodePortPrefix: 302
image:
readiness: oomk8s/readiness-check:1.0.0
- logdemo: oomk8s/logging-demo-nbi:0.0.1
+ logdemo: oomk8s/logging-demo-nbi:0.0.2
filebeat: docker.elastic.co/beats/filebeat:5.5.0