From 396402cdd65c3f1a5b1fe2ab7fc0dd62f9dc35bd Mon Sep 17 00:00:00 2001 From: Michael O'Brien Date: Mon, 23 Jul 2018 10:07:49 -0400 Subject: add filebeat to k8s log demo Change-Id: I1c229a9e5f7c9379d8d9f9fdf724908f083925d9 Issue-ID: LOG-137 Signed-off-by: Michael O'Brien --- reference/logging-kubernetes/logdemo/Chart.yaml | 4 -- .../logdemo/templates/all-services.yaml | 14 ------- .../templates/log-mock-service-deployment.yaml | 43 ---------------------- reference/logging-kubernetes/logdemo/values.yaml | 7 ---- 4 files changed, 68 deletions(-) delete mode 100644 reference/logging-kubernetes/logdemo/Chart.yaml delete mode 100644 reference/logging-kubernetes/logdemo/templates/all-services.yaml delete mode 100644 reference/logging-kubernetes/logdemo/templates/log-mock-service-deployment.yaml delete mode 100644 reference/logging-kubernetes/logdemo/values.yaml (limited to 'reference/logging-kubernetes/logdemo') diff --git a/reference/logging-kubernetes/logdemo/Chart.yaml b/reference/logging-kubernetes/logdemo/Chart.yaml deleted file mode 100644 index 9c45fce..0000000 --- a/reference/logging-kubernetes/logdemo/Chart.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -description: A Helm chart for Kubernetes -name: logdemo -version: 0.1.0 diff --git a/reference/logging-kubernetes/logdemo/templates/all-services.yaml b/reference/logging-kubernetes/logdemo/templates/all-services.yaml deleted file mode 100644 index dc57183..0000000 --- a/reference/logging-kubernetes/logdemo/templates/all-services.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: logservice - name: logservice - namespace: "{{ .Values.nsPrefix }}-logservice" -spec: - ports: - - port: 8080 - nodePort: {{ .Values.nodePortPrefix }}98 - selector: - app: logservice - type: NodePort diff --git a/reference/logging-kubernetes/logdemo/templates/log-mock-service-deployment.yaml b/reference/logging-kubernetes/logdemo/templates/log-mock-service-deployment.yaml deleted file mode 100644 index 92bcbe8..0000000 --- a/reference/logging-kubernetes/logdemo/templates/log-mock-service-deployment.yaml +++ /dev/null @@ -1,43 +0,0 @@ -#{{ 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 deleted file mode 100644 index a13dbe3..0000000 --- a/reference/logging-kubernetes/logdemo/values.yaml +++ /dev/null @@ -1,7 +0,0 @@ -nsPrefix: onap -pullPolicy: Always -nodePortPrefix: 302 -image: - readiness: oomk8s/readiness-check:1.0.0 - logdemo: oomk8s/logging-demo-nbi:0.0.2 - filebeat: docker.elastic.co/beats/filebeat:5.5.0 -- cgit 1.2.3-korg