Skip to content

Commit

Permalink
fix files (#1317)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmalyska authored Apr 17, 2024
1 parent 3ff84f4 commit 6cb789f
Show file tree
Hide file tree
Showing 45 changed files with 353 additions and 353 deletions.
78 changes: 39 additions & 39 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/ubuntu
{
"name": "home-ops",
"image": "ghcr.io/mmalyska/home-ops-devcontainer:main@sha256:298c09ae2203b66dd69c1a9b4883383051e026f2c2695340b9ffe869fa233e7c",
"secrets": {
"SOPS_AGE_KEY": {
"description": "SOPS AGE key for decrypting secrets."
},
"TERRAFORM_TOKEN":{
"description": "Token to access terraform cloud."
}
},
"containerEnv": {
"SOPS_AGE_KEY": "${localEnv:SOPS_AGE_KEY}",
"TERRAFORM_TOKEN": "${localEnv:TERRAFORM_TOKEN}"
"name": "home-ops",
"image": "ghcr.io/mmalyska/home-ops-devcontainer:main@sha256:298c09ae2203b66dd69c1a9b4883383051e026f2c2695340b9ffe869fa233e7c",
"secrets": {
"SOPS_AGE_KEY": {
"description": "SOPS AGE key for decrypting secrets."
},
"onCreateCommand": "bash .devcontainer/scripts/onCreateCommand.sh ${containerWorkspaceFolder}",
"updateContentCommand": "bash .devcontainer/scripts/updateContentCommand.sh",
"remoteUser": "vscode",
"containerUser": "vscode",
"customizations": {
"vscode": {
// Set *default* container specific settings.json values on container create.
"settings": {
"vs-kubernetes": {
"vscode-kubernetes.kubectl-path": "/home/linuxbrew/.linuxbrew/bin/kubectl",
"vscode-kubernetes.helm-path": "/home/linuxbrew/.linuxbrew/bin/helm"
}
},
"extensions": [
"HashiCorp.terraform",
"britesnow.vscode-toggle-quotes",
"mitchdenny.ecdc",
"ms-kubernetes-tools.vscode-kubernetes-tools",
"oderwat.indent-rainbow",
"redhat.ansible",
"signageos.signageos-vscode-sops",
"usernamehw.errorlens",
"fcrespo82.markdown-table-formatter",
"ms-azuretools.vscode-docker",
"github.vscode-pull-request-github"
]
"TERRAFORM_TOKEN": {
"description": "Token to access terraform cloud."
}
},
"containerEnv": {
"SOPS_AGE_KEY": "${localEnv:SOPS_AGE_KEY}",
"TERRAFORM_TOKEN": "${localEnv:TERRAFORM_TOKEN}"
},
"onCreateCommand": "bash .devcontainer/scripts/onCreateCommand.sh ${containerWorkspaceFolder}",
"updateContentCommand": "bash .devcontainer/scripts/updateContentCommand.sh",
"remoteUser": "vscode",
"containerUser": "vscode",
"customizations": {
"vscode": {
// Set *default* container specific settings.json values on container create.
"settings": {
"vs-kubernetes": {
"vscode-kubernetes.kubectl-path": "/home/linuxbrew/.linuxbrew/bin/kubectl",
"vscode-kubernetes.helm-path": "/home/linuxbrew/.linuxbrew/bin/helm"
}
},
"extensions": [
"HashiCorp.terraform",
"britesnow.vscode-toggle-quotes",
"mitchdenny.ecdc",
"ms-kubernetes-tools.vscode-kubernetes-tools",
"oderwat.indent-rainbow",
"redhat.ansible",
"signageos.signageos-vscode-sops",
"usernamehw.errorlens",
"fcrespo82.markdown-table-formatter",
"ms-azuretools.vscode-docker",
"github.vscode-pull-request-github"
]
}
}
}
22 changes: 11 additions & 11 deletions .github/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/ubuntu
{
"name": "home-ops",
"build": {
"dockerfile": "./Dockerfile",
"context": "."
},
"remoteUser": "vscode",
"features": {
"ghcr.io/devcontainers/features/go": {},
"./local-features/homebrew": {},
"./local-features/common": {}
}
"name": "home-ops",
"build": {
"dockerfile": "./Dockerfile",
"context": "."
},
"remoteUser": "vscode",
"features": {
"ghcr.io/devcontainers/features/go": {},
"./local-features/homebrew": {},
"./local-features/common": {}
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{
"name": "Common",
"id": "common",
"version": "1.0.0",
"description": "Installs common resources",
"options": {},
"containerEnv": {
"NONINTERACTIVE": "1"
},
"installsAfter": [
"./local-features/homebrew"
]
}
"name": "Common",
"id": "common",
"version": "1.0.0",
"description": "Installs common resources",
"options": {},
"containerEnv": {
"NONINTERACTIVE": "1"
},
"installsAfter": ["./local-features/homebrew"]
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"name": "Homebrew",
"id": "homebrew",
"version": "1.0.0",
"description": "Installs Homebrew",
"options": {},
"containerEnv": {
"NONINTERACTIVE": "1",
"PATH": "${PATH}:/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin",
"MANPATH": "/home/linuxbrew/.linuxbrew/share/man:${MANPATH}",
"INFOPATH": "/home/linuxbrew/.linuxbrew/share/info:${INFOPATH}"
},
"installsAfter": [
"ghcr.io/devcontainers/features/common-utils"
]
}
"name": "Homebrew",
"id": "homebrew",
"version": "1.0.0",
"description": "Installs Homebrew",
"options": {},
"containerEnv": {
"NONINTERACTIVE": "1",
"PATH": "${PATH}:/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin",
"MANPATH": "/home/linuxbrew/.linuxbrew/share/man:${MANPATH}",
"INFOPATH": "/home/linuxbrew/.linuxbrew/share/info:${INFOPATH}"
},
"installsAfter": ["ghcr.io/devcontainers/features/common-utils"]
}
6 changes: 2 additions & 4 deletions .github/linters/.markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
# Default state for all rules
default: true

# MD013/line-length - Line length
Expand All @@ -8,15 +8,13 @@ MD013:
# Number of characters for headings
heading_line_length: 80
# Number of characters for code blocks
code_block_line_length: 80
code_block_line_length: 240
# Include code blocks
code_blocks: true
# Include tables
tables: true
# Include headings
headings: true
# Include headings
headers: true
# Strict length checking
strict: false
# Stern length checking
Expand Down
14 changes: 7 additions & 7 deletions .github/linters/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
**/cluster/system/prometheus-stack/dashboards
**/.git
charts/
**/charts/
.terraform/
.task/
.vscode/
.archive/
**/charts
**/.terraform
**/.task
**/.vscode
**/.archive
**/*.sops.*
**/*.sec.*
gotk-components.yaml
**/gotk-components.yaml
**/templates/*.y*ml
3 changes: 2 additions & 1 deletion .github/linters/.prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
trailingComma: "es5"
trailingComma: "all"
tabWidth: 2
semi: false
singleQuote: false
bracketSpacing: false
useTabs: false
bracketSameLine: true
quoteProps: "preserve"
14 changes: 7 additions & 7 deletions .github/mkdocs/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ markdown_extensions:
format: !!python/name:pymdownx.superfences.fence_code_format

nav:
- 'Introduction': index.md
- 'General':
- 'Hardware': general/hardware.md
- 'Network': general/network.md
- 'Home Ops':
- 'Kubernetes':
- 'ArgoCd': index.md
- "Introduction": index.md
- "General":
- "Hardware": general/hardware.md
- "Network": general/network.md
- "Home Ops":
- "Kubernetes":
- "ArgoCd": index.md
14 changes: 6 additions & 8 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
$schema: "https://docs.renovatebot.com/renovate-schema.json",
extends: [
"github>mmalyska/renovate-config",
"github>mmalyska/renovate-config:automerge-github-actions",
"github>mmalyska/renovate-config:automerge-galaxy-collections",
Expand All @@ -11,11 +11,9 @@
"local>mmalyska/home-ops//.github/renovate/disabledDatasources.json5",
"local>mmalyska/home-ops//.github/renovate/groups.json5",
"local>mmalyska/home-ops//.github/renovate/managers.json5",
"local>mmalyska/home-ops//.github/renovate/regexmanager.json5"
"local>mmalyska/home-ops//.github/renovate/regexmanager.json5",
],
"gitAuthor": "bendo-bot <126472327+bendo-bot[bot]@users.noreply.github.com>",
"ignorePaths": [".archive/**"],
"reviewers": [
"mmalyska"
]
gitAuthor: "bendo-bot <126472327+bendo-bot[bot]@users.noreply.github.com>",
ignorePaths: [".archive/**"],
reviewers: ["mmalyska"],
}
14 changes: 9 additions & 5 deletions .github/renovate/allowedVersions.json5
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,23 @@
"description": "Lock version because they changed versioning",
"matchDatasources": ["docker"],
"allowedVersions": "<1",
"matchPackageNames": ["ghcr.io/linuxserver/calibre-web"]
"matchPackageNames": ["ghcr.io/linuxserver/calibre-web"],
},
{
"description": "Lock version because they changed versioning",
"matchDatasources": ["docker"],
"allowedVersions": "/^[0-9]{1,3}\\.[0-9]+\\.[0-9]+.*$/",
"matchPackageNames": ["ghcr.io/linuxserver/jellyfin"]
"matchPackageNames": ["ghcr.io/linuxserver/jellyfin"],
},
{
"description": "Lock version to cluster version",
"matchDatasources": ["docker", "github-releases"],
"allowedVersions": "<=1.29",
"matchPackageNames": ["alpine/k8s", "kubernetes/kubernetes", "siderolabs/kubelet"]
}
]
"matchPackageNames": [
"alpine/k8s",
"kubernetes/kubernetes",
"siderolabs/kubelet",
],
},
],
}
10 changes: 5 additions & 5 deletions .github/renovate/autoMerge.json5
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"Lucas-C/pre-commit-hooks",
"adrienverge/yamllint",
"pre-commit/pre-commit-hooks",
"ansible/ansible-lint"
"ansible/ansible-lint",
],
"ignoreTests": true
"ignoreTests": true,
},
{
"description": "Auto merge devcontainer",
Expand All @@ -24,7 +24,7 @@
"automergeType": "branch",
"matchUpdateTypes": ["digest"],
"matchFileNames": [".devcontainer/devcontainer.json"],
"ignoreTests": true
}
]
"ignoreTests": true,
},
],
}
8 changes: 4 additions & 4 deletions .github/renovate/disabledDatasources.json5
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"description": "Disable kubernetes-api",
"matchManagers": ["kubernetes"],
"matchDatasources": ["kubernetes-api"],
"enabled": false
"enabled": false,
},
{
"description": "Disable default manager for gitea",
"matchManagers": ["helm-values"],
"matchPackageNames": ["gitea/gitea"],
"enabled": false
}
]
"enabled": false,
},
],
}
Loading

0 comments on commit 6cb789f

Please sign in to comment.