From 7000a7c8ad6acdbfbaed54c81b030f9b7ad190b1 Mon Sep 17 00:00:00 2001 From: Maciej Wereski Date: Thu, 16 Dec 2021 12:24:06 +0100 Subject: [DCAEGEN2] Use common.log template Until now DCAEGEN2 used its own templates instead of common ones. This change switches filebeat sidecar generation to common.log templates. Other ONAP components already use it. Filebeat is depreceated and with use of common templates it is possible to disable it globally. This patch also changes ConfigMap usage from per component ConfigMap to one ConfigMap for all of DCAEGEN2 components. This is done to simplify generated file as there are no differences between per component ConfigMaps. Issue-ID: OOM-1 Signed-off-by: Maciej Wereski Change-Id: I87ffe4890b9a4d79edfe0669750dbf21b4a7b340 --- .../dcaegen2-services/components/dcae-heartbeat/values.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'kubernetes/dcaegen2-services/components/dcae-heartbeat') diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml index bbf815d658..4ed0a83677 100644 --- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml +++ b/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml @@ -21,6 +21,7 @@ global: nodePortPrefix: 302 nodePortPrefixExt: 304 + centralizedLoggingEnabled: true ################################################################# # Filebeat Configuration Defaults. @@ -60,8 +61,11 @@ image: onap/org.onap.dcaegen2.services.heartbeat:2.3.1 pullPolicy: Always # Log directory where logging sidecar should look for log files -# if absent, no sidecar will be deployed -logDirectory: /var/log/ONAP/dcaegen2/services/heartbeat +# if path is set to null sidecar won't be deployed in spite of +# global.centralizedLoggingEnabled setting. +log: + path: /var/log/ONAP/dcaegen2/services/heartbeat +logConfigMapNamePrefix: '{{ include "common.fullname" . }}' # Directory where TLS certs should be stored # if absent, no certs will be retrieved and stored -- cgit 1.2.3-korg /select> Introduces the ONAP Platform OOM (ONAP Operations Manager) to efficiently Deploy, Manage, Operate the ONAP platform and its components (e.g. MSO, DCAE, SDC, etc.) and infrastructure (VMs, Containers).Grokmirror user
summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc/sdc-be.yaml
blob: ac2378cb60bc425cbf6a80a1dcb24d5e9dc76eb4 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111

apiVersion: extensions/v1beta1
kind: Deployment
metadata:
  labels:
    app: sdc-be
  name: sdc-be
spec:
  selector:
    matchLabels:
      app: sdc-be
  template:
    metadata:
      labels:
        app: sdc-be
      name: sdc-be
      annotations:
        pod.beta.kubernetes.io/init-containers: '[
          {
              "args": [
                  "--container-name",
                  "sdc-es",
                  "--container-name",
                  "sdc-cs",
                  "--container-name",
                  "sdc-kb"
              ],
              "command": [
                  "/root/ready.py"
              ],
              "env": [
                  {
                      "name": "NAMESPACE",
                      "valueFrom": {
                          "fieldRef": {
                              "apiVersion": "v1",
                              "fieldPath": "metadata.namespace"
                          }
                      }
                  }
              ],
              "image": "oomk8s/readiness-check:1.0.0",
              "imagePullPolicy": "Always",
              "name": "sdc-be-readiness"
          },
          {
              "args": [
                  "--container-name",
                  "dmaap"
              ],
              "command": [
                  "/root/ready.py"
              ],
              "env": [
                  {
                      "name": "NAMESPACE",
                      "value": "onap-message-router"
                  }
              ],
              "image": "oomk8s/readiness-check:1.0.0",
              "imagePullPolicy": "Always",
              "name": "sdc-dmaap-readiness"
          }
          ]'
    spec:
      containers:
      - env:
        - name: ENVNAME
          value: AUTO
        - name: HOST_IP
          valueFrom:
            fieldRef:
              fieldPath: status.podIP
        image: nexus3.onap.org:10001/openecomp/sdc-backend:1.1-STAGING-latest
        name: sdc-be
        volumeMounts:
        - mountPath: /usr/share/elasticsearch/data/
          name: sdc-sdc-es-es
        - mountPath: /root/chef-solo/environments/
          name: sdc-environments
        - mountPath: /var/lib/jetty/etc/keystore
          name: sdc-jetty-keystore
        - mountPath: /etc/localtime
          name: sdc-localtime
        - mountPath: /var/lib/jetty/logs
          name: sdc-logs
        ports:
        - containerPort: 8443
        - containerPort: 8080
        readinessProbe:
          tcpSocket:
            port: 8443
          initialDelaySeconds: 5
          periodSeconds: 10
      volumes:
        - name: sdc-sdc-es-es
          hostPath:
            path: /dockerdata-nfs/onapdemo/sdc/sdc-es/ES
        - name: sdc-environments
          hostPath:
            path: /dockerdata-nfs/onapdemo/sdc/environments
        - name: sdc-jetty-keystore
          hostPath:
            path: /dockerdata-nfs/onapdemo/sdc/jetty/keystore
        - name: sdc-localtime
          hostPath:
            path:  /etc/localtime
        - name:  sdc-logs
          hostPath:
            path:  /dockerdata-nfs/onapdemo/sdc/logs
      imagePullSecrets:
      - name: onap-docker-registry-key