ci: revisit release workflow + config kodiak

.github/workflows/chart-test.yml

@@ -141,4 +141,4 @@ jobs:
       if: always()
       run: |
         helm uninstall hyperdx-test || true
-        kind delete cluster --name hyperdx-test || true
+        kind delete cluster --name hyperdx-test || true

.github/workflows/helm-test.yaml

@@ -7,8 +7,6 @@ on:
       - 'charts/**'
   pull_request:
     branches: [ main ]
-    paths:
-      - 'charts/**'
 
 jobs:
   helm-unittest:
@@ -35,4 +33,4 @@ jobs:
 
       - name: Run helm-unittest
         run: |
-          helm unittest charts/hdx-oss-v2 
+          helm unittest charts/hdx-oss-v2 

.github/workflows/release.yml

@@ -1,6 +1,9 @@
 name: Release Helm Charts
 on:
-  push:
+  workflow_run:
+    workflows: ["Helm Chart Tests", "Helm Chart Integration Test"]
+    types:
+      - completed
     branches:
       - main
 
@@ -12,6 +15,7 @@ permissions:
 jobs:
   release:
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -33,6 +37,7 @@ jobs:
           commit: 'chore(release): bump version'
           title: 'Release HyperDX Helm Charts'
           version: yarn run version
+          publish: yarn run release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Run chart-releaser job

.kodiak.toml

@@ -0,0 +1,99 @@
+version = 1
+
+[merge]
+# Label to enable Kodiak to merge a PR.
+automerge_label = "automerge"
+
+# When disabled, Kodiak will immediately attempt to merge any PR that passes all
+# GitHub branch protection requirements.
+require_automerge_label = true
+
+# If you're using the "Require signed commits" GitHub Branch Protection setting
+# to require commit signatures, "merge" or "squash" are the only compatible options. "rebase" will cause Kodiak to raise a configuration error.
+method = "squash" # default: "merge", options: "merge", "squash", "rebase"
+
+# Once a PR is merged, delete the branch. This option behaves like the GitHub
+# repository setting "Automatically delete head branches", which automatically
+# deletes head branches after pull requests are merged.
+delete_branch_on_merge = true # default: false
+
+# If there is a merge conflict, make a comment on the PR and remove the
+# automerge label. This option only applies when `merge.require_automerge_label`
+# is enabled.
+notify_on_conflict = true # default: true
+
+# Don't wait for in-progress status checks on a PR to finish before updating the
+# branch.
+optimistic_updates = true # default: true
+
+# If a PR is passing all checks and is able to be merged, merge it without
+# placing it in the merge queue. This option adds some unfairness where PRs
+# waiting in the queue the longest are not served first.
+prioritize_ready_to_merge = true # default: false
+
+# Never merge a PR. This option can be used with `update.always` to
+# automatically update a PR without merging.
+do_not_merge = false # default: false
+
+[merge.message]
+# By default (`"github_default"`), GitHub uses the title of a PR's first commit
+# for the merge commit title. `"pull_request_title"` uses the PR title for the
+# merge commit.
+title = "pull_request_title" # default: "github_default", options: "github_default", "pull_request_title"
+
+# By default (`"github_default"`), GitHub combines the titles of a PR's commits
+# to create the body text of a merge commit. `"pull_request_body"` uses the
+# content of the PR to generate the body content while `"empty"` sets an empty
+# body.
+body = "pull_request_body" # default: "github_default", options: "github_default", "pull_request_body", "empty"
+
+# Append the Pull Request URL to the merge message. Makes navigating to the PR
+# from the commit easier.
+#### NOTE: 'true' required for benchmarks in CI:
+include_pull_request_url = false # default: false
+
+# Add the PR number to the merge commit title. This setting replicates GitHub's
+# behavior of automatically adding the PR number to the title of merges created
+# through the UI. This option only applies when `merge.message.title` does not
+# equal `"github_default"`.
+### NOTE: if this is set to true github links to unrelated OSS issues, which is confusing
+include_pr_number = true # default: true
+
+# Control the text used in the merge commit. The GitHub default is markdown, but
+# `"plain_text"` or `"html"` can be used to render the pull request body as text
+# or HTML. This option only applies when `merge.message.body = "pull_request_body"`.
+body_type = "markdown" # default: "markdown", options: "plain_text", "markdown", "html"
+
+# Strip HTML comments (`<!-- some HTML comment -->`) from merge commit body.
+# This setting is useful for stripping HTML comments created by PR templates.
+# This option only applies when `merge.message.body_type = "markdown"`.
+strip_html_comments = true # default: false
+
+# Remove all content before the configured string in the pull request body.
+# This setting is useful when we want to include only a part of the pull request
+# description as the commit message.
+# This option only applies when `merge.message.body_type = "markdown"`.
+cut_body_before = "<!-- kodiak-commit-message-body-start: do not remove/edit this line -->"
+
+include_coauthors = true
+
+[update]
+
+# Update a PR whenever out of date with the base branch. The PR will be updated
+# regardless of merge requirements (e.g. failing status checks, missing reviews,
+# blacklist labels).
+#
+# Kodiak will only update PRs with the `merge.automerge_label` label or if
+# `update.require_automerge_label = false`.
+#
+# When enabled, _Kodiak will not be able to efficiently update PRs._ If you have
+# multiple PRs against a target like `master`, any time a commit is added to
+# `master` _all_ of those PRs against `master` will update. For `N` PRs against
+# a target you will see at least `N(N-1)/2` updates. If this configuration
+# option was disabled you would only see at least `N-1` updates.
+always = false # default: false
+
+# When enabled, Kodiak will only update PRs that have an automerge label
+# (configured via `merge.automerge_label`). When disable, Kodiak will update any
+# PR. This option only applies when `update.always = true`.
+require_automerge_label = true # default: true

package.json

@@ -1,12 +1,13 @@
 {
   "name": "helm-charts",
   "version": "0.5.2",
+  "private": true,
   "main": "index.js",
   "repository": "[email protected]:hyperdxio/helm-charts.git",
   "author": "HyperDX",
   "license": "MIT",
   "scripts": {
-    "release": "changeset publish",
+    "release": "",
     "version": "changeset version && npm run update-chart-versions",
     "update-chart-versions": "node scripts/update-chart-versions.js"
   },