chatwork · cw-sakamoto · Jun 12, 2024 · Jun 11, 2024 · Jun 11, 2024 · Jun 12, 2024
diff --git a/.github/scripts/lint-chart.sh b/.github/scripts/lint-chart.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+# Usage:
+#   lint-chart.sh [dir]
+#  Description:
+#    Check that the number of nindents matches the actual indents
+#
+
+err=$(for file in "${1}"/*.yaml; do
+  i="0"
+  while IFS= read -r line; do
+    i="$(expr "${i}" + 1)"
+    if echo "${line}" | grep nindent >/dev/null; then
+      indent=$(echo "${line}" | grep -o '^ \+' | awk '{print length($0)}')
+      args=$(echo "${line}"| grep -o 'nindent [0-9]\+' | grep -o '[0-9]\+')
+      # Check that the number of nindents matches the actual indents
+      if [ "${indent}" != "${args}" ]; then
+        printf "%s on line %d: indent mismatch:\n%s\n" "${file}" "${i}" "${line}"
+      fi
+      # nindent should use {{ instead of {{-
+      if ! (echo "$line" | grep '{{-') > /dev/null; then
+        printf "%s on line %d: \`{{-\` should be used for nindent:\n%s\n" "${file}" "${i}" "${line}"
+      fi
+    fi
+  done < "${file}"
+done)
+
+
+if [ -n "${err}" ]; then
+  echo "${err}" 1>&2
+  exit 255
+else
+  echo "PASS ${1}"
+fi
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -2,8 +2,8 @@ name: Lint Helm Chart
 
 on:
   push:
-    branches:
-      - "!gh-pages"
+    branches-ignore:
+      - "gh-pages"
 
 permissions:
   contents: read
@@ -12,8 +12,15 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
+      - name: Dump GitHub context
+        id: github_context_step
+        continue-on-error: true
+        run: echo '${{ toJSON(github) }}'
+
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup Helm
         run: make ci:enable:helm
@@ -28,4 +35,4 @@ jobs:
         run: make ci:diff:chart | xargs -I{} /bin/bash -c "cd ./{} && ../.github/scripts/check-version.sh || exit 255"
 
       - name: Check lint
-        run: make ci:diff | xargs -I{} /bin/bash -c "cd ./{} && make lint || exit 255"
+        run: make ci:diff | xargs -I{} /bin/bash -c "cd ./{} && make lint || exit 255"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,25 +2,34 @@ name: Publish Helm Chart
 
 on:
   workflow_run:
-    workflows: ["Test Helm Chart"]
+    workflows:
+      - "Test Helm Chart"
     types:
       - completed
-    branches:
-      - "master"
 
 permissions:
   contents: write
 
 jobs:
   publish:
     runs-on: ubuntu-latest
-    env: 
+    if: |
+      ${{ github.event.workflow_run.conclusion == 'success' }} &&
+      ${{ github.ref_name == 'master' }}
+    env:
       DOCKER_REGISTRY_USERNAME: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
       DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
+      - name: Dump GitHub context
+        id: github_context_step
+        continue-on-error: true
+        run: echo '${{ toJSON(github) }}'
+
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup Helm
         run: make ci:enable:helm
@@ -40,7 +49,11 @@ jobs:
       - name: Commit and push
         working-directory: .dist
         run: |
-          git add . 
+          # https://github.com/orgs/community/discussions/26560
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config user.name "github-actions[bot]"
+
+          git add .
           git commit --allow-empty-message -m "$GITHUB_SHA"
           git push origin gh-pages
 
@@ -59,7 +72,7 @@ jobs:
             make ci:notify -e TITLE="Release chatwork/charts {}:${version} (gogo)" \
                            -e BODY="$(echo -e "changelog\n${changelog}")";
           '
-      
+
       - name: Notification failed
         if: failure()
         run: |
@@ -68,4 +81,4 @@ jobs:
             make ci:notify -e TITLE="CircleCI: Failed push chatwork/charts {}:${version} (devil)" \
                            -e BODY="$(git log -1 --pretty=format:"%h - %an : %s" ${CIRCLE_BRANCH})";
           '
-       
+
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,21 +2,29 @@ name: Test Helm Chart
 
 on:
   workflow_run:
-    workflows: ["Lint Helm Chart"]
+    workflows:
+      - "Lint Helm Chart"
     types:
       - completed
-    branches:
-      - "!gh-pages"
+    branches-ignore:
+      - "gh-pages"
 
 permissions:
   contents: read
 
 jobs:
-  lint:
+  test:
     runs-on: ubuntu-latest
     steps:
+      - name: Dump GitHub context
+        id: github_context_step
+        continue-on-error: true
+        run: echo '${{ toJSON(github) }}'
+
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup K8s
         run: make ci:enable:k8s
@@ -31,4 +39,4 @@ jobs:
         run: make ci:diff | xargs -I{} /bin/bash -c "cd ./{} && kubectl create namespace {} --dry-run -o yaml | kubectl apply -f - || exit 255"
 
       - name: Test
-        run: RC=0; for target in `make ci:diff`;do cd ./$target; kubectl config set-context --current --namespace=$target; make install && make test && make uninstall || RC=255; cd ..; done; exit $RC
+        run: RC=0; for target in `make ci:diff`;do cd ./$target; kubectl config set-context --current --namespace=$target; make install && make test && make uninstall || RC=255; cd ..; done; exit $RC
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ KIND_VERSION = 0.20.0
 KUBERNETES_VERSION = 1.28.0
 KIND_NODE_HASH = b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
 HELM_VERSION = 3.13.2
-KUBEVAL_VERSION = 0.15.0
+KUBEVAL_VERSION = 0.16.1
 
 .PHONY: apply
 apply:
@@ -44,9 +44,11 @@ ci\:enable\:helm:
 .PHONY: ci\:enable\:kubeval
 ci\:enable\:kubeval:
 	@mkdir -p .bin/
+	@mkdir -p /tmp/kubeval
 	@if [ ! -f "./.bin/kubeval" ]; then \
-	    curl -sSL https://github.com/instrumenta/kubeval/releases/download/$(KUBEVAL_VERSION)/kubeval-linux-amd64.tar.gz | tar zxvf - -O linux-amd64/kubeval > ./.bin/kubeval; \
-	    chmod +x ./.bin/kubeval; \
+		curl -sSL https://github.com/instrumenta/kubeval/releases/download/v${KUBEVAL_VERSION}/kubeval-linux-amd64.tar.gz | tar zxv -C /tmp/kubeval; \
+		ls -l /tmp/kubeval/ && mv /tmp/kubeval/kubeval ./.bin/kubeval; \
+		chmod +x ./.bin/kubeval; \
 	fi
 	@sudo mv ./.bin/kubeval /usr/local/bin/kubeval;
 

diff --git a/akka/Makefile b/akka/Makefile
@@ -11,7 +11,7 @@ lint: lint-default lint-local-akka-http lint-cluster-discovery-dns lint-cluster-
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/argoproj-crd/Makefile b/argoproj-crd/Makefile
@@ -14,7 +14,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo ""

diff --git a/aws-ebs-csi-driver/Makefile b/aws-ebs-csi-driver/Makefile
@@ -12,7 +12,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/aws-secret-operator/Makefile b/aws-secret-operator/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/burrow/Makefile b/burrow/Makefile
@@ -12,7 +12,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/docker-registry/Makefile b/docker-registry/Makefile
@@ -12,7 +12,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/dynamodb/Makefile b/dynamodb/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/elasticmq/Makefile b/elasticmq/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/elasticsearch/Makefile b/elasticsearch/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/envoy/Makefile b/envoy/Makefile
@@ -11,7 +11,7 @@ lint: lint-default lint-xds
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"
@@ -21,7 +21,7 @@ lint-default:
 .PHONY: lint-xds
 lint-xds:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint -f example/xds.yaml --strict
 	@echo "=> Validating default value.yaml"

diff --git a/example/Makefile b/example/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/fluent-bit/Makefile b/fluent-bit/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/fluentd/Makefile b/fluentd/Makefile
@@ -11,7 +11,7 @@ lint: lint-daemonset lint-statefulset lint-use-udp lint-use-udp
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/gcp-credentials/Makefile b/gcp-credentials/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/kube-schedule-scaler/Makefile b/kube-schedule-scaler/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/mailcatcher/Makefile b/mailcatcher/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/mysql/Makefile b/mysql/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/newrelic-php-agent/Makefile b/newrelic-php-agent/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/php/Makefile b/php/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/postfix/Makefile b/postfix/Makefile
@@ -14,7 +14,7 @@ lint: lint-daemonset lint-daemonset-mailcatcher lint-deployment lint-deployment-
 .PHONY: lint-daemonset
 lint-daemonset:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"

diff --git a/raw/Makefile b/raw/Makefile
@@ -11,7 +11,7 @@ lint: lint-default
 .PHONY: lint-default
 lint-default:
 	@echo "=> Indent check default values.yaml"
-	../.circleci/lint-chart.sh $$PWD/templates
+	../.github/scripts/lint-chart.sh $$PWD/templates
 	@echo "=> Linting default values.yaml"
 	helm lint --strict
 	@echo "=> Validating default value.yaml"