fix: talos customization multiline string and ansible raw/endraw (#1275)

* chore: update readme and workflows Signed-off-by: Devin Buhl <[email protected]> * fix: ansible templating Signed-off-by: Devin Buhl <[email protected]> * fix: talos templating Signed-off-by: Devin Buhl <[email protected]> --------- Signed-off-by: Devin Buhl <[email protected]>
tuxpeople · Jan 31, 2024 · 0021acc · 0021acc
1 parent a2ce911
commit 0021acc
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 4 deletions.
diff --git a/.github/tests/config-talos.yaml b/.github/tests/config-talos.yaml
@@ -22,7 +22,7 @@ cluster:
       schematics:
         enabled: true
         id: df491c50a5acc05b977ef00c32050e1ceb0df746e40b33c643ac8a9bfb7c7263
-        customization:
+        customization: |-
           extraKernelArgs:
             - net.ifnames=0
           systemExtensions:

diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: "devcontainer"
 
 on:

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: "e2e"
 
 on:

diff --git a/.github/workflows/flux-diff.yaml b/.github/workflows/flux-diff.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: "Flux Diff"
 
 on:

diff --git a/.github/workflows/kubeconform.yaml b/.github/workflows/kubeconform.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: "Kubeconform"
 
 on:

diff --git a/.github/workflows/label-sync.yaml b/.github/workflows/label-sync.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: "Label Sync"
 
 on:

diff --git a/.github/workflows/labeler.yaml b/.github/workflows/labeler.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: "Labeler"
 
 on:

diff --git a/.github/workflows/lychee.yaml b/.github/workflows/lychee.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: "Lychee"
 
 on:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: "Release"
 
 on:

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ The features included will depend on the type of configuration you want to use.
 
 2. **"Flux cluster"** - An addition to "**Bare cluster**" that deploys an opinionated implementation of [Flux](https://github.com/fluxcd/flux2) using [GitHub](https://github.com/) as Git provider and [sops](https://github.com/getsops/sops) to manage secrets.
 
-    - **Required:** Some knowledge of [Git](https://git-scm.com/) and its practices & terminology.
+    - **Required:** Some knowledge of [Git](https://git-scm.com/) practices & terminology.
     - **Components:** [flux](https://github.com/fluxcd/flux2), [cert-manager](https://github.com/cert-manager/cert-manager), [spegel](https://github.com/XenitAB/spegel), [reloader](https://github.com/stakater/Reloader), [system-upgrade-controller](https://github.com/rancher/system-upgrade-controller), and [openebs](https://github.com/openebs/openebs).
 
 3. **"Flux cluster with Cloudflare"** - An addition to "**Flux cluster**" that provides DNS and SSL with [Cloudflare](https://www.cloudflare.com/). [Cloudflare Tunnel](https://www.cloudflare.com/products/tunnel/) is also included to provide external access to certain applications deployed in your cluster.

diff --git a/bootstrap/templates/ansible/playbooks/tasks/version-check.yaml.j2 b/bootstrap/templates/ansible/playbooks/tasks/version-check.yaml.j2
@@ -9,7 +9,7 @@
 
     - name: Extract k3s version
       ansible.builtin.set_fact:
-        current_k3s_version: "{{ k3s_version.stdout | regex_replace('(?im)k3s version (?P<version>[a-z0-9\\.\\+]+).*\n.*', '\\g<version>') }}"
+        current_k3s_version: "{% raw %}{{ k3s_version.stdout | regex_replace('(?im)k3s version (?P<version>[a-z0-9\\.\\+]+).*\n.*', '\\g<version>') }}{% endraw %}"
 
     - name: Check if upgrades are allowed
       ansible.builtin.assert:

diff --git a/config.sample.yaml b/config.sample.yaml
@@ -44,7 +44,7 @@ cluster:
       #   id: ""
       #   # (Required) Additional NodeConfigs to apply to all nodes
       #   #   See: https://budimanjojo.github.io/talhelper/latest/reference/configuration/#nodeconfigs
-      #   customization:
+      #   customization: |-
       #     extraKernelArgs:
       #       - net.ifnames=0
       #     systemExtensions: