infra/home-cluster
2
0 Fork 0
Code Issues Pull Requests 40 Actions Packages Projects Releases Wiki Activity

feat!: Remove support for k3s and go full-on Talos (#1482)

Browse Source
This commit is contained in:
Devin Buhl authored and GitHub committed 2024-05-21 08:29:59 -04:00
1 parent f4eb701ac6
commit 21afc0baa2
96 files changed
+508 -1845
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/labeler.yaml
-3
View File
@@ -1,7 +1,4 @@
---
area/ansible:
- changed-files:
- any-glob-to-any-file: ansible/**/*
area/bootstrap:
- changed-files:
- any-glob-to-any-file: bootstrap/**/*
.github/labels.yaml
-3
View File
@@ -1,15 +1,12 @@
---
# Area
- { name: "area/ansible", color: "0e8a16" }
- { name: "area/bootstrap", color: "0e8a16" }
- { name: "area/github", color: "0e8a16" }
- { name: "area/kubernetes", color: "0e8a16" }
- { name: "area/taskfile", color: "0e8a16" }
# Distro
- { name: "distro/k3s", color: "ffc300" }
- { name: "distro/talos", color: "ffc300" }
# Renovate
- { name: "renovate/ansible", color: "027fa0" }
- { name: "renovate/container", color: "027fa0" }
- { name: "renovate/github-action", color: "027fa0" }
- { name: "renovate/github-release", color: "027fa0" }
.github/renovate.json5
+6 -53
View File
@@ -15,29 +15,22 @@
"schedule": ["on saturday"],
"flux": {
"fileMatch": [
"(^|/)ansible/.+\\.ya?ml(?:\\.j2)?$",
"(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$",
"(^|/)partials/.+\\.ya?ml(?:\\.j2)?$"
"(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$"
]
},
"helm-values": {
"fileMatch": [
"(^|/)ansible/.+\\.ya?ml(?:\\.j2)?$",
"(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$",
"(^|/)partials/.+\\.ya?ml(?:\\.j2)?$"
"(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$"
]
},
"helmfile": {
"fileMatch": [
"(^|/)helmfile\\.ya?ml(?:\\.j2)?$",
"(^|/)partials/.+\\.ya?ml(?:\\.j2)?$"
"(^|/)helmfile\\.ya?ml(?:\\.j2)?$"
]
},
"kubernetes": {
"fileMatch": [
"(^|/)ansible/.+\\.ya?ml(?:\\.j2)?$",
"(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$",
"(^|/)partials/.+\\.ya?ml(?:\\.j2)?$"
"(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$"
]
},
"kustomize": {
@@ -50,11 +43,6 @@
"(^|/)[\\w-]*requirements(-\\w+)?\\.(txt|pip)(?:\\.j2)?$"
]
},
"ansible-galaxy": {
"fileMatch": [
"(^|/)(galaxy|requirements)(\\.ansible)?\\.ya?ml(?:\\.j2)?$"
]
},
// commit message topics
"commitMessageTopic": "{{depName}}",
"commitMessageExtra": "to {{newVersion}}",
@@ -92,13 +80,6 @@
},
"separateMinorPatch": true
},
// custom versioning
{
"description": ["Use custom versioning for k3s"],
"matchDatasources": ["github-releases"],
"versioning": "regex:^v(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?<compatibility>\\+k.s)\\.?(?<build>\\d+)$",
"matchPackagePatterns": ["k3s"]
},
// commit message topics
{
"matchDatasources": ["helm"],
@@ -149,23 +130,6 @@
"semanticCommitType": "fix",
"semanticCommitScope": "helm"
},
{
"matchDatasources": ["galaxy", "galaxy-collection"],
"matchUpdateTypes": ["major"],
"commitMessagePrefix": "feat(ansible)!: "
},
{
"matchDatasources": ["galaxy", "galaxy-collection"],
"matchUpdateTypes": ["minor"],
"semanticCommitType": "feat",
"semanticCommitScope": "ansible"
},
{
"matchDatasources": ["galaxy", "galaxy-collection"],
"matchUpdateTypes": ["patch"],
"semanticCommitType": "fix",
"semanticCommitScope": "ansible"
},
{
"matchDatasources": ["github-releases", "github-tags"],
"matchUpdateTypes": ["major"],
@@ -221,10 +185,6 @@
"matchDatasources": ["helm"],
"addLabels": ["renovate/helm"]
},
{
"matchDatasources": ["galaxy", "galaxy-collection"],
"addLabels": ["renovate/ansible"]
},
{
"matchDatasources": ["github-releases", "github-tags"],
"addLabels": ["renovate/github-release"]
@@ -241,19 +201,12 @@
"description": ["Process custom dependencies"],
"fileMatch": [
"(^|/).taskfiles/.+\\.ya?ml$",
"(^|/)ansible/.+\\.ya?ml(?:\\.j2)?$",
"(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$",
"(^|/)partials/.+\\.ya?ml(?:\\.j2)?$"
"(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$"
],
"matchStrings": [
// # renovate: datasource=github-releases depName=k3s-io/k3s
// k3s_release_version: &version v1.29.0+k3s1
// # 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)[^/]+)"
"datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( repository=(?<registryUrl>\\S+))?\\n.+: (&\\S+\\s)?(?<currentValue>\\S+)"
],
"datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}"
}
.github/tests/config-k3s-ipv4.yaml
-42
View File
@@ -1,42 +0,0 @@
---
skip_tests: true
bootstrap_timezone: Etc/UTC
bootstrap_distribution: k3s
bootstrap_node_network: 10.10.10.0/24
bootstrap_node_default_gateway: 10.10.10.1
bootstrap_node_inventory:
- name: k8s-controller-0
address: 10.10.10.100
controller: true
ssh_user: fake
- name: k8s-worker-0
address: 10.10.10.101
controller: false
ssh_user: fake
bootstrap_dns_servers: ["1.1.1.1"]
bootstrap_search_domain: "fake"
bootstrap_pod_network: 10.69.0.0/16
bootstrap_service_network: 10.96.0.0/16
bootstrap_controllers_vip: 10.10.10.254
bootstrap_tls_sans: ["fake"]
bootstrap_sops_age_pubkey: $BOOTSTRAP_AGE_PUBLIC_KEY
bootstrap_bgp:
enabled: false
bootstrap_github_address: https://github.com/onedr0p/cluster-template
bootstrap_github_branch: main
bootstrap_github_webhook_token: fake
bootstrap_cloudflare:
enabled: true
domain: fake
token: take
acme:
email: fake@example.com
production: false
tunnel:
account_id: fake
id: fake
secret: fake
ingress_vip: 10.10.10.252
ingress_vip: 10.10.10.251
gateway_vip: 10.10.10.253
.github/tests/config-k3s-ipv6.yaml
-42
View File
@@ -1,42 +0,0 @@
---
skip_tests: true
bootstrap_timezone: Etc/UTC
bootstrap_distribution: k3s
bootstrap_node_network: 10.10.10.0/24
bootstrap_node_default_gateway: 10.10.10.1
bootstrap_node_inventory:
- name: k8s-controller-0
address: 10.10.10.100
controller: true
ssh_user: fake
- name: k8s-worker-0
address: 10.10.10.101
controller: false
ssh_user: fake
bootstrap_dns_servers: ["1.1.1.1"]
bootstrap_search_domain: "fake"
bootstrap_pod_network: 10.42.0.0/16,fd7f:8f5:e87c:a::/64
bootstrap_service_network: 10.43.0.0/16,fd7f:8f5:e87c:e::/112
bootstrap_controllers_vip: 10.10.10.254
bootstrap_tls_sans: ["fake"]
bootstrap_sops_age_pubkey: $BOOTSTRAP_AGE_PUBLIC_KEY
bootstrap_bgp:
enabled: false
bootstrap_github_address: https://github.com/onedr0p/cluster-template
bootstrap_github_branch: main
bootstrap_github_webhook_token: fake
bootstrap_cloudflare:
enabled: true
domain: fake
token: take
acme:
email: fake@example.com
production: false
tunnel:
account_id: fake
id: fake
secret: fake
ingress_vip: 10.10.10.252
ingress_vip: 10.10.10.251
gateway_vip: 10.10.10.253
.github/tests/config-talos.yaml
+8 -10
View File
@@ -1,28 +1,26 @@
---
skip_tests: true
bootstrap_timezone: Etc/UTC
bootstrap_distribution: talos
boostrap_talos:
schematic_id: "df491c50a5acc05b977ef00c32050e1ceb0df746e40b33c643ac8a9bfb7c7263"
schematic_id: "376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba"
bootstrap_node_network: 10.10.10.0/24
bootstrap_node_default_gateway: 10.10.10.1
bootstrap_node_inventory:
- name: k8s-controller-0
address: 10.10.10.100
controller: true
talos_disk: fake
talos_nic: fake
disk: fake
mac_addr: fake
- name: k8s-worker-0
address: 10.10.10.101
controller: false
talos_disk: fake
talos_nic: fake
bootstrap_dns_servers: ["1.1.1.1"]
bootstrap_search_domain: "fake"
disk: fake
mac_addr: fake
bootstrap_dns_servers: ["1.1.1.1", "1.0.0.1"]
bootstrap_dntp_servers: ["time.cloudflare.com"]
bootstrap_pod_network: 10.69.0.0/16
bootstrap_service_network: 10.96.0.0/16
bootstrap_controllers_vip: 10.10.10.254
bootstrap_controller_vip: 10.10.10.254
bootstrap_tls_sans: ["fake"]
bootstrap_sops_age_pubkey: $BOOTSTRAP_AGE_PUBLIC_KEY
bootstrap_bgp:
.github/workflows/e2e.yaml
-10
View File
@@ -20,8 +20,6 @@ jobs:
fail-fast: false
matrix:
config-files:
- k3s-ipv4
- k3s-ipv6
- talos
steps:
- name: Checkout
@@ -93,14 +91,6 @@ jobs:
task talos:bootstrap-gensecret
task talos:bootstrap-genconfig
- name: Run Ansible tasks
if: ${{ startsWith(matrix.config-files, 'k3s') }}
shell: bash
run: |
task ansible:deps force=false
task ansible:lint
task ansible:list
- name: Run repo clean and reset tasks
shell: bash
run: |