Merge remote-tracking branch 'upstream/main' into main

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-/charts/<name-of-chart> @maintainer
+/charts/fluentd-elasticsearch @monotek
 
 ## changes to CODEOWNERS should be reviewed by repository admins
 /CODEOWNERS @helm-charts-admins

.github/PULL_REQUEST_TEMPLATE.md

@@ -24,6 +24,7 @@ These checks run very quickly.
 Please check the results.
 We would like these checks to pass before we even continue reviewing your changes.
 -->
+# Which chart
 
 # What this PR does / why we need it
 
@@ -37,5 +38,6 @@ We would like these checks to pass before we even continue reviewing your change
 
 # Checklist
 <!-- [Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.] -->
-- [ ] [DCO](https://github.com/{{ .GitHubOrg }}/helm-charts/blob/main/CONTRIBUTING.md#sign-off-your-work) signed
+- [ ] [DCO](https://github.com/kokuwaio/helm-charts/blob/main/CONTRIBUTING.md#sign-off-your-work) signed
 - [ ] Chart Version bumped
+- [ ] All variables are documented in the charts README

.github/ct.yaml

@@ -1,6 +1,6 @@
 helm-extra-args: --timeout 1200s
 check-version-increment: true
 debug: true
+target-branch: main
 chart-repos:
-  - kiwigrid=https://kiwigrid.github.io/
-  - minio=https://helm.min.io
+  - kokuwa=https://kokuwaio.github.io/helm-charts

.github/kubeval.sh

@@ -6,8 +6,8 @@
 set -o errexit
 set -o pipefail
 
-CHART_DIRS="$(git diff --find-renames --name-only "$(git rev-parse --abbrev-ref HEAD)" remotes/origin/master -- charts | grep '[cC]hart.yaml' | sed -e 's#/[Cc]hart.yaml##g')"
-HELM_VERSION="v3.1.2"
+CHART_DIRS="$(git diff --find-renames --name-only "$(git rev-parse --abbrev-ref HEAD)" remotes/origin/main -- charts | grep '[cC]hart.yaml' | sed -e 's#/[Cc]hart.yaml##g')"
+HELM_VERSION="v3.3.4"
 KUBEVAL_VERSION="0.15.0"
 SCHEMA_LOCATION="https://raw.githubusercontent.com/instrumenta/kubernetes-json-schema/master/"
 

.github/workflows/ci.yaml

@@ -0,0 +1,102 @@
+name: ci
+
+on: 
+  pull_request:
+    paths:
+      - 'charts/**/[cC]hart.yaml'
+
+jobs:
+  lint-bash-scripts:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Lint Bash scripts
+        uses: docker://koalaman/shellcheck-alpine:v0.7.1
+        with:
+          args: .github/lint-scripts.sh
+
+  super-linter:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: Lint Code Base
+        uses: github/super-linter@v3
+        env:
+          VALIDATE_ALL_CODEBASE: false
+          VALIDATE_YAML: true
+          DEFAULT_BRANCH: main
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  lint-chart:
+    runs-on: ubuntu-latest
+    needs: 
+      - lint-bash-scripts
+      - super-linter
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Fetch history
+        run: git fetch --prune --unshallow
+
+      - name: Run chart-testing (lint)
+        uses: helm/chart-testing-action@master
+        with:
+          command: lint
+          config: .github/ct.yaml
+
+  kubeval-chart:
+    runs-on: ubuntu-latest
+    needs: lint-chart
+    strategy:
+      matrix:
+        k8s:
+          - v1.16.4
+          - v1.17.4
+          - v1.18.1
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Fetch history
+        run: git fetch --prune --unshallow
+
+      - name: Run kubeval
+        env:
+          KUBERNETES_VERSION: ${{ matrix.k8s }}
+        run: .github/kubeval.sh
+
+  install-chart:
+    runs-on: ubuntu-latest
+    needs:
+      - lint-chart
+      - kubeval-chart
+    strategy:
+      matrix:
+        k8s: 
+          - v1.16.15
+          - v1.17.11
+          - v1.18.6
+          - v1.19.1
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Fetch history
+        run: git fetch --prune --unshallow
+
+      - name: Create kind ${{ matrix.k8s }} cluster
+        uses: helm/kind-action@master
+        with:
+          config: .github/kind-config.yaml
+          node_image: kindest/node:${{ matrix.k8s }}
+
+      - name: Run chart-testing (install)
+        uses: helm/[email protected]
+        with:
+          command: install
+          config: .github/ct.yaml

.github/workflows/sync-readme.yaml

@@ -1,19 +1,25 @@
+name: sync-readme
+
 on:
   push:
     branches:
       - 'main'
     paths:
       - 'README.md'
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+
       - run: |
           cp -f README.md ${{ runner.temp }}/README.md
+
       - uses: actions/checkout@v2
         with:
           ref: gh-pages
+
       - run: |
           cp -f ${{ runner.temp }}/README.md .
           git config user.name "$GITHUB_ACTOR"

README.md

@@ -2,11 +2,14 @@
 
 [Helm](https://helm.sh/) repo for [Kokuwa](https://kokuwa.io) project maintained charts which can be installed on [Kubernetes](https://kubernetes.io/)
 
-Add the repo via:
+## Add the Helm repo via
+
 ```console
-$ helm repo add kokuwa https://kokuwaio.github.io/helm-charts/
+helm repo add kokuwa https://kokuwaio.github.io/helm-charts
 ```
 
+## Sources
+
 The charts sources can be found here:
 * [https://github.com/kokuwaio/helm-charts](https://github.com/kokuwaio/helm-charts)
 

charts/fluentd-elasticsearch/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: fluentd-elasticsearch
-version: 10.0.0
+version: 10.0.1
 appVersion: 3.0.4
 home: https://www.fluentd.org/
 description: A Fluentd Helm chart for Kubernetes with Elasticsearch output
@@ -12,7 +12,7 @@ keywords:
 - detect-exceptions
 - logging
 sources:
-- https://github.com/kiwigrid/helm-charts/tree/master/charts/fluentd-elasticsearch
+- https://github.com/kokuwaio/helm-charts/tree/main/charts/fluentd-elasticsearch
 - https://github.com/fluent/fluentd-kubernetes-daemonset
 - https://github.com/GoogleCloudPlatform/fluent-plugin-detect-exceptions
 - https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/fluentd-elasticsearch/fluentd-es-image

charts/fluentd-elasticsearch/README.md

@@ -5,7 +5,8 @@
 ## TL;DR
 
 ```console
-helm install kiwigrid/fluentd-elasticsearch
+helm repo add kokuwa https://kokuwaio.github.io/helm-charts
+helm install kokuwa/fluentd-elasticsearch
 ```
 
 ## Introduction
@@ -23,7 +24,7 @@ The used Docker image also contains Google's detect exceptions (for Java multili
 To install the chart with the release name `my-release`:
 
 ```console
-helm install --name my-release kiwigrid/fluentd-elasticsearch
+helm install --name my-release kokuwa/fluentd-elasticsearch
 ```
 
 The command deploys fluentd-elasticsearch on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
@@ -155,13 +156,13 @@ The following table lists the configurable parameters of the Fluentd elasticsear
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 
 ```console
-helm install --name my-release kiwigrid/fluentd-elasticsearch
+helm install --name my-release kokuwa/fluentd-elasticsearch
 ```
 
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
 
 ```console
-helm install --name my-release -f values.yaml kiwigrid/fluentd-elasticsearch
+helm install --name my-release -f values.yaml kokuwa/fluentd-elasticsearch
 ```
 
 ## Installation