Skip to content

Commit

Permalink
feat!: Remove support for k3s and go full-on Talos (#1482)
Browse files Browse the repository at this point in the history
  • Loading branch information
onedr0p committed May 21, 2024
1 parent f4eb701 commit 21afc0b
Show file tree
Hide file tree
Showing 96 changed files with 509 additions and 1,846 deletions.
1 change: 0 additions & 1 deletion .devcontainer/ci/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"terminal.integrated.defaultProfile.linux": "fish"
},
"extensions": [
"redhat.ansible",
"redhat.vscode-yaml"
]
}
Expand Down
7 changes: 0 additions & 7 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ export SOPS_AGE_KEY_FILE="$(expand_path ./age.key)"
PATH_add "$(expand_path ./.venv/bin)"
export VIRTUAL_ENV="$(expand_path ./.venv)"
export PYTHONDONTWRITEBYTECODE="1"
# Ann Seabelle
export ANSIBLE_COLLECTIONS_PATH=$(expand_path ./.venv/galaxy)
export ANSIBLE_ROLES_PATH=$(expand_path ./.venv/galaxy/ansible_roles)
export ANSIBLE_VARS_ENABLED="host_group_vars"
export ANSIBLE_LOCALHOST_WARNING="False"
export ANSIBLE_INVENTORY_UNPARSED_WARNING="False"
export K8S_AUTH_KUBECONFIG="$(expand_path ./kubeconfig)"
# Talos
export TALOSCONFIG="$(expand_path ./kubernetes/bootstrap/talos/clusterconfig/talosconfig)"
# Bin
Expand Down
3 changes: 0 additions & 3 deletions .github/labeler.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
---
area/ansible:
- changed-files:
- any-glob-to-any-file: ansible/**/*
area/bootstrap:
- changed-files:
- any-glob-to-any-file: bootstrap/**/*
Expand Down
3 changes: 0 additions & 3 deletions .github/labels.yaml
Original file line number Diff line number Diff line change
@@ -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" }
Expand Down
59 changes: 6 additions & 53 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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}}",
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"]
Expand All @@ -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}}"
}
Expand Down
42 changes: 0 additions & 42 deletions .github/tests/config-k3s-ipv4.yaml

This file was deleted.

42 changes: 0 additions & 42 deletions .github/tests/config-k3s-ipv6.yaml

This file was deleted.

18 changes: 8 additions & 10 deletions .github/tests/config-talos.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
fail-fast: false
matrix:
config-files:
- k3s-ipv4
- k3s-ipv6
- talos
steps:
- name: Checkout
Expand Down Expand Up @@ -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: |
Expand Down
88 changes: 0 additions & 88 deletions .taskfiles/Ansible/Taskfile.yaml

This file was deleted.

Loading

0 comments on commit 21afc0b

Please sign in to comment.