Migrate to Helm

2024-11-06 15:39:39 +03:00
parent 60bff2356f
commit 08f6dd6834
9 changed files with 366 additions and 135 deletions
@@ -0,0 +1,114 @@
+{{- if .Values.sidecars.logger.enabled  }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "fluentbit-{{ .Chart.Name }}"
+data:
+  fluent-bit.conf: |
+    [SERVICE]
+        Parsers_File    /fluent-bit/etc/parsers.conf
+
+    [INPUT]
+        Name                tail
+        Tag                 lk
+        Path                /usr/lib/serverHome/logs/access.txt*
+        Mem_Buf_Limit       100MB
+        Skip_Long_Lines     On
+        Refresh_Interval    5
+
+    [FILTER]
+        Name record_modifier
+        Match *
+        Whitelist_key log
+
+    [FILTER]
+        Name rewrite_tag
+        Match {{ .Chart.Name }}
+        Rule $log kube-probe {{ .Chart.Name }}-healtcheck false
+
+    [FILTER]
+        Name rewrite_tag
+        Match {{ .Chart.Name }}
+        Rule $log {{ .Chart.Name }} {{ .Chart.Name }}.access false
+
+    [FILTER]
+        Name parser
+        Match {{ .Chart.Name }}.access
+        Key_name log
+        Parser lucee_parser
+
+    [OUTPUT]
+        Name        loki
+        Match       *
+        Host        10.96.52.75
+        labels      job={{ .Chart.Name }}-fluentbit-{{ .Values.stand }},$kubernetes['pod_name'],$kubernetes['namespace_name'],$kubernetes['host'],$kubernetes['container_name']
+        port        3100
+        auto_kubernetes_labels on
+
+    [OUTPUT]
+        Name stdout
+        Match *
+
+  parsers.conf: |-
+    [PARSER]
+      Name lucee_parser
+      Format regex
+      Regex ^(?<remote_address>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
+      Types status:integer
+
+    [PARSER]
+        Name   apache
+        Format regex
+        Regex  ^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
+        Time_Key time
+        Time_Format %d/%b/%Y:%H:%M:%S %z
+
+    [PARSER]
+        Name   apache2
+        Format regex
+        Regex  ^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
+        Time_Key time
+        Time_Format %d/%b/%Y:%H:%M:%S %z
+
+    [PARSER]
+        Name   apache_error
+        Format regex
+        Regex  ^\[[^ ]* (?<time>[^\]]*)\] \[(?<level>[^\]]*)\](?: \[pid (?<pid>[^\]]*)\])?( \[client (?<client>[^\]]*)\])? (?<message>.*)$
+
+    [PARSER]
+        Name   nginx
+        Format regex
+        Regex ^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
+        Time_Key time
+        Time_Format %d/%b/%Y:%H:%M:%S %z
+
+    [PARSER]
+        Name   json
+        Format json
+        Time_Key time
+        Time_Format %d/%b/%Y:%H:%M:%S %z
+
+    [PARSER]
+        Name        docker
+        Format      json
+        Time_Key    time
+        Time_Format %Y-%m-%dT%H:%M:%S.%L
+        Time_Keep   On
+
+    [PARSER]
+        # http://rubular.com/r/tjUt3Awgg4
+        Name cri
+        Format regex
+        Regex ^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>[^ ]*) (?<message>.*)$
+        Time_Key    time
+        Time_Format %Y-%m-%dT%H:%M:%S.%L%z
+
+    [PARSER]
+        Name        syslog
+        Format      regex
+        Regex       ^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$
+        Time_Key    time
+        Time_Format %b %d %H:%M:%S
+
+{{- end }}
@@ -0,0 +1,74 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: "{{ .Chart.Name }}"
+    stand: "{{ .Values.stand }}"
+  name: "{{ .Chart.Name }}"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: "{{ .Chart.Name }}"
+      stand: "{{ .Values.stand }}"
+  template:
+    metadata:
+      labels:
+        app: "{{ .Chart.Name }}"
+        stand: "{{ .Values.stand }}"
+    spec:
+      {{- if .Values.vault.enabled }}
+      serviceAccountName: "{{ .Values.vault.serviceAccountName }}"
+      {{- end }}
+      containers:
+        # Основное приложение
+        - name: app
+          image: "{{ .Values.mainContainer.image.repository }}:{{ .Values.mainContainer.image.tag }}"
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: {{ .Values.mainContainer.containerPort }}
+              protocol: TCP
+          resources:
+            {{- toYaml .Values.mainContainer.resources | nindent 12 }}
+          readinessProbe:
+            failureThreshold: 3
+            initialDelaySeconds: 10
+            periodSeconds: 30
+            successThreshold: 1
+            timeoutSeconds: 2
+            {{- toYaml .Values.mainContainer.readinessProbe | nindent 12 }}
+          livenessProbe:
+            failureThreshold: 3
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
+            {{- toYaml .Values.mainContainer.livenessProbe | nindent 12 }}
+          {{- if .Values.vault.enabled }}
+          envFrom:
+            - secretRef:
+                name: "{{ .Values.vault.target.name }}"
+          {{- end }}
+          volumeMounts:
+            {{- toYaml .Values.mainContainer.volumeMounts | nindent 12 }}
+          
+        # Sidecar-контейнеры
+        {{- if .Values.sidecars.logger.enabled }}
+        - name: logger
+          image: "{{ .Values.sidecars.logger.image.repository }}:{{ .Values.sidecars.logger.image.tag }}"
+          imagePullPolicy: IfNotPresent
+          resources:
+            {{- toYaml .Values.sidecars.logger.resources | nindent 12 }}
+          volumeMounts:
+            - name: fluentbit-config
+              mountPath: /fluent-bit/etc/
+            {{- toYaml .Values.sidecars.logger.volumeMounts | nindent 12 }}
+        {{- end }}
+      
+      volumes:
+        {{- if .Values.sidecars.logger.enabled }}
+        - name: fluentbit-config
+          configMap:
+            name: fluentbit-{{ .Chart.Name }}
+        {{- end }}
+        {{- toYaml .Values.mainContainer.volumes | nindent 8 }}
@@ -0,0 +1,16 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: "{{ .Chart.Name }}"
+  labels:
+    app: "{{ .Chart.Name }}"
+    stand: "{{ .Values.stand }}"
+spec:
+  ports:
+  - port: {{ .Values.mainContainer.containerPort }}
+    targetPort: {{ .Values.mainContainer.containerPort }}
+    protocol: TCP
+  selector:
+    app: "{{ .Chart.Name }}"
+    stand: "{{ .Values.stand }}"
@@ -0,0 +1,20 @@
+{{- if .Values.vault.enabled }}
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: "{{ .Chart.Name }}"
+spec:
+  refreshInterval: "60s"
+  secretStoreRef:
+    name: "{{ .Values.vault.secretStore }}" 
+    kind: SecretStore
+  target:
+    name: "{{ .Values.vault.target.name }}"
+  data:
+    {{- range .Values.vault.data }}
+    - secretKey: {{ .secretKey }}
+      remoteRef:
+        key: "{{ .remoteRef.key }}"
+        property: "{{ .remoteRef.property }}"
+    {{- end }}
+{{- end }}