From dc796480d29f5bdc52763227a18f3000599ecb79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:10:57 +0000 Subject: [PATCH 1/3] build(deps): bump the github-actions group with 1 update (#460) Bumps the github-actions group with 1 update: [helm/kind-action](https://github.com/helm/kind-action). Updates `helm/kind-action` from 1.8.0 to 1.9.0 - [Release notes](https://github.com/helm/kind-action/releases) - [Commits](https://github.com/helm/kind-action/compare/dda0770415bac9fc20092cacbc54aa298604d140...99576bfa6ddf9a8e612d83b513da5a75875caced) --- updated-dependencies: - dependency-name: helm/kind-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 5afd6f84..b34f9de0 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -39,7 +39,7 @@ jobs: - name: Create kind cluster if: steps.list-changed.outputs.changed == 'true' - uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0 + uses: helm/kind-action@99576bfa6ddf9a8e612d83b513da5a75875caced # v1.9.0 - name: Run chart-testing (install) if: steps.list-changed.outputs.changed == 'true' From 4820ee4eddd6764348f24bf10b02b3e3a7de525e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:12:19 +0000 Subject: [PATCH 2/3] build(deps): bump actions/setup-python from 4.7.1 to 5.0.0 (#449) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.7.1 to 5.0.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236...0a5c61591373683505ea898e09a3ea4f39ef2b9c) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index b34f9de0..9bcb5eac 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -19,7 +19,7 @@ jobs: # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and # yamllint (https://github.com/adrienverge/yamllint) which require Python - name: Set up Python - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1 + uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0 with: python-version: 3.x From 47c13d50b98af0e2c79d1e93cca78cf09d93a0b5 Mon Sep 17 00:00:00 2001 From: Steve Hipwell Date: Tue, 12 Mar 2024 10:04:59 +0000 Subject: [PATCH 3/3] chore: Fixed helm test (#466) Signed-off-by: Steve Hipwell --- charts/fluent-bit/Chart.yaml | 6 +++--- charts/fluent-bit/ci/ci-values.yaml | 3 +++ .../fluent-bit/templates/tests/test-connection.yaml | 11 +++++++---- charts/fluent-bit/values.yaml | 4 ++-- 4 files changed, 15 insertions(+), 9 deletions(-) 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: |