From 87a67d4ec5dc32e7fbfe83ce75071053957c596f Mon Sep 17 00:00:00 2001
From: Scotte Zinn <scotte@zinn.ca>
Date: Wed, 27 Mar 2024 08:46:13 -0400
Subject: [PATCH] More renovate tweaks

---
 .github/linters/prettier/.prettierrc.yaml |  3 ++-
 .github/renovate.json5                    |  4 ++--
 .github/renovate/packageRules.json5       | 16 +++++++++------
 .prettierrc                               | 25 -----------------------
 4 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 .prettierrc

diff --git a/.github/linters/prettier/.prettierrc.yaml b/.github/linters/prettier/.prettierrc.yaml
index 2e643f08a7..f3957ee556 100644
--- a/.github/linters/prettier/.prettierrc.yaml
+++ b/.github/linters/prettier/.prettierrc.yaml
@@ -1,7 +1,8 @@
 ---
-trailingComma: "es5"
+trailingComma: "none"
 tabWidth: 2
 semi: false
 singleQuote: false
 bracketSpacing: false
 useTabs: false
+quoteProps: "preserve"
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index c18feb6aad..04b197d8b3 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -2,6 +2,7 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "github>szinn/renovate-config",
+    "docker:pinDigests",
     "github>szinn/k8s-homelab//.github/renovate/allowedVersions.json5",
     "github>szinn/k8s-homelab//.github/renovate/autoMerge.json5",
     "github>szinn/k8s-homelab//.github/renovate/clusters.json5",
@@ -9,8 +10,7 @@
     "github>szinn/k8s-homelab//.github/renovate/disabledDatasources.json5",
     "github>szinn/k8s-homelab//.github/renovate/groups.json5",
     "github>szinn/k8s-homelab//.github/renovate/grafanaDashboards.json5",
-    "github>szinn/k8s-homelab//.github/renovate/packageRules.json5",
-    "docker:pinDigests"
+    "github>szinn/k8s-homelab//.github/renovate/packageRules.json5"
   ],
   "ignorePaths": [
     "kubernetes/main/apps/media/recyclarr/app/config/recyclarr.yaml",
diff --git a/.github/renovate/packageRules.json5 b/.github/renovate/packageRules.json5
index 0f88c2ef0f..637f247ff6 100644
--- a/.github/renovate/packageRules.json5
+++ b/.github/renovate/packageRules.json5
@@ -3,10 +3,7 @@
   "packageRules": [
     {
       "description": ["Loose versioning for non-semver packages"],
-      "matchDatasources": [
-        "docker",
-        "github-releases"
-      ],
+      "matchDatasources": ["docker", "github-releases"],
       "versioning": "loose",
       "matchPackagePatterns": ["changedetection", "plex", "qbittorrent"]
     },
@@ -35,9 +32,16 @@
       "matchPackagePatterns": ["minio"]
     },
     {
-      "description": ["Don't pin digests for app-template"],
+      "description": [
+        "Don't pin digests for packages that don't have a digest"
+      ],
       "matchDatasources": ["docker"],
-      "matchPackageNames": ["ghcr.io/bjw-s/helm/app-template", "ghcr.io/fluxcd/flux-manifests"],
+      "matchPackageNames": [
+        "ghcr.io/bjw-s/helm/app-template",
+        "ghcr.io/fluxcd/flux-manifests",
+        "ghcr.io/actions/actions-runner-controller-charts/gha-runner-scale-set",
+        "ghcr.io/actions/actions-runner-controller-charts/gha-runner-scale-set-controller"
+      ],
       "pinDigests": false
     }
   ]
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index b48ca9cf50..0000000000
--- a/.prettierrc
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "useTabs": false,
-  "singleQuote": true,
-  "trailingComma": "none",
-  "printWidth": 120,
-  "plugins": [],
-  "overrides": [
-    {
-      "files": ["*.yaml", ".prettierrc"],
-      "options": {
-        "quoteProps": "preserve",
-        "singleQuote": false,
-        "tabWidth": 2
-      }
-    },
-    {
-      "files": "*.json5",
-      "options": {
-        "quoteProps": "preserve",
-        "singleQuote": false,
-        "tabWidth": 2
-      }
-    }
-  ]
-}