diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2f03e004..5cd2652a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -3,6 +3,7 @@ * @cloudoperators/Administrators /.github/ @cloudoperators/Administrators +/.github/configs/ @cloudoperators/greenhouse-core /.github/workflows/ @cloudoperators/greenhouse-core /.github/labeler.yml @cloudoperators/greenhouse-core /.github/licenserc.yaml @cloudoperators/greenhouse-core diff --git a/ct.yaml b/.github/configs/helm-lint.yaml similarity index 90% rename from ct.yaml rename to .github/configs/helm-lint.yaml index 5bbd3f53..1667bba8 100644 --- a/ct.yaml +++ b/.github/configs/helm-lint.yaml @@ -14,7 +14,9 @@ chart-dirs: - kube-monitoring - kubeconfig-generator - service-proxy/charts/1.0.0 + - logshipper chart-repos: - cert-manager=https://charts.jetstack.io - alerts=https://prometheus-community.github.io/helm-charts - kube-monitoring=https://prometheus-community.github.io/helm-charts + - logshipper=https://fluent.github.io/helm-charts diff --git a/.github/configs/helm-test.yaml b/.github/configs/helm-test.yaml new file mode 100644 index 00000000..4f969530 --- /dev/null +++ b/.github/configs/helm-test.yaml @@ -0,0 +1,18 @@ +# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors +# SPDX-License-Identifier: Apache-2.0 + +# See https://github.com/helm/chart-testing#configuration +remote: origin +target-branch: main +validate-maintainers: false +check-version-increment: false +chart-dirs: + - alerts + - kube-monitoring + - plutono + - thanos + - opentelemetry +chart-repos: + - cert-manager=https://charts.jetstack.io + - alerts=https://prometheus-community.github.io/helm-charts + - kube-monitoring=https://prometheus-community.github.io/helm-charts diff --git a/.github/workflows/helm-lint-test.yaml b/.github/workflows/helm-lint-test.yaml index b9aa852d..2de5c9ae 100644 --- a/.github/workflows/helm-lint-test.yaml +++ b/.github/workflows/helm-lint-test.yaml @@ -24,35 +24,43 @@ jobs: check-latest: true token: ${{ secrets.GITHUB_TOKEN }} - - name: Set up chart-testing + - name: Set up chart-linting and chart-testing uses: helm/chart-testing-action@v2.6.1 - - name: Run chart-testing (list-changed) + - name: Run chart-linting (list-changed) id: list-changed run: | - changed=$(ct list-changed --config ct.yaml --target-branch ${{ github.event.repository.default_branch }}) + changed=$(ct list-changed --config .github/configs/helm-lint.yaml --target-branch ${{ github.event.repository.default_branch }}) if [[ -n "$changed" ]]; then echo "changed=true" >> "$GITHUB_OUTPUT" fi - - name: Run chart-testing (lint) + - name: Run chart-linting if: steps.list-changed.outputs.changed == 'true' - run: ct lint --config ct.yaml --target-branch ${{ github.event.repository.default_branch }} + run: ct lint --config .github/configs/helm-lint.yaml --target-branch ${{ github.event.repository.default_branch }} + + - name: Run chart-testing (list-changed) + id: chart-test-list-changed + run: | + changed=$(ct list-changed --config .github/configs/helm-test.yaml --target-branch ${{ github.event.repository.default_branch }}) + if [[ -n "$changed" ]]; then + echo "changed=true" >> "$GITHUB_OUTPUT" + fi - name: Create kind cluster - if: steps.list-changed.outputs.changed == 'true' + if: steps.chart-test-list-changed.outputs.changed == 'true' uses: helm/kind-action@v1.10.0 - name: Run chart integration tests - if: steps.list-changed.outputs.changed == 'true' - run: ct install --config ct.yaml + if: steps.chart-test-list-changed.outputs.changed == 'true' + run: ct install --config .github/configs/helm-test.yaml - name: Check version bump id: check-bump if: steps.list-changed.outputs.changed == 'true' continue-on-error: true run: | - for chart in $(ct list-changed --config ct.yaml --target-branch ${{ github.event.repository.default_branch }}); do + for chart in $(ct list-changed --config .github/configs/helm-lint.yaml --target-branch ${{ github.event.repository.default_branch }}); do chart_version=$(yq .version "$chart/Chart.yaml") if helm pull "oci://${{ env.REGISTRY }}/${{ github.repository }}/charts/$(dirname $chart)" --version $chart_version; then echo "chart=$(dirname $chart)" >> "$GITHUB_OUTPUT" diff --git a/logshipper/chart/Chart.yaml b/logshipper/chart/Chart.yaml index a3f6907c..eb6a1b25 100644 --- a/logshipper/chart/Chart.yaml +++ b/logshipper/chart/Chart.yaml @@ -6,7 +6,7 @@ name: logshipper description: A Helm chart for deploying fluent-bit with custom config type: application -version: 0.2.2 +version: 0.2.3 appVersion: 3.0.4 dependencies: diff --git a/logshipper/chart/values.yaml b/logshipper/chart/values.yaml index 452c01f4..09341093 100644 --- a/logshipper/chart/values.yaml +++ b/logshipper/chart/values.yaml @@ -4,7 +4,7 @@ fluent-bit: podAnnotations: kubectl.kubernetes.io/default-container: "fluent-bit" - hotReload: + hotReload: enabled: true existingConfigMap: "fluent-bit-config" updateStrategy: diff --git a/logshipper/plugindefinition.yaml b/logshipper/plugindefinition.yaml index 92991794..15d963ff 100644 --- a/logshipper/plugindefinition.yaml +++ b/logshipper/plugindefinition.yaml @@ -6,14 +6,14 @@ kind: PluginDefinition metadata: name: logshipper spec: - version: 0.2.2 + version: 0.2.3 displayName: Fluent-bit Logshipper description: Logshipping of container logs and systemd with fluent-bit icon: https://raw.githubusercontent.com/fluent/fluent-bit/master/fluentbit_logo.png helmChart: name: logshipper repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts - version: 0.2.2 + version: 0.2.3 options: - name: fluent-bit.parser description: Parser used for container logs. [docker|cri]