add fluent-bit deployment and restructure logging dependencies

chart/templates/logging/efk-helmrelease.yaml → chart/templates/logging/ek-helmrelease.yaml

@@ -2,13 +2,13 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: efk
+  name: ek
   namespace: {{ .Release.Namespace }}
 spec:
   targetNamespace: logging
   chart:
     spec:
-      chart: charts/logging
+      chart: charts/elasticsearch-kibana
       interval: 5m
       sourceRef:
         kind: GitRepository
@@ -44,8 +44,6 @@ spec:
   dependsOn:
     - name: eck-operator
       namespace: {{ .Release.Namespace }}
-    - name: logging-operator
-      namespace: {{ .Release.Namespace }}
 
     {{- if  .Values.gatekeeper.enabled }}
     - name: gatekeeper

chart/templates/logging/logging-operator-helmrelease.yaml → chart/templates/logging/fluentbit-helmrelease.yaml

@@ -2,13 +2,13 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: logging-operator
+  name: fluent-bit
   namespace: {{ .Release.Namespace }}
 spec:
   targetNamespace: logging
   chart:
     spec:
-      chart: charts/logging-operator
+      chart: charts/fluent-bit
       interval: 5m
       sourceRef:
         kind: GitRepository
@@ -33,11 +33,23 @@ spec:
   {{- end }}
 
   values:
-    createCustomResource: false
+    elasticsearch:
+      host: "logging-ek-es-http"
+      password:
+        secret: "logging-ek-es-elastic-user"
 
-  {{- if .Values.gatekeeper.enabled }}
+  {{/* ECK and Logging _always_ depend on .Values.logging being enabled, so can assume they exist here */}}
   dependsOn:
+    - name: ek
+      namespace: {{ .Release.Namespace }}
+
+    {{- if  .Values.gatekeeper.enabled }}
     - name: gatekeeper
       namespace: {{ .Release.Namespace }}
+    {{- end }}
+
+    {{- if .Values.istio.enabled }}
+    - name: istio
+      namespace: {{ .Release.Namespace }}
   {{- end }}
-{{- end }}
\ No newline at end of file
+  {{- end }}
\ No newline at end of file

chart/templates/logging/namespace.yaml

 {{- if .Values.logging.enabled }}
 apiVersion: v1
 kind: Namespace
+metadata:
+  name: eck-operator
+
+---
+apiVersion: v1
+kind: Namespace
 metadata:
   name: logging
+  {{- if .Values.istio.enabled }}
   labels:
     istio-injection: enabled
+  {{- end}}
 
 ---
   {{- if and (ne .Values.registryCredentials.username "") (ne .Values.registryCredentials.password "") }}