Merge branch 'main' of https://github.com/drycc-addons/addons into main

Author: EamonZhang

addons/fluentbit/2/chart/fluentbit/templates/daemonset.yaml

@@ -61,6 +61,19 @@ spec:
         - fluent-bit
         - -c
         - /opt/drycc/fluent-bit/etc/fluent-bit/fluentbit.conf
+        env:
+          {{- if .Values.daemonset.extraEnvVars }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.daemonset.extraEnvVars "context" $) | nindent 10 }}
+          {{- end }}
+        envFrom:
+          {{- if .Values.daemonset.extraEnvVarsCM }}
+          - configMapRef:
+              name: {{ include "common.tplvalues.render" (dict "value" .Values.daemonset.extraEnvVarsCM "context" $) }}
+          {{- end }}
+          {{- if .Values.daemonset.extraEnvVarsSecret }}
+          - secretRef:
+              name: {{ include "common.tplvalues.render" (dict "value" .Values.daemonset.extraEnvVarsSecret "context" $) }}
+          {{- end }}
         volumeMounts:
         - name: data
           mountPath: /data

addons/fluentbit/2/chart/fluentbit/values.yaml

@@ -257,6 +257,27 @@ daemonset:
           Rule                "start_state"     "/^panic: /" "cont"
           Rule                "cont"            "/^\s+/" "cont"
           Rule                "cont"            "/^goroutine /" "cont"
+  ## @param daemonset.extraEnvVars Array with extra environment variables to add to daemonset nodes
+  ## e.g:
+  ## extraEnvVars:
+  ##   - name: FOO
+  ##     value: "bar"
+  ##
+  extraEnvVars: []
+  ## @param daemonset.extraEnvVarsCM Name of existing ConfigMap containing extra env vars for daemonset nodes
+  ##
+  extraEnvVarsCM: ""
+  ## @param daemonset.extraEnvVarsSecret Name of existing Secret containing extra env vars for daemonset nodes
+  ##
+  extraEnvVarsSecret: ""
+
+      [MULTILINE_PARSER]
+          Name                gateway_multiline
+          Type                regex
+          Flush_Timeout       1000
+          key_content         log
+          Rule                "start_state"   "/^\[\d{4}-\d{2}-\d{2}/" "cont"
+          Rule                "cont"          "/^(?!\[\d{4}-\d{2}-\d{2})/" "cont"
 
       [MULTILINE_PARSER]
           Name                gateway_multiline

addons/fluentbit/2/meta.yaml

@@ -15,6 +15,9 @@ instances_retrievable: true
 bindings_retrievable: true
 plan_updateable: true
 allow_parameters:
+- name: "daemonset.extraEnvVars"
+  required: false
+  description: "extra environment variables to add to fluentbit"
 - name: "daemonset.config.outputs"
   required: true
   description: "destinations for your data: databases, cloud services and more"

addons/kafka/3.6/meta.yaml

@@ -39,6 +39,9 @@ allow_parameters:
 - name: "listeners.external.protocol"
   required: false
   description: "listeners external protocol config for values.yaml"
+- name: "sasl"
+  required: false
+  description: "sasl config for values.yaml"
 - name: "networkPolicy.allowNamespaces"
   required: false
   description: "networkPolicy allowNamespaces config for values.yaml"

addons/minio/2023/chart/minio/values.yaml

@@ -196,14 +196,14 @@ statefulset:
   podManagementPolicy: Parallel
   ## @param statefulset.replicaCount Number of pods per zone (only for MinIO® distributed mode). Should be even and `>= 4`
   ##
-  replicaCount: 3
+  replicaCount: 4
 
   ## @param statefulset.zones Number of zones (only for MinIO® distributed mode)
   ##
   zones: 1
   ## @param statefulset.drivesPerNode Number of drives attached to every node (only for MinIO® distributed mode)
   ##
-  drivesPerNode: 4
+  drivesPerNode: 1
 
 ## MinIO® provisioning
 ##