summaryrefslogtreecommitdiffstats
path: root/reference/logging-kubernetes
diff options
context:
space:
mode:
Diffstat (limited to 'reference/logging-kubernetes')
-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
-rw-r--r--reference/logging-kubernetes/logdemoservice/Chart.yaml4
-rw-r--r--reference/logging-kubernetes/logdemoservice/templates/all-services.yaml14
-rw-r--r--reference/logging-kubernetes/logdemoservice/templates/log-mock-demo-service-deployment.yaml57
-rw-r--r--reference/logging-kubernetes/logdemoservice/values.yaml7
-rw-r--r--reference/logging-kubernetes/pom.xml2
8 files changed, 100 insertions, 18 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
diff --git a/reference/logging-kubernetes/logdemoservice/Chart.yaml b/reference/logging-kubernetes/logdemoservice/Chart.yaml
new file mode 100644
index 0000000..b9eed13
--- /dev/null
+++ b/reference/logging-kubernetes/logdemoservice/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: logdemoservice
+version: 0.1.0
diff --git a/reference/logging-kubernetes/logdemoservice/templates/all-services.yaml b/reference/logging-kubernetes/logdemoservice/templates/all-services.yaml
new file mode 100644
index 0000000..10b7109
--- /dev/null
+++ b/reference/logging-kubernetes/logdemoservice/templates/all-services.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: logdemoservice
+ name: logdemoservice
+ namespace: "{{ .Values.nsPrefix }}-logdemoservice"
+spec:
+ ports:
+ - port: 8080
+ nodePort: {{ .Values.nodePortPrefix }}98
+ selector:
+ app: logdemoservice
+ type: NodePort
diff --git a/reference/logging-kubernetes/logdemoservice/templates/log-mock-demo-service-deployment.yaml b/reference/logging-kubernetes/logdemoservice/templates/log-mock-demo-service-deployment.yaml
new file mode 100644
index 0000000..f40da2f
--- /dev/null
+++ b/reference/logging-kubernetes/logdemoservice/templates/log-mock-demo-service-deployment.yaml
@@ -0,0 +1,57 @@
+#{{ if not .Values.disableLogdemoserviceLogdemoservice }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: logdemoservice
+ namespace: "{{ .Values.nsPrefix }}-logdemoservice"
+spec:
+ selector:
+ matchLabels:
+ app: logdemoservice
+ template:
+ metadata:
+ labels:
+ app: logdemoservice
+ name: logdemoservice
+ spec:
+ containers:
+ - image: {{ .Values.image.logdemoservice }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: logdemoservice
+ volumeMounts:
+ - mountPath: /var/log/onap
+ name: log-mock-demo-service-logs
+ ports:
+ - containerPort: 8080
+ readinessProbe:
+ tcpSocket:
+ port: 8080
+ initialDelaySeconds: 5
+ periodSeconds: 10
+ - image: {{ .Values.image.filebeat }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: filebeat-onap
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ name: filebeat-conf
+ - mountPath: /var/log/onap
+ name: log-mock-demo-service-logs
+ - mountPath: /usr/share/filebeat/data
+ name: log-mock-demo-service-data-filebeat
+ volumes:
+ - name: filebeat-conf
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+ - name: log-mock-demo-service-logs
+ emptyDir: {}
+ - name: log-mock-demo-service-data-filebeat
+ emptyDir: {}
+ - name: localtime
+ hostPath:
+ path: /etc/localtime
+ - name: logdemoservice-eteshare
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/logdemoservice/eteshare
+ imagePullSecrets:
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
diff --git a/reference/logging-kubernetes/logdemoservice/values.yaml b/reference/logging-kubernetes/logdemoservice/values.yaml
new file mode 100644
index 0000000..3b89a4b
--- /dev/null
+++ b/reference/logging-kubernetes/logdemoservice/values.yaml
@@ -0,0 +1,7 @@
+nsPrefix: onap
+pullPolicy: Always
+nodePortPrefix: 302
+image:
+ readiness: oomk8s/readiness-check:1.0.0
+ logdemoservice: oomk8s/logging-demo-service:0.0.1
+ filebeat: docker.elastic.co/beats/filebeat:5.5.0
diff --git a/reference/logging-kubernetes/pom.xml b/reference/logging-kubernetes/pom.xml
index 6f32c54..1042811 100644
--- a/reference/logging-kubernetes/pom.xml
+++ b/reference/logging-kubernetes/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-reference</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.2-SNAPSHOT</version>
</parent>
<artifactId>logging-kubernetes</artifactId>
<packaging>pom</packaging>