diff --git a/charts/kubeadm/templates/resources/51-aws-iam-authenticator-deployment.yaml b/charts/kubeadm/templates/resources/51-aws-iam-authenticator-deployment.yaml index f6cdc5c9..a8f3c0c2 100644 --- a/charts/kubeadm/templates/resources/51-aws-iam-authenticator-deployment.yaml +++ b/charts/kubeadm/templates/resources/51-aws-iam-authenticator-deployment.yaml @@ -117,7 +117,7 @@ spec: containers: - name: aws-iam-authenticator - image: public.ecr.aws/zero-downtime/aws-iam-authenticator:v0.6.22 + image: public.ecr.aws/zero-downtime/aws-iam-authenticator:v0.6.27 args: - server - --backend-mode=CRD,MountedFile diff --git a/charts/kubezero-logging/README.md b/charts/kubezero-logging/README.md index b75bfe0e..d4154685 100644 --- a/charts/kubezero-logging/README.md +++ b/charts/kubezero-logging/README.md @@ -1,6 +1,6 @@ # kubezero-logging -![Version: 0.8.12](https://img.shields.io/badge/Version-0.8.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) +![Version: 0.8.13](https://img.shields.io/badge/Version-0.8.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) KubeZero Umbrella Chart for complete EFK stack @@ -19,7 +19,7 @@ Kubernetes: `>= 1.26.0` | Repository | Name | Version | |------------|------|---------| | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://fluent.github.io/helm-charts | fluent-bit | 0.46.2 | +| https://fluent.github.io/helm-charts | fluent-bit | 0.47.10 | | https://fluent.github.io/helm-charts | fluentd | 0.5.2 | ## Changes from upstream diff --git a/charts/kubezero-logging/charts/fluent-bit/Chart.yaml b/charts/kubezero-logging/charts/fluent-bit/Chart.yaml index 1b1c6fe8..09c4cb50 100644 --- a/charts/kubezero-logging/charts/fluent-bit/Chart.yaml +++ b/charts/kubezero-logging/charts/fluent-bit/Chart.yaml @@ -1,9 +1,9 @@ annotations: artifacthub.io/changes: | - kind: changed - description: "Updated _Fluent Bit_ OCI image to [v3.0.2](https://github.com/fluent/fluent-bit/releases/tag/v3.0.2)." + description: "Updated Fluent Bit OCI image to v3.1.9" apiVersion: v1 -appVersion: 3.0.2 +appVersion: 3.1.9 description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD family operating systems. home: https://fluentbit.io/ @@ -24,4 +24,4 @@ maintainers: name: fluent-bit sources: - https://github.com/fluent/fluent-bit/ -version: 0.46.2 +version: 0.47.10 diff --git a/charts/kubezero-logging/charts/fluent-bit/ci/ci-values.yaml b/charts/kubezero-logging/charts/fluent-bit/ci/ci-values.yaml index 9e230d2a..bafd568a 100644 --- a/charts/kubezero-logging/charts/fluent-bit/ci/ci-values.yaml +++ b/charts/kubezero-logging/charts/fluent-bit/ci/ci-values.yaml @@ -5,3 +5,4 @@ logLevel: debug dashboards: enabled: true + deterministicUid: true diff --git a/charts/kubezero-logging/charts/fluent-bit/dashboards/fluent-bit.json b/charts/kubezero-logging/charts/fluent-bit/dashboards/fluent-bit.json index b0024d31..584a8c94 100644 --- a/charts/kubezero-logging/charts/fluent-bit/dashboards/fluent-bit.json +++ b/charts/kubezero-logging/charts/fluent-bit/dashboards/fluent-bit.json @@ -1559,7 +1559,7 @@ }, "timezone": "", "title": "{{ include "fluent-bit.fullname" . }}", - "uid": "d557c8f6-cac1-445f-8ade-4c351a9076b1", + "uid": {{ ternary (printf "\"%s\"" (sha1sum (printf "%s-%s" .Release.Namespace (include "fluent-bit.fullname" .)))) "null" .Values.dashboards.deterministicUid }}, "version": 7, "weekStart": "" -} \ No newline at end of file +} diff --git a/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl b/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl index 7f74f4a5..18258a75 100644 --- a/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl +++ b/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl @@ -119,7 +119,11 @@ containers: {{- end }} {{- end }} {{- if .Values.extraContainers }} - {{- toYaml .Values.extraContainers | nindent 2 }} + {{- if kindIs "string" .Values.extraContainers }} + {{- tpl .Values.extraContainers $ | nindent 2 }} + {{- else }} + {{- toYaml .Values.extraContainers | nindent 2 }} + {{- end -}} {{- end }} volumes: - name: config diff --git a/charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml b/charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml index d44db638..550ac8fe 100644 --- a/charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml +++ b/charts/kubezero-logging/charts/fluent-bit/templates/clusterrole.yaml @@ -13,6 +13,7 @@ rules: - pods {{- if .Values.rbac.nodeAccess }} - nodes + - nodes/metrics - nodes/proxy {{- end }} {{- if .Values.rbac.eventsAccess }} diff --git a/charts/kubezero-logging/charts/fluent-bit/templates/service.yaml b/charts/kubezero-logging/charts/fluent-bit/templates/service.yaml index 3f9c8f70..2a771e69 100644 --- a/charts/kubezero-logging/charts/fluent-bit/templates/service.yaml +++ b/charts/kubezero-logging/charts/fluent-bit/templates/service.yaml @@ -17,6 +17,9 @@ spec: {{- if and (eq .Values.service.type "ClusterIP") (.Values.service.clusterIP) }} clusterIP: {{ .Values.service.clusterIP }} {{- end }} + {{- if .Values.service.externalIPs }} + externalIPs: {{- toYaml .Values.service.externalIPs | nindent 4 }} + {{- end }} {{- if (eq .Values.kind "DaemonSet") }} {{- with .Values.service.internalTrafficPolicy }} internalTrafficPolicy: {{ . }} diff --git a/charts/kubezero-logging/charts/fluent-bit/values.yaml b/charts/kubezero-logging/charts/fluent-bit/values.yaml index 1a60fe7b..d84ab662 100644 --- a/charts/kubezero-logging/charts/fluent-bit/values.yaml +++ b/charts/kubezero-logging/charts/fluent-bit/values.yaml @@ -101,6 +101,10 @@ service: # prometheus.io/path: "/api/v1/metrics/prometheus" # prometheus.io/port: "2020" # prometheus.io/scrape: "true" + externalIPs: [] + # externalIPs: + # - 2.2.2.2 + serviceMonitor: enabled: false @@ -178,6 +182,7 @@ dashboards: labelValue: 1 annotations: {} namespace: "" + deterministicUid: false lifecycle: {} # preStop: @@ -314,11 +319,21 @@ envWithTpl: [] envFrom: [] +# This supports either a structured array or a templatable string extraContainers: [] + +# Array mode +# extraContainers: # - name: do-something # image: busybox # command: ['do', 'something'] +# String mode +# extraContainers: |- +# - name: do-something +# image: bitnami/kubectl:{{ .Capabilities.KubeVersion.Major }}.{{ .Capabilities.KubeVersion.Minor }} +# command: ['kubectl', 'version'] + flush: 1 metricsPort: 2020 diff --git a/charts/kubezero-logging/update.sh b/charts/kubezero-logging/update.sh index 8633929d..16bd05eb 100755 --- a/charts/kubezero-logging/update.sh +++ b/charts/kubezero-logging/update.sh @@ -9,7 +9,7 @@ FLUENT_BIT_VERSION=$(yq eval '.dependencies[] | select(.name=="fluent-bit") | .v FLUENTD_VERSION=$(yq eval '.dependencies[] | select(.name=="fluentd") | .version' Chart.yaml) # fluent-bit -patch_chart fluent-bit +# patch_chart fluent-bit # FluentD patch_chart fluentd diff --git a/charts/kubezero-telemetry/README.md b/charts/kubezero-telemetry/README.md index e7c8610e..d6e7dd06 100644 --- a/charts/kubezero-telemetry/README.md +++ b/charts/kubezero-telemetry/README.md @@ -1,6 +1,6 @@ # kubezero-telemetry -![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero Umbrella Chart for OpenTelemetry, Jaeger etc. @@ -19,10 +19,10 @@ Kubernetes: `>= 1.26.0` | Repository | Name | Version | |------------|------|---------| | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://fluent.github.io/helm-charts | fluent-bit | 0.47.1 | +| https://fluent.github.io/helm-charts | fluent-bit | 0.47.10 | | https://fluent.github.io/helm-charts | fluentd | 0.5.2 | -| https://jaegertracing.github.io/helm-charts | jaeger | 3.1.1 | -| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.97.1 | +| https://jaegertracing.github.io/helm-charts | jaeger | 3.3.1 | +| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.108.0 | | https://opensearch-project.github.io/helm-charts/ | data-prepper | 0.1.0 | ## Values @@ -170,19 +170,14 @@ Kubernetes: `>= 1.26.0` | opensearch.dashboard.istio.url | string | `"telemetry-dashboard.example.com"` | | | opensearch.nodeSets | list | `[]` | | | opensearch.prometheus | bool | `false` | | -| opensearch.version | string | `"2.16.0"` | | +| opensearch.version | string | `"2.17.0"` | | | opentelemetry-collector.config.exporters.otlp/data-prepper.endpoint | string | `"telemetry-data-prepper:21890"` | | | opentelemetry-collector.config.exporters.otlp/data-prepper.tls.insecure | bool | `true` | | | opentelemetry-collector.config.exporters.otlp/jaeger.endpoint | string | `"telemetry-jaeger-collector:4317"` | | | opentelemetry-collector.config.exporters.otlp/jaeger.tls.insecure | bool | `true` | | | opentelemetry-collector.config.extensions.health_check.endpoint | string | `"${env:MY_POD_IP}:13133"` | | -| opentelemetry-collector.config.extensions.memory_ballast | object | `{}` | | -| opentelemetry-collector.config.processors.batch | object | `{}` | | -| opentelemetry-collector.config.processors.memory_limiter | string | `nil` | | -| opentelemetry-collector.config.receivers.jaeger | string | `nil` | | | opentelemetry-collector.config.receivers.otlp.protocols.grpc.endpoint | string | `"${env:MY_POD_IP}:4317"` | | | opentelemetry-collector.config.receivers.otlp.protocols.http.endpoint | string | `"${env:MY_POD_IP}:4318"` | | -| opentelemetry-collector.config.receivers.zipkin | string | `nil` | | | opentelemetry-collector.config.service.extensions[0] | string | `"health_check"` | | | opentelemetry-collector.config.service.extensions[1] | string | `"memory_ballast"` | | | opentelemetry-collector.config.service.pipelines.logs | string | `nil` | | diff --git a/charts/kubezero-telemetry/charts/fluent-bit/Chart.yaml b/charts/kubezero-telemetry/charts/fluent-bit/Chart.yaml deleted file mode 100644 index 4c989883..00000000 --- a/charts/kubezero-telemetry/charts/fluent-bit/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -annotations: - artifacthub.io/changes: | - - kind: changed - description: "Updated Fluent Bit OCI image to v3.1.1." -apiVersion: v1 -appVersion: 3.1.1 -description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD - family operating systems. -home: https://fluentbit.io/ -icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/fluentd/fluentbit/icon/fluentbit-icon-color.svg -keywords: -- logging -- fluent-bit -- fluentd -maintainers: -- email: eduardo@calyptia.com - name: edsiper -- email: naseem@transit.app - name: naseemkullah -- email: towmeykaw@gmail.com - name: Towmeykaw -- email: steve.hipwell@gmail.com - name: stevehipwell -name: fluent-bit -sources: -- https://github.com/fluent/fluent-bit/ -version: 0.47.1 diff --git a/charts/kubezero-telemetry/charts/fluent-bit/README.md b/charts/kubezero-telemetry/charts/fluent-bit/README.md deleted file mode 100644 index 6920d3d7..00000000 --- a/charts/kubezero-telemetry/charts/fluent-bit/README.md +++ /dev/null @@ -1,57 +0,0 @@ -# Fluent Bit Helm chart - -[Fluent Bit](https://fluentbit.io) is a fast and lightweight log processor and forwarder or Linux, OSX and BSD family operating systems. - -## Installation - -To add the `fluent` helm repo, run: - -```sh -helm repo add fluent https://fluent.github.io/helm-charts -``` - -To install a release named `fluent-bit`, run: - -```sh -helm install fluent-bit fluent/fluent-bit -``` - -## Chart values - -```sh -helm show values fluent/fluent-bit -``` - -## Using Lua scripts -Fluent Bit allows us to build filter to modify the incoming records using custom [Lua scripts.](https://docs.fluentbit.io/manual/pipeline/filters/lua) - -### How to use Lua scripts with this Chart - -First, you should add your Lua scripts to `luaScripts` in values.yaml, for example: - -```yaml -luaScripts: - filter_example.lua: | - function filter_name(tag, timestamp, record) - -- put your lua code here. - end -``` - -After that, the Lua scripts will be ready to be used as filters. So next step is to add your Fluent bit [filter](https://docs.fluentbit.io/manual/concepts/data-pipeline/filter) to `config.filters` in values.yaml, for example: - -```yaml -config: - filters: | - [FILTER] - Name lua - Match - script /fluent-bit/scripts/filter_example.lua - call filter_name -``` -Under the hood, the chart will: -- Create a configmap using `luaScripts`. -- Add a volumeMounts for each Lua scripts using the path `/fluent-bit/scripts/