From 65f3737f34ffcf13c0c8d3cb6e3496c073a628c1 Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Wed, 5 Jun 2024 12:46:06 +0900
Subject: [PATCH 01/14] [fluentd]bump appVersion

---
 fluentd/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fluentd/Chart.yaml b/fluentd/Chart.yaml
index dd1e5825..d9605a2b 100644
--- a/fluentd/Chart.yaml
+++ b/fluentd/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: fluentd
 description: Fluentd is an open source data collector for unified logging layer.
 type: application
-version: 0.4.0
-appVersion: "1.14.6"
+version: 0.5.0
+appVersion: "1.17.0"
 icon: https://github.com/fluent/fluentd-docs-gitbook/tree/8c505a3608b9b2032813b00c9b5750f4ca29ddcd/images/logo/Fluentd_square.png

From 1bbff48ac0366558a69991fa7fe9d11ac5c6c9fb Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Tue, 11 Jun 2024 11:33:41 +0900
Subject: [PATCH 02/14] Add github actions

---
 .github/scripts/check-version.sh | 37 +++++++++++++++++
 .github/workflows/lint.yml       | 31 ++++++++++++++
 .github/workflows/publish.yml    | 71 ++++++++++++++++++++++++++++++++
 .github/workflows/test.yml       | 34 +++++++++++++++
 4 files changed, 173 insertions(+)
 create mode 100755 .github/scripts/check-version.sh
 create mode 100644 .github/workflows/lint.yml
 create mode 100644 .github/workflows/publish.yml
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/scripts/check-version.sh b/.github/scripts/check-version.sh
new file mode 100755
index 00000000..35c4f3d4
--- /dev/null
+++ b/.github/scripts/check-version.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -u
+
+FROM=remotes/origin/master
+PWD="$(pwd)"
+NAME="$(basename ${PWD})"
+
+# If there is no diff in the current directory, then exit 0
+DIFF="$(git --no-pager diff --name-only "${FROM}" HEAD .)"
+if [ -z "${DIFF}" ]; then
+  echo "[${NAME}] none diff"
+  exit 0
+fi
+
+# Check whether the version in Chart.yaml was updated or not.
+DIFF_CHART_YAML="$(git --no-pager diff "${FROM}" HEAD Chart.yaml | grep 'version: ')"
+
+echo "========================================"
+echo " [${NAME}] diff version"
+echo "${DIFF_CHART_YAML}"
+echo "========================================"
+
+if [ -z "${DIFF_CHART_YAML}" ]; then
+  echo "You must bump the Chart version!"
+  exit 1
+fi
+
+# If the updated version was lower than the base branch, it causes an error.
+VERSIONS=$(echo "${DIFF_CHART_YAML}"| sed -e 's/[+-]version: //g' -e "s/[\"\' ]//g")
+SORTED=$(echo "${VERSIONS}" | sort --version-sort | uniq)
+DIFF_VERSION="$(diff -u <(echo "${VERSIONS}") <(echo "${SORTED}"))"
+
+if [ -n "${DIFF_VERSION}" ]; then
+  echo "You must bump Chart version!"
+  exit 1
+fi
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 00000000..c865cf52
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,31 @@
+name: Lint Helm Chart
+
+on:
+  push:
+    branches:
+      - "!gh-pages"
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Helm
+        run: make ci:enable:helm
+
+      - name: Setup Kubeval
+        run: make ci:enable:kubeval
+
+      - name: Check diff chart
+        run: make ci:diff
+
+      - name: Check chart version
+        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"
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 00000000..d692adb6
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,71 @@
+name: Publish Helm Chart
+
+on:
+  workflow_run:
+    workflows: ["Test Helm Chart"]
+    types:
+      - completed
+    branches:
+      - "master"
+
+permissions:
+  contents: write
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    env: 
+      DOCKER_REGISTRY_USERNAME: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
+      DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Helm
+        run: make ci:enable:helm
+
+      - name: Checkout gh-pages branch
+        uses: actions/checkout@v4
+        with:
+          ref: gh-pages
+          path: .dist
+
+      - name: Check diff chart
+        run: make ci:diff:chart | xargs -I{} helm package {} -d .dist/
+
+      - name: Helm repo index
+        run: helm repo index .dist/ --url https://chatwork.github.io/charts
+
+      - name: Commit and push
+        working-directory: .dist
+        run: |
+          git add . 
+          git commit --allow-empty-message -m "$GITHUB_SHA"
+          git push origin gh-pages
+
+      - name: Docker login
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
+          password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+
+      - name: Notification success
+        if: success()
+        run: |
+          make ci:diff:chart | xargs -I{} /bin/bash -c '
+            version=$(helm inspect chart ./{} | awk "/^version:/ {print $NF}");
+            changelog=$(make ci:changelog -e DIR="{}/");
+            make ci:notify -e TITLE="Release chatwork/charts {}:${version} (gogo)" \
+                           -e BODY="$(echo -e "changelog\n${changelog}")";
+          '
+      
+      - name: Notification failed
+        if: failure()
+        run: |
+          make ci:diff:chart | xargs -I{} /bin/bash -c '
+            version=$(helm inspect chart ./{} | awk '/^version:/ {print $NF}');
+            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
new file mode 100644
index 00000000..4014bd69
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,34 @@
+name: Test Helm Chart
+
+on:
+  workflow_run:
+    workflows: ["Lint Helm Chart"]
+    types:
+      - completed
+    branches:
+      - "!gh-pages"
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup K8s
+        run: make ci:enable:k8s
+
+      - name: Setup Helm
+        run: make ci:enable:helm
+
+      - name: Check diff chart
+        run: make ci:diff
+
+      - name: Create resources
+        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
\ No newline at end of file

From d71a053d86f7d8f9d4420cf638b92de05e286de3 Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Tue, 11 Jun 2024 11:35:27 +0900
Subject: [PATCH 03/14] delete circleci

---
 .circleci/check-version.sh | 37 ---------------
 .circleci/config.yml       | 92 --------------------------------------
 .circleci/lint-chart.sh    | 33 --------------
 3 files changed, 162 deletions(-)
 delete mode 100755 .circleci/check-version.sh
 delete mode 100644 .circleci/config.yml
 delete mode 100755 .circleci/lint-chart.sh

diff --git a/.circleci/check-version.sh b/.circleci/check-version.sh
deleted file mode 100755
index 35c4f3d4..00000000
--- a/.circleci/check-version.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-set -u
-
-FROM=remotes/origin/master
-PWD="$(pwd)"
-NAME="$(basename ${PWD})"
-
-# If there is no diff in the current directory, then exit 0
-DIFF="$(git --no-pager diff --name-only "${FROM}" HEAD .)"
-if [ -z "${DIFF}" ]; then
-  echo "[${NAME}] none diff"
-  exit 0
-fi
-
-# Check whether the version in Chart.yaml was updated or not.
-DIFF_CHART_YAML="$(git --no-pager diff "${FROM}" HEAD Chart.yaml | grep 'version: ')"
-
-echo "========================================"
-echo " [${NAME}] diff version"
-echo "${DIFF_CHART_YAML}"
-echo "========================================"
-
-if [ -z "${DIFF_CHART_YAML}" ]; then
-  echo "You must bump the Chart version!"
-  exit 1
-fi
-
-# If the updated version was lower than the base branch, it causes an error.
-VERSIONS=$(echo "${DIFF_CHART_YAML}"| sed -e 's/[+-]version: //g' -e "s/[\"\' ]//g")
-SORTED=$(echo "${VERSIONS}" | sort --version-sort | uniq)
-DIFF_VERSION="$(diff -u <(echo "${VERSIONS}") <(echo "${SORTED}"))"
-
-if [ -n "${DIFF_VERSION}" ]; then
-  echo "You must bump Chart version!"
-  exit 1
-fi
diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 40b6cd9b..00000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-version: 2
-jobs:
-  lint:
-    machine:
-      image: ubuntu-2204:2024.01.1
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            v1-binary
-      - run: make ci:enable:helm
-      - run: make ci:enable:kubeval
-      - run: make ci:diff
-      - run: make ci:diff:chart | xargs -I{} /bin/bash -c "cd ./{} && ../.circleci/check-version.sh || exit 255"
-      - run: make ci:diff | xargs -I{} /bin/bash -c "cd ./{} && make lint || exit 255"
-      - save_cache:
-          key: v1-binary
-          paths:
-            - .bin/
-  test:
-    machine:
-      image: ubuntu-2204:2024.01.1
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-binary
-      - run: make ci:enable:k8s
-      - run: make ci:enable:helm
-      - run: make ci:diff
-      - run: make ci:diff | xargs -I{} /bin/bash -c "cd ./{} && kubectl create namespace {} --dry-run -o yaml | kubectl apply -f - || exit 255"
-      - 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
-      - save_cache:
-          key: v1-binary
-          paths:
-            - .bin/
-
-  publish:
-    machine:
-      image: ubuntu-2204:2024.01.1
-    steps:
-      - add_ssh_keys:
-          fingerprints:
-            - "56:a1:e2:9e:89:f8:c2:87:7c:5a:89:bd:31:ed:88:2d"
-      - run: echo -e "  StrictHostKeyChecking no\n" >> ~/.ssh/config
-      - checkout
-      - run: make ci:enable:helm
-      - run: git clone -b gh-pages git@github.com:chatwork/charts.git .dist
-      - run: make ci:diff:chart | xargs -I{} helm package {} -d .dist/
-      - run: helm repo index .dist/ --url https://chatwork.github.io/charts
-      - run: cd .dist && git add . && git commit --allow-empty-message -m "$CIRCLE_SHA1" && git push origin gh-pages
-      - run: docker login -u="${DOCKER_REGISTRY_USERNAME}" -p="${DOCKER_REGISTRY_PASSWORD}"
-      - run:
-          name: notification failed
-          command: |
-            make ci:diff:chart | xargs -I{} /bin/bash -c '
-              version=$(helm inspect chart ./{} | awk '/^version:/ {print $NF}');
-              make ci:notify -e TITLE="CircleCI: Failed push chatwork/charts {}:${version} (devil)" \
-                             -e BODY="$(git log -1 --pretty=format:"%h - %an : %s" ${CIRCLE_BRANCH})";
-            '
-          when: on_fail
-      - run:
-          name: notification success
-          command: |
-            make ci:diff:chart | xargs -I{} /bin/bash -c '
-              version=$(helm inspect chart ./{} | awk "/^version:/ {print $NF}");
-              changelog=$(make ci:changelog -e DIR="{}/");
-              make ci:notify -e TITLE="Release chatwork/charts {}:${version} (gogo)" \
-                             -e BODY="$(echo -e "changelog\n${changelog}")";
-            '
-          when: on_success
-workflows:
-  version: 2
-  integration:
-    jobs:
-      - lint:
-          filters:
-            branches:
-              ignore: gh-pages
-      - test:
-          requires:
-            - lint
-          filters:
-            branches:
-              ignore: gh-pages
-      - publish:
-          context: "chatwork_api_token@circleci"
-          requires:
-            - test
-          filters:
-            branches:
-              only: master
diff --git a/.circleci/lint-chart.sh b/.circleci/lint-chart.sh
deleted file mode 100755
index 9bf9d112..00000000
--- a/.circleci/lint-chart.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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
\ No newline at end of file

From bc5ee416528a746a5bae2bd94234849d2a9f3c01 Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Tue, 11 Jun 2024 11:37:23 +0900
Subject: [PATCH 04/14] [fluent-bit]bump chart and appVersion

---
 fluent-bit/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fluent-bit/Chart.yaml b/fluent-bit/Chart.yaml
index 2baf0fb7..8134616f 100644
--- a/fluent-bit/Chart.yaml
+++ b/fluent-bit/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: fluent-bit
 description: Fast and Lightweight Log processor and forwarder
 type: application
-version: 0.4.0
-appVersion: 1.9.6
+version: 0.5.0
+appVersion: 3.0.6

From 1aabef1e863768c2dd6e5be3cedaa5a7bcc18213 Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Tue, 11 Jun 2024 15:47:40 +0900
Subject: [PATCH 05/14] fix actions

---
 .github/scripts/lint-chart.sh | 33 +++++++++++++++++++++++++++++++++
 .github/workflows/lint.yml    |  8 +++++---
 .github/workflows/publish.yml | 14 ++++++++++----
 .github/workflows/test.yml    | 10 ++++++----
 4 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100755 .github/scripts/lint-chart.sh

diff --git a/.github/scripts/lint-chart.sh b/.github/scripts/lint-chart.sh
new file mode 100755
index 00000000..8f0d5475
--- /dev/null
+++ 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
index c865cf52..546d2bc5 100644
--- 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
@@ -14,6 +14,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup Helm
         run: make ci:enable:helm
@@ -28,4 +30,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"
\ No newline at end of file
+        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
index d692adb6..92bad11d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,13 +14,15 @@ permissions:
 jobs:
   publish:
     runs-on: ubuntu-latest
-    env: 
+    env:
       DOCKER_REGISTRY_USERNAME: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
       DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup Helm
         run: make ci:enable:helm
@@ -40,7 +42,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 +65,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 +74,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
index 4014bd69..b0d65a8e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,18 +5,20 @@ on:
     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: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup K8s
         run: make ci:enable:k8s
@@ -31,4 +33,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
\ No newline at end of file
+        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

From 99824445a2326dd6981c1b46f1b50b11d77a6a1d Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Tue, 11 Jun 2024 15:47:53 +0900
Subject: [PATCH 06/14] fix each Makefile for ci

---
 akka/Makefile                 | 2 +-
 argoproj-crd/Makefile         | 2 +-
 aws-ebs-csi-driver/Makefile   | 2 +-
 aws-secret-operator/Makefile  | 2 +-
 burrow/Makefile               | 2 +-
 docker-registry/Makefile      | 2 +-
 dynamodb/Makefile             | 2 +-
 elasticmq/Makefile            | 2 +-
 elasticsearch/Makefile        | 2 +-
 envoy/Makefile                | 4 ++--
 example/Makefile              | 2 +-
 fluent-bit/Makefile           | 2 +-
 fluentd/Makefile              | 2 +-
 gcp-credentials/Makefile      | 2 +-
 kube-schedule-scaler/Makefile | 2 +-
 mailcatcher/Makefile          | 2 +-
 mysql/Makefile                | 2 +-
 newrelic-php-agent/Makefile   | 2 +-
 php/Makefile                  | 2 +-
 postfix/Makefile              | 2 +-
 raw/Makefile                  | 2 +-
 regcred/Makefile              | 2 +-
 twistlock-console/Makefile    | 2 +-
 twistlock-defender/Makefile   | 2 +-
 24 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/akka/Makefile b/akka/Makefile
index ca8edc28..00838c9e 100644
--- 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
index a4bc20e0..9242b419 100644
--- 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
index ddc6111c..d68b08aa 100644
--- 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
index 8d3c697a..6684e1af 100644
--- 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
index cf18eaaf..7c1ef082 100644
--- 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
index db1797dc..d074c90d 100644
--- 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
index 1f2e8859..e07ee62f 100644
--- 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
index 1f2e8859..e07ee62f 100644
--- 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
index 2679350d..ca5c50df 100644
--- 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
index 6e9d7504..b1548737 100644
--- 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
index 1f2e8859..e07ee62f 100644
--- 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
index 2679350d..ca5c50df 100644
--- 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
index 3d360b3e..f66d98e7 100644
--- 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
index 8d3c697a..6684e1af 100644
--- 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
index 8d3c697a..6684e1af 100644
--- 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
index 6c6e7ea1..a418bca3 100644
--- 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
index fbf95988..7cdcf835 100644
--- 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
index 1f2e8859..e07ee62f 100644
--- 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
index a8db6d98..b798a942 100644
--- 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
index 33f3b2f4..620a9ee6 100644
--- 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
index b7f91bee..c27f183d 100644
--- 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"
diff --git a/regcred/Makefile b/regcred/Makefile
index 8d3c697a..6684e1af 100644
--- a/regcred/Makefile
+++ b/regcred/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/twistlock-console/Makefile b/twistlock-console/Makefile
index fd2d541d..76fc006d 100644
--- a/twistlock-console/Makefile
+++ b/twistlock-console/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/twistlock-defender/Makefile b/twistlock-defender/Makefile
index fd2d541d..76fc006d 100644
--- a/twistlock-defender/Makefile
+++ b/twistlock-defender/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"

From 44edc503a6fb1d66076936802571c9a3b27b9d41 Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Wed, 12 Jun 2024 09:41:30 +0900
Subject: [PATCH 07/14] fix Makefile

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 86f506c6..3b16f2b9 100644
--- 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:
@@ -45,7 +45,8 @@ ci\:enable\:helm:
 ci\:enable\:kubeval:
 	@mkdir -p .bin/
 	@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; \
+		curl -sSL https://github.com/instrumenta/kubeval/releases/download/v${KUBEVAL_VERSION}/kubeval-linux-amd64.tar.gz | tar zxvf -C /tmp/
+		mv /tmp/kubeval ./.bin/kubeval
 	    chmod +x ./.bin/kubeval; \
 	fi
 	@sudo mv ./.bin/kubeval /usr/local/bin/kubeval;

From 455eef095bb330e4a47a03660ba9a480147dc288 Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Wed, 12 Jun 2024 12:16:54 +0900
Subject: [PATCH 08/14] fix actions and Makefile

---
 .github/workflows/lint.yml    |  5 +++++
 .github/workflows/publish.yml | 13 ++++++++++---
 .github/workflows/test.yml    |  8 +++++++-
 Makefile                      |  7 ++++---
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 546d2bc5..516f294a 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -12,6 +12,11 @@ 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:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 92bad11d..5470ca19 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -2,11 +2,10 @@ name: Publish Helm Chart
 
 on:
   workflow_run:
-    workflows: ["Test Helm Chart"]
+    workflows:
+      - "Test Helm Chart"
     types:
       - completed
-    branches:
-      - "master"
 
 permissions:
   contents: write
@@ -14,11 +13,19 @@ permissions:
 jobs:
   publish:
     runs-on: ubuntu-latest
+    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:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b0d65a8e..b4aef21b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,7 +2,8 @@ name: Test Helm Chart
 
 on:
   workflow_run:
-    workflows: ["Lint Helm Chart"]
+    workflows:
+      - "Lint Helm Chart"
     types:
       - completed
     branches-ignore:
@@ -15,6 +16,11 @@ jobs:
   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:
diff --git a/Makefile b/Makefile
index 3b16f2b9..e8a76f7e 100644
--- a/Makefile
+++ b/Makefile
@@ -44,10 +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/v${KUBEVAL_VERSION}/kubeval-linux-amd64.tar.gz | tar zxvf -C /tmp/
-		mv /tmp/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;
 

From ebc0d40fd2b6f12575b1e780d4cca73856a560f2 Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Wed, 12 Jun 2024 12:37:01 +0900
Subject: [PATCH 09/14] fix publish ci

---
 .github/workflows/publish.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5470ca19..e1dfb920 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -15,10 +15,12 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       ${{ github.event.workflow_run.conclusion == 'success' }} &&
-      ${{ github.ref_name == 'master' }}
+      ${{ github.event.workflow_run.head_branch == 'master' }}
     env:
       DOCKER_REGISTRY_USERNAME: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
       DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+      CHATWORK_API_TOKEN: ${{ secrets.CHATWORK_API_TOKEN }}
+      CHATWORK_NOTIFICATION_ROOM_ID: ${{ secrets.CHATWORK_NOTIFICATION_ROOM_ID}}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Dump GitHub context

From 1ef795ab2da859461d29e962eca2b0b65907bbd0 Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Wed, 12 Jun 2024 14:40:53 +0900
Subject: [PATCH 10/14] fix action condition

---
 .github/workflows/lint.yml    | 6 +++---
 .github/workflows/publish.yml | 8 +++-----
 .github/workflows/test.yml    | 6 +-----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 516f294a..db264fa6 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -22,15 +22,15 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Check diff chart
+        run: make ci:diff
+
       - name: Setup Helm
         run: make ci:enable:helm
 
       - name: Setup Kubeval
         run: make ci:enable:kubeval
 
-      - name: Check diff chart
-        run: make ci:diff
-
       - name: Check chart version
         run: make ci:diff:chart | xargs -I{} /bin/bash -c "cd ./{} && ../.github/scripts/check-version.sh || exit 255"
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e1dfb920..f6440301 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,11 +1,9 @@
 name: Publish Helm Chart
 
 on:
-  workflow_run:
-    workflows:
-      - "Test Helm Chart"
-    types:
-      - completed
+  push:
+    branches:
+      - "master"
 
 permissions:
   contents: write
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b4aef21b..d6432d8d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,11 +1,7 @@
 name: Test Helm Chart
 
 on:
-  workflow_run:
-    workflows:
-      - "Lint Helm Chart"
-    types:
-      - completed
+  push:
     branches-ignore:
       - "gh-pages"
 

From c8c5ebf5975925d2770752422200c3e8374bf107 Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Wed, 12 Jun 2024 14:44:50 +0900
Subject: [PATCH 11/14] test ci

---
 example/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/Chart.yaml b/example/Chart.yaml
index a592f860..4d5e871a 100644
--- a/example/Chart.yaml
+++ b/example/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "1.0"
+appVersion: "1.1"
 description: A Helm chart for Kubernetes
 name: example
-version: 0.2.0
+version: 0.2.1

From 6da9fe7d26fce23178adddaa7f2a4e2a246a2439 Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Wed, 12 Jun 2024 15:18:43 +0900
Subject: [PATCH 12/14] bump k8s

---
 Makefile                      | 8 ++++----
 akka/Makefile                 | 2 +-
 argoproj-crd/Makefile         | 2 +-
 aws-ebs-csi-driver/Makefile   | 2 +-
 aws-secret-operator/Makefile  | 2 +-
 burrow/Makefile               | 2 +-
 docker-registry/Makefile      | 2 +-
 dynamodb/Makefile             | 2 +-
 elasticmq/Makefile            | 2 +-
 envoy/Makefile                | 2 +-
 example/Makefile              | 2 +-
 fluentd/Makefile              | 2 +-
 gcp-credentials/Makefile      | 2 +-
 kube-schedule-scaler/Makefile | 2 +-
 mailcatcher/Makefile          | 2 +-
 mysql/Makefile                | 2 +-
 newrelic-php-agent/Makefile   | 2 +-
 php/Makefile                  | 2 +-
 postfix/Makefile              | 2 +-
 regcred/Makefile              | 2 +-
 slime/Makefile                | 2 +-
 twistlock-console/Makefile    | 2 +-
 twistlock-defender/Makefile   | 2 +-
 23 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index e8a76f7e..e708bb36 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-KIND_VERSION = 0.20.0
-KUBERNETES_VERSION = 1.28.0
-KIND_NODE_HASH = b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
-HELM_VERSION = 3.13.2
+KIND_VERSION = 0.23.0
+KUBERNETES_VERSION = 1.30.0
+KIND_NODE_HASH = 047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
+HELM_VERSION = 3.15.1
 KUBEVAL_VERSION = 0.16.1
 
 .PHONY: apply
diff --git a/akka/Makefile b/akka/Makefile
index 00838c9e..1ac45240 100644
--- a/akka/Makefile
+++ b/akka/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/argoproj-crd/Makefile b/argoproj-crd/Makefile
index 9242b419..4bb907b8 100644
--- a/argoproj-crd/Makefile
+++ b/argoproj-crd/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/aws-ebs-csi-driver/Makefile b/aws-ebs-csi-driver/Makefile
index d68b08aa..466cdd2e 100644
--- a/aws-ebs-csi-driver/Makefile
+++ b/aws-ebs-csi-driver/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/aws-secret-operator/Makefile b/aws-secret-operator/Makefile
index 6684e1af..6b4465de 100644
--- a/aws-secret-operator/Makefile
+++ b/aws-secret-operator/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/burrow/Makefile b/burrow/Makefile
index 7c1ef082..84368925 100644
--- a/burrow/Makefile
+++ b/burrow/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/docker-registry/Makefile b/docker-registry/Makefile
index d074c90d..3d47659c 100644
--- a/docker-registry/Makefile
+++ b/docker-registry/Makefile
@@ -1,5 +1,5 @@
 
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = "$$(basename $$PWD)"
 
 .PHONY: install
diff --git a/dynamodb/Makefile b/dynamodb/Makefile
index e07ee62f..a41001fa 100644
--- a/dynamodb/Makefile
+++ b/dynamodb/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/elasticmq/Makefile b/elasticmq/Makefile
index e07ee62f..a41001fa 100644
--- a/elasticmq/Makefile
+++ b/elasticmq/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/envoy/Makefile b/envoy/Makefile
index b1548737..caf7769d 100644
--- a/envoy/Makefile
+++ b/envoy/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/example/Makefile b/example/Makefile
index e07ee62f..a41001fa 100644
--- a/example/Makefile
+++ b/example/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/fluentd/Makefile b/fluentd/Makefile
index f66d98e7..d4dc3e6e 100644
--- a/fluentd/Makefile
+++ b/fluentd/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/gcp-credentials/Makefile b/gcp-credentials/Makefile
index 6684e1af..6b4465de 100644
--- a/gcp-credentials/Makefile
+++ b/gcp-credentials/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/kube-schedule-scaler/Makefile b/kube-schedule-scaler/Makefile
index 6684e1af..6b4465de 100644
--- a/kube-schedule-scaler/Makefile
+++ b/kube-schedule-scaler/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/mailcatcher/Makefile b/mailcatcher/Makefile
index a418bca3..89439b2f 100644
--- a/mailcatcher/Makefile
+++ b/mailcatcher/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/mysql/Makefile b/mysql/Makefile
index 7cdcf835..429f1f6e 100644
--- a/mysql/Makefile
+++ b/mysql/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/newrelic-php-agent/Makefile b/newrelic-php-agent/Makefile
index e07ee62f..a41001fa 100644
--- a/newrelic-php-agent/Makefile
+++ b/newrelic-php-agent/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/php/Makefile b/php/Makefile
index b798a942..c8250745 100644
--- a/php/Makefile
+++ b/php/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/postfix/Makefile b/postfix/Makefile
index 620a9ee6..7dee0b2e 100644
--- a/postfix/Makefile
+++ b/postfix/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 helmInstallOptions = -i --wait --set "terminationGracePeriodSeconds=0"
diff --git a/regcred/Makefile b/regcred/Makefile
index 6684e1af..6b4465de 100644
--- a/regcred/Makefile
+++ b/regcred/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/slime/Makefile b/slime/Makefile
index 8b1ec0ef..33e40e95 100644
--- a/slime/Makefile
+++ b/slime/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/twistlock-console/Makefile b/twistlock-console/Makefile
index 76fc006d..aefe3089 100644
--- a/twistlock-console/Makefile
+++ b/twistlock-console/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/twistlock-defender/Makefile b/twistlock-defender/Makefile
index 76fc006d..aefe3089 100644
--- a/twistlock-defender/Makefile
+++ b/twistlock-defender/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install

From 5546e89a8f0c61fea88013722a2baf21aeaa1134 Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Wed, 12 Jun 2024 15:22:51 +0900
Subject: [PATCH 13/14] Revert "bump k8s"

This reverts commit 6da9fe7d26fce23178adddaa7f2a4e2a246a2439.
---
 Makefile                      | 8 ++++----
 akka/Makefile                 | 2 +-
 argoproj-crd/Makefile         | 2 +-
 aws-ebs-csi-driver/Makefile   | 2 +-
 aws-secret-operator/Makefile  | 2 +-
 burrow/Makefile               | 2 +-
 docker-registry/Makefile      | 2 +-
 dynamodb/Makefile             | 2 +-
 elasticmq/Makefile            | 2 +-
 envoy/Makefile                | 2 +-
 example/Makefile              | 2 +-
 fluentd/Makefile              | 2 +-
 gcp-credentials/Makefile      | 2 +-
 kube-schedule-scaler/Makefile | 2 +-
 mailcatcher/Makefile          | 2 +-
 mysql/Makefile                | 2 +-
 newrelic-php-agent/Makefile   | 2 +-
 php/Makefile                  | 2 +-
 postfix/Makefile              | 2 +-
 regcred/Makefile              | 2 +-
 slime/Makefile                | 2 +-
 twistlock-console/Makefile    | 2 +-
 twistlock-defender/Makefile   | 2 +-
 23 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index e708bb36..e8a76f7e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-KIND_VERSION = 0.23.0
-KUBERNETES_VERSION = 1.30.0
-KIND_NODE_HASH = 047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
-HELM_VERSION = 3.15.1
+KIND_VERSION = 0.20.0
+KUBERNETES_VERSION = 1.28.0
+KIND_NODE_HASH = b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
+HELM_VERSION = 3.13.2
 KUBEVAL_VERSION = 0.16.1
 
 .PHONY: apply
diff --git a/akka/Makefile b/akka/Makefile
index 1ac45240..00838c9e 100644
--- a/akka/Makefile
+++ b/akka/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/argoproj-crd/Makefile b/argoproj-crd/Makefile
index 4bb907b8..9242b419 100644
--- a/argoproj-crd/Makefile
+++ b/argoproj-crd/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/aws-ebs-csi-driver/Makefile b/aws-ebs-csi-driver/Makefile
index 466cdd2e..d68b08aa 100644
--- a/aws-ebs-csi-driver/Makefile
+++ b/aws-ebs-csi-driver/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/aws-secret-operator/Makefile b/aws-secret-operator/Makefile
index 6b4465de..6684e1af 100644
--- a/aws-secret-operator/Makefile
+++ b/aws-secret-operator/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/burrow/Makefile b/burrow/Makefile
index 84368925..7c1ef082 100644
--- a/burrow/Makefile
+++ b/burrow/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/docker-registry/Makefile b/docker-registry/Makefile
index 3d47659c..d074c90d 100644
--- a/docker-registry/Makefile
+++ b/docker-registry/Makefile
@@ -1,5 +1,5 @@
 
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = "$$(basename $$PWD)"
 
 .PHONY: install
diff --git a/dynamodb/Makefile b/dynamodb/Makefile
index a41001fa..e07ee62f 100644
--- a/dynamodb/Makefile
+++ b/dynamodb/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/elasticmq/Makefile b/elasticmq/Makefile
index a41001fa..e07ee62f 100644
--- a/elasticmq/Makefile
+++ b/elasticmq/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/envoy/Makefile b/envoy/Makefile
index caf7769d..b1548737 100644
--- a/envoy/Makefile
+++ b/envoy/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/example/Makefile b/example/Makefile
index a41001fa..e07ee62f 100644
--- a/example/Makefile
+++ b/example/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/fluentd/Makefile b/fluentd/Makefile
index d4dc3e6e..f66d98e7 100644
--- a/fluentd/Makefile
+++ b/fluentd/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/gcp-credentials/Makefile b/gcp-credentials/Makefile
index 6b4465de..6684e1af 100644
--- a/gcp-credentials/Makefile
+++ b/gcp-credentials/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/kube-schedule-scaler/Makefile b/kube-schedule-scaler/Makefile
index 6b4465de..6684e1af 100644
--- a/kube-schedule-scaler/Makefile
+++ b/kube-schedule-scaler/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/mailcatcher/Makefile b/mailcatcher/Makefile
index 89439b2f..a418bca3 100644
--- a/mailcatcher/Makefile
+++ b/mailcatcher/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/mysql/Makefile b/mysql/Makefile
index 429f1f6e..7cdcf835 100644
--- a/mysql/Makefile
+++ b/mysql/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/newrelic-php-agent/Makefile b/newrelic-php-agent/Makefile
index a41001fa..e07ee62f 100644
--- a/newrelic-php-agent/Makefile
+++ b/newrelic-php-agent/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/php/Makefile b/php/Makefile
index c8250745..b798a942 100644
--- a/php/Makefile
+++ b/php/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/postfix/Makefile b/postfix/Makefile
index 7dee0b2e..620a9ee6 100644
--- a/postfix/Makefile
+++ b/postfix/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 helmInstallOptions = -i --wait --set "terminationGracePeriodSeconds=0"
diff --git a/regcred/Makefile b/regcred/Makefile
index 6b4465de..6684e1af 100644
--- a/regcred/Makefile
+++ b/regcred/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/slime/Makefile b/slime/Makefile
index 33e40e95..8b1ec0ef 100644
--- a/slime/Makefile
+++ b/slime/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/twistlock-console/Makefile b/twistlock-console/Makefile
index aefe3089..76fc006d 100644
--- a/twistlock-console/Makefile
+++ b/twistlock-console/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install
diff --git a/twistlock-defender/Makefile b/twistlock-defender/Makefile
index aefe3089..76fc006d 100644
--- a/twistlock-defender/Makefile
+++ b/twistlock-defender/Makefile
@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.30.0"}
+KUBERNETES_VERSION = $${KUBERNETES_VERSION:-"1.28.0"}
 RELEASE = $$(basename $$PWD)
 
 .PHONY: install

From 0aa717859c6f6fcf42e0a4aef04e5cd00dd92d35 Mon Sep 17 00:00:00 2001
From: cw-sakamoto <sakamoto@chatwork.com>
Date: Wed, 12 Jun 2024 16:50:54 +0900
Subject: [PATCH 14/14] fix burrow Makefile

---
 burrow/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/burrow/Makefile b/burrow/Makefile
index 7c1ef082..36236978 100644
--- a/burrow/Makefile
+++ b/burrow/Makefile
@@ -3,7 +3,7 @@ RELEASE = $$(basename $$PWD)
 
 .PHONY: install
 install:
-	helm install --wait sample-kafka oci://registry-1.docker.io/bitnamicharts/kafka
+	helm upgrade -i --wait sample-kafka oci://registry-1.docker.io/bitnamicharts/kafka --version 20.1.1
 	helm upgrade -i --wait --set readinessProbe.enable=false --set livenessProbe.enable=false $(RELEASE) .
 
 .PHONY: lint