Merge branch 'main' into dependabot/pip/molecule-24.9.0

edwardtheharris · Oct 20, 2024 · 3394af1 · 3394af1
2 parents 3d13765 + e1032cc
commit 3394af1
Show file tree

Hide file tree

Showing 3 changed files with 122 additions and 98 deletions.
diff --git a/.github/workflows/dependabotautomerge.yml b/.github/workflows/dependabotautomerge.yml
@@ -0,0 +1,23 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'edwardtheharris/helm-monero-node'
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@main
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        if: contains(steps.metadata.outputs.dependency-names, 'my-dependency') && steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/roles/init/templates/init.yaml b/roles/init/templates/init.yaml
@@ -31,7 +31,7 @@ dns: {}
 #     dataDir: /var/lib/etcd
 imageRepository: registry.k8s.io
 kind: ClusterConfiguration
-kubernetesVersion: 1.30.0
+kubernetesVersion: 1.31.1
 networking:
   dnsDomain: cluster.local
   podSubnet: 10.128.0.0/12