From 9eee6ac9daa5b82946b4f7c7eaa817ae3e1f4cab Mon Sep 17 00:00:00 2001 From: Michael O'Brien 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 --- .../logdemo/templates/all-services.yaml | 10 ++-- .../templates/log-mock-demo-deployment.yaml | 43 ---------------- .../templates/log-mock-service-deployment.yaml | 43 ++++++++++++++++ reference/logging-kubernetes/logdemo/values.yaml | 2 +- .../logging-kubernetes/logdemoservice/Chart.yaml | 4 ++ .../logdemoservice/templates/all-services.yaml | 14 ++++++ .../log-mock-demo-service-deployment.yaml | 57 ++++++++++++++++++++++ .../logging-kubernetes/logdemoservice/values.yaml | 7 +++ reference/logging-kubernetes/pom.xml | 2 +- 9 files changed, 132 insertions(+), 50 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 create mode 100644 reference/logging-kubernetes/logdemoservice/Chart.yaml create mode 100644 reference/logging-kubernetes/logdemoservice/templates/all-services.yaml create mode 100644 reference/logging-kubernetes/logdemoservice/templates/log-mock-demo-service-deployment.yaml create mode 100644 reference/logging-kubernetes/logdemoservice/values.yaml (limited to 'reference/logging-kubernetes') 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 }} 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 @@ org.onap.logging-analytics logging-reference - 1.2.0-SNAPSHOT + 1.2.2-SNAPSHOT logging-kubernetes pom -- cgit 1.2.3-korg