jahanson/theshire
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

update prettier config && format renovate

Browse source
This commit is contained in:
Joseph Hanson 2024-09-05 16:21:42 -05:00
parent f1085d5f39
commit e6021cba90
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o
5 changed files with 118 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.prettierrc Normal file
View file

@ -0,0 +1,4 @@
{
"quoteProps": "preserve",
"trailingComma": "none"
}

40
.renovate/autoMerge.json5
View file

@ -1,22 +1,22 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"packageRules": [
{
"description": "Auto merge container digests",
"matchDatasources": ["docker"],
"automerge": true,
"automergeType": "branch",
"matchUpdateTypes": ["digest"],
"matchPackagePrefixes": ["ghcr.io/onedr0p", "ghcr.io/bjw-s"],
"ignoreTests": true
},
{
"description": "Auto merge KPS minors and patches",
"matchDatasources": ["helm"],
"automerge": true,
"matchUpdateTypes": ["minor", "patch"],
"matchDepNames": ["kube-prometheus-stack"],
"ignoreTests": false
}
]
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"packageRules": [
{
"description": "Auto merge container digests",
"matchDatasources": ["docker"],
"automerge": true,
"automergeType": "branch",
"matchUpdateTypes": ["digest"],
"matchPackagePrefixes": ["ghcr.io/onedr0p", "ghcr.io/bjw-s"],
"ignoreTests": true
},
{
"description": "Auto merge KPS minors and patches",
"matchDatasources": ["helm"],
"automerge": true,
"matchUpdateTypes": ["minor", "patch"],
"matchDepNames": ["kube-prometheus-stack"],
"ignoreTests": false
}
]
}

82
.renovate/customManagers.json5
View file

@ -1,37 +1,49 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"customDatasources": {
"grafana-dashboards": {
"defaultRegistryUrlTemplate": "https://grafana.com/api/dashboards/{{packageName}}",
"format": "json",
"transformTemplates": [
"{\"releases\":[{\"version\": $string(revision)}]}"
]
}
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"customDatasources": {
"grafana-dashboards": {
"defaultRegistryUrlTemplate": "https://grafana.com/api/dashboards/{{packageName}}",
"format": "json",
"transformTemplates": [
"{\"releases\":[{\"version\": $string(revision)}]}"
]
}
},
"customManagers": [
{
"customType": "regex",
"description": "Process Grafana dashboards",
"fileMatch": ["(^|/)kubernetes/.+\\.ya?ml(\\.j2)?$"],
"matchStrings": [
"depName=\"(?<depName>\\S+)\"\\n.*?gnetId: (?<packageName>\\d+)\\n.*?revision: (?<currentValue>\\d+)"
],
"datasourceTemplate": "custom.grafana-dashboards",
"versioningTemplate": "regex:^(?<major>\\d+)$"
},
"customManagers": [
{
"customType": "regex",
"description": "Process Grafana dashboards",
"fileMatch": [
"(^|/)kubernetes/.+\\.ya?ml(\\.j2)?$"
],
"matchStrings": [
"depName=\"(?<depName>\\S+)\"\\n.*?gnetId: (?<packageName>\\d+)\\n.*?revision: (?<currentValue>\\d+)"
],
"datasourceTemplate": "custom.grafana-dashboards",
"versioningTemplate": "regex:^(?<major>\\d+)$"
}
],
"packageRules": [
{
"addLabels": ["renovate/grafana-dashboard"],
"commitMessageExtra": "to revision {{newVersion}}",
"commitMessageTopic": "dashboard {{depName}}",
"matchDatasources": ["grafana-dashboards", "custom.grafana-dashboards"],
"matchUpdateTypes": ["major"],
"semanticCommitScope": "grafana-dashboards",
"semanticCommitType": "chore"
}
]
}
{
"customType": "regex",
"description": ["Process custom dependencies"],
"fileMatch": ["(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$"],
"matchStrings": [
// # renovate: datasource=helm depName=cilium repository=https://helm.cilium.io
// version: 1.15.1
"datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( repository=(?<registryUrl>\\S+))?\\n.+: (&\\S+\\s)?(?<currentValue>\\S+)",
// # renovate: datasource=github-releases depName=rancher/system-upgrade-controller
// https://github.com/rancher/system-upgrade-controller/releases/download/v0.13.2/crd.yaml
"datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)\\n.+/(?<currentValue>(v|\\d)[^/]+)"
],
"datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}"
}
],
"packageRules": [
{
"addLabels": ["renovate/grafana-dashboard"],
"commitMessageExtra": "to revision {{newVersion}}",
"commitMessageTopic": "dashboard {{depName}}",
"matchDatasources": ["grafana-dashboards", "custom.grafana-dashboards"],
"matchUpdateTypes": ["major"],
"semanticCommitScope": "grafana-dashboards",
"semanticCommitType": "chore"
}
]
}

6
.vscode/settings.json vendored
View file

@ -42,5 +42,9 @@
"files.trimTrailingWhitespace": true,
"ansible.python.interpreterPath": "/usr/bin/python3",
"sops.defaults.ageKeyFile": "age.key",
"ansible.validation.lint.path": "~/projects/valinor/.venv/bin/ansible-lint"
"ansible.validation.lint.path": "~/projects/valinor/.venv/bin/ansible-lint",
"prettier.quoteProps": "preserve",
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
}

153
renovate.json5
View file

@ -8,57 +8,39 @@
],
"ignorePaths": [".archive/**"],
"flux": {
"fileMatch": [
"kubernetes/.+\\.ya?ml$"
]
"fileMatch": ["kubernetes/.+\\.ya?ml$"]
},
"helm-values": {
"fileMatch": [
"kubernetes/.+\\.ya?ml$"
]
"fileMatch": ["kubernetes/.+\\.ya?ml$"]
},
"kubernetes": {
"fileMatch": [
"kubernetes/.+\\.ya?ml$"
]
"fileMatch": ["kubernetes/.+\\.ya?ml$"]
},
"regexManagers": [
{
"description": [
"Process CRD dependencies - Chart and Github Release are the same version"
],
"fileMatch": [
"kubernetes/.+\\.ya?ml$"
],
"fileMatch": ["kubernetes/.+\\.ya?ml$"],
"matchStrings": [
"# renovate: registryUrl=(?<registryUrl>\\S+) chart=(?<depName>\\S+)\n.*?(?<currentValue>[^-\\s]*)\n",
"# renovate: registryUrl=(?<registryUrl>\\S+) chart=(?<depName>\\S+)\n.*?(?<currentValue>[^-\\s]*)\n"
],
"datasourceTemplate": "helm"
},
{
"description": [
"Generic Docker image Regex manager"
],
"fileMatch": [
"infrastructure/.+\\.ya?ml$",
"infrastructure/.+\\.tf$"
],
"description": ["Generic Docker image Regex manager"],
"fileMatch": ["infrastructure/.+\\.ya?ml$", "infrastructure/.+\\.tf$"],
"matchStrings": [
"# renovate: docker-image( versioning=(?<versioning>.*=?))?\n .*[:|=] \"?(?<depName>.*?):(?<currentValue>[^\"\n]*=?)\"?",
"# renovate: docker-image( versioning=(?<versioning>.*=?))?\n .*[:|=] \"?(?<depName>.*?):(?<currentValue>[^\"\n]*=?)\"?"
],
"datasourceTemplate": "docker",
"versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
},
{
"description": [
"Raw GitHub URL Regex manager"
],
"fileMatch": [
"infrastructure/.+\\.ya?ml$",
"kubernetes/.+\\.ya?ml$"
],
"description": ["Raw GitHub URL Regex manager"],
"fileMatch": ["infrastructure/.+\\.ya?ml$", "kubernetes/.+\\.ya?ml$"],
"matchStrings": [
"https:\\/\\/raw.githubusercontent.com\\/(?<depName>[\\w\\d\\-_]+\\/[\\w\\d\\-_]+)\\/(?<currentValue>[\\w\\d\\.\\-_]+)\\/.*",
"https:\\/\\/raw.githubusercontent.com\\/(?<depName>[\\w\\d\\-_]+\\/[\\w\\d\\-_]+)\\/(?<currentValue>[\\w\\d\\.\\-_]+)\\/.*"
],
"datasourceTemplate": "github-releases",
"versioningTemplate": "semver"
@ -67,87 +49,60 @@
"packageRules": [
{
"description": "Use custom versioning for Vector",
"matchDatasources": [
"docker"
],
"matchPackageNames": [
"docker.io/timberio/vector"
],
"matchDatasources": ["docker"],
"matchPackageNames": ["docker.io/timberio/vector"],
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-(?<compatibility>.*)$"
},
{
"description": "Use custom versioning for Minio",
"matchDatasources": [
"docker"
],
"matchDatasources": ["docker"],
"versioning": "regex:^RELEASE\\.(?<major>\\d+)-(?<minor>\\d+)-(?<patch>\\d+)T.*Z(-(?<compatibility>.*))?$",
"matchPackageNames": [
"quay.io/minio/minio"
]
"matchPackageNames": ["quay.io/minio/minio"]
},
{
"description": "Flux Group",
"groupName": "Flux",
"matchPackagePatterns": [
"^flux",
"^ghcr.io/fluxcd/"
],
"matchDatasources": [
"docker",
"github-tags"
],
"matchPackagePatterns": ["^flux", "^ghcr.io/fluxcd/"],
"matchDatasources": ["docker", "github-tags"],
"versioning": "semver",
"group": {
"commitMessageTopic": "{{{groupName}}} group",
"commitMessageTopic": "{{{groupName}}} group"
},
"separateMinorPatch": true,
"separateMinorPatch": true
},
{
"description": "Mastodon images",
"groupName": "Mastodon",
"matchPackagePatterns": [
"mastodon",
"^ghcr.io/mastodon/"
],
"matchDatasources": [
"docker",
"github-tags"
],
"matchPackagePatterns": ["mastodon", "^ghcr.io/mastodon/"],
"matchDatasources": ["docker", "github-tags"],
"versioning": "semver",
"group": {
"commitMessageTopic": "{{{groupName}}} group",
"commitMessageTopic": "{{{groupName}}} group"
},
"separateMinorPatch": true,
"separateMinorPatch": true
},
{
"description": "1Password Connect images",
"groupName": "1password-connect",
"matchPackageNames": [
"docker.io/1password/connect-sync",
"docker.io/1password/connect-api",
],
"matchDatasources": [
"docker"
"docker.io/1password/connect-api"
],
"matchDatasources": ["docker"],
"group": {
"commitMessageTopic": "{{{groupName}}} group"
},
"separateMinorPatch": true,
"separateMinorPatch": true
},
{
"description": "Rook-Ceph image and chart",
"groupName": "Rook Ceph",
"matchPackagePatterns": [
"rook.ceph"
],
"matchDatasources": [
"docker",
"helm"
],
"matchPackagePatterns": ["rook.ceph"],
"matchDatasources": ["docker", "helm"],
"group": {
"commitMessageTopic": "{{{groupName}}} group"
},
"separateMinorPatch": true,
"separateMinorPatch": true
},
{
"description": "Cilium image and chart",
@ -155,16 +110,13 @@
"matchPackageNames": [
"quay.io/cilium/cilium",
"quay.io/cilium/operator-generic",
"cilium",
],
"matchDatasources": [
"helm",
"docker"
"cilium"
],
"matchDatasources": ["helm", "docker"],
"group": {
"commitMessageTopic": "{{{groupName}}} group"
},
"separateMinorPatch": true,
"separateMinorPatch": true
},
{
"description": "External Snapshotter charts",
@ -173,9 +125,7 @@
"snapshot-controller",
"snapshot-validation-webhook"
],
"matchDatasources": [
"helm"
],
"matchDatasources": ["helm"],
"group": {
"commitMessageTopic": "{{{groupName}}} group"
},
@ -184,42 +134,23 @@
{
"description": "Thanos image and chart - versions do not match",
"groupName": "Thanos",
"matchPackagePatterns": [
"quay.io/thanos/thanos",
"thanos"
],
"matchDatasources": [
"docker",
"github-releases",
"helm"
],
"matchUpdateTypes": [
"minor",
"patch"
],
"matchPackagePatterns": ["quay.io/thanos/thanos", "thanos"],
"matchDatasources": ["docker", "github-releases", "helm"],
"matchUpdateTypes": ["minor", "patch"],
"group": {
"commitMessageTopic": "{{{groupName}}} group"
},
}
},
{
"description": "Vector image and chart - versions do not match",
"groupName": "Vector",
"matchPackagePatterns": [
"vector"
],
"matchDatasources": [
"docker",
"github-releases",
"helm"
],
"matchUpdateTypes": [
"minor",
"patch"
],
"matchPackagePatterns": ["vector"],
"matchDatasources": ["docker", "github-releases", "helm"],
"matchUpdateTypes": ["minor", "patch"],
"group": {
"commitMessageTopic": "{{{groupName}}} group"
},
},
}
}
// Version strategies
]
}