diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml index 3964019e..a886b015 100644 --- a/charts/fluent-bit/Chart.yaml +++ b/charts/fluent-bit/Chart.yaml @@ -5,7 +5,7 @@ keywords: - logging - fluent-bit - fluentd -version: 0.43.0 +version: 0.43.1 appVersion: 2.2.2 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/fluentd/fluentbit/icon/fluentbit-icon-color.svg home: https://fluentbit.io/ @@ -22,5 +22,5 @@ maintainers: email: steve.hipwell@gmail.com annotations: artifacthub.io/changes: | - - kind: changed - description: "Updated _Fluent Bit_ OCI image to [v2.2.2](https://github.com/fluent/fluent-bit/releases/tag/v2.2.2)." + - kind: fixed + description: "Fixed helm tests." diff --git a/charts/fluent-bit/ci/ci-values.yaml b/charts/fluent-bit/ci/ci-values.yaml index d3e09791..9e230d2a 100644 --- a/charts/fluent-bit/ci/ci-values.yaml +++ b/charts/fluent-bit/ci/ci-values.yaml @@ -1,3 +1,6 @@ +testFramework: + enabled: true + logLevel: debug dashboards: diff --git a/charts/fluent-bit/templates/tests/test-connection.yaml b/charts/fluent-bit/templates/tests/test-connection.yaml index 9f246831..3d464fa6 100644 --- a/charts/fluent-bit/templates/tests/test-connection.yaml +++ b/charts/fluent-bit/templates/tests/test-connection.yaml @@ -5,16 +5,19 @@ metadata: name: "{{ include "fluent-bit.fullname" . }}-test-connection" namespace: {{ default .Release.Namespace .Values.testFramework.namespace }} labels: - {{- include "fluent-bit.labels" . | nindent 4 }} + helm.sh/chart: {{ include "fluent-bit.chart" . }} + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + app.kubernetes.io/managed-by: {{ .Release.Service }} annotations: - "helm.sh/hook": test-success + helm.sh/hook: test + helm.sh/hook-delete-policy: hook-succeeded spec: containers: - name: wget image: {{ include "fluent-bit.image" .Values.testFramework.image | quote }} imagePullPolicy: {{ .Values.testFramework.image.pullPolicy }} - command: ['wget'] - args: ['{{ include "fluent-bit.fullname" . }}:{{ .Values.service.port }}'] + command: ["sh"] + args: ["-c", "wget -O- {{ include "fluent-bit.fullname" . }}:{{ .Values.service.port }}"] {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 4 }} diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml index 2b5167cc..748d8603 100644 --- a/charts/fluent-bit/values.yaml +++ b/charts/fluent-bit/values.yaml @@ -128,7 +128,7 @@ serviceMonitor: # scheme: "" # tlsConfig: {} - ## Beare in mind if youn want to collec metrics from a different port + ## Bear in mind if you want to collect metrics from a different port ## you will need to configure the new ports on the extraPorts property. additionalEndpoints: [] # - port: metrics @@ -418,7 +418,7 @@ config: Time_Key time Time_Format %Y-%m-%dT%H:%M:%S.%L - # This allows adding more files with arbitary filenames to /fluent-bit/etc/conf by providing key/value pairs. + # This allows adding more files with arbitrary filenames to /fluent-bit/etc/conf by providing key/value pairs. # The key becomes the filename, the value becomes the file content. extraFiles: {} # upstream.conf: |