diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 5afd6f84..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 @@ -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' diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml index 4e6aee87..3aecae5b 100644 --- a/charts/fluent-bit/Chart.yaml +++ b/charts/fluent-bit/Chart.yaml @@ -23,4 +23,4 @@ maintainers: annotations: artifacthub.io/changes: | - kind: changed - description: "Added local internalTrafficPolicy for daemonsets" + description: "Added local internalTrafficPolicy for daemonsets" \ No newline at end of file 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 f3e0b6df..c9ae9843 100644 --- a/charts/fluent-bit/values.yaml +++ b/charts/fluent-bit/values.yaml @@ -129,7 +129,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 @@ -419,7 +419,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: |