diff options
Diffstat (limited to 'gemfeed')
7 files changed, 53 insertions, 7 deletions
diff --git a/gemfeed/2025-10-02-f3s-kubernetes-with-freebsd-part-7.gmi b/gemfeed/2025-10-02-f3s-kubernetes-with-freebsd-part-7.gmi index a413c609..1156b0a7 100644 --- a/gemfeed/2025-10-02-f3s-kubernetes-with-freebsd-part-7.gmi +++ b/gemfeed/2025-10-02-f3s-kubernetes-with-freebsd-part-7.gmi @@ -68,7 +68,7 @@ $ cd f3s/ - Additional resources under `*/manifests/` directories (e.g., `prometheus/manifests/`) - Justfiles updated to trigger ArgoCD syncs instead of direct Helm commands -The deployment concepts and architecture remain the same—only the deployment method changed from imperative (`helm install/upgrade`) to declarative (GitOps with ArgoCD). For details on the GitOps migration, see Part X of this series. +The deployment concepts and architecture remain the same—only the deployment method changed from imperative (`helm install/upgrade`) to declarative (GitOps with ArgoCD). ## Updating diff --git a/gemfeed/2025-10-02-f3s-kubernetes-with-freebsd-part-7.gmi.tpl b/gemfeed/2025-10-02-f3s-kubernetes-with-freebsd-part-7.gmi.tpl index 6e3fd42b..5b5073c7 100644 --- a/gemfeed/2025-10-02-f3s-kubernetes-with-freebsd-part-7.gmi.tpl +++ b/gemfeed/2025-10-02-f3s-kubernetes-with-freebsd-part-7.gmi.tpl @@ -34,7 +34,7 @@ $ cd f3s/ - Additional resources under `*/manifests/` directories (e.g., `prometheus/manifests/`) - Justfiles updated to trigger ArgoCD syncs instead of direct Helm commands -The deployment concepts and architecture remain the same—only the deployment method changed from imperative (`helm install/upgrade`) to declarative (GitOps with ArgoCD). For details on the GitOps migration, see Part X of this series. +The deployment concepts and architecture remain the same—only the deployment method changed from imperative (`helm install/upgrade`) to declarative (GitOps with ArgoCD). ## Updating diff --git a/gemfeed/2025-12-07-f3s-kubernetes-with-freebsd-part-8.gmi b/gemfeed/2025-12-07-f3s-kubernetes-with-freebsd-part-8.gmi index d8460dea..26f7dbd8 100644 --- a/gemfeed/2025-12-07-f3s-kubernetes-with-freebsd-part-8.gmi +++ b/gemfeed/2025-12-07-f3s-kubernetes-with-freebsd-part-8.gmi @@ -80,7 +80,7 @@ $ cd f3s/prometheus/ - Resources organized under `prometheus/manifests/`, `loki/`, etc. - Justfiles updated to trigger ArgoCD syncs instead of direct Helm commands -The deployment concepts and architecture remain the same—only the deployment method changed from imperative (`helm install/upgrade`) to declarative (GitOps with ArgoCD). For details on the GitOps migration, see Part X of this series. +The deployment concepts and architecture remain the same—only the deployment method changed from imperative (`helm install/upgrade`) to declarative (GitOps with ArgoCD). ## Persistent storage recap diff --git a/gemfeed/2025-12-07-f3s-kubernetes-with-freebsd-part-8.gmi.tpl b/gemfeed/2025-12-07-f3s-kubernetes-with-freebsd-part-8.gmi.tpl index 75bb892d..008c512e 100644 --- a/gemfeed/2025-12-07-f3s-kubernetes-with-freebsd-part-8.gmi.tpl +++ b/gemfeed/2025-12-07-f3s-kubernetes-with-freebsd-part-8.gmi.tpl @@ -43,7 +43,7 @@ $ cd f3s/prometheus/ - Resources organized under `prometheus/manifests/`, `loki/`, etc. - Justfiles updated to trigger ArgoCD syncs instead of direct Helm commands -The deployment concepts and architecture remain the same—only the deployment method changed from imperative (`helm install/upgrade`) to declarative (GitOps with ArgoCD). For details on the GitOps migration, see Part X of this series. +The deployment concepts and architecture remain the same—only the deployment method changed from imperative (`helm install/upgrade`) to declarative (GitOps with ArgoCD). ## Persistent storage recap diff --git a/gemfeed/DRAFT-f3s-kubernetes-with-freebsd-part-8b.gmi b/gemfeed/DRAFT-f3s-kubernetes-with-freebsd-part-8b.gmi index 7efb1002..98634ff2 100644 --- a/gemfeed/DRAFT-f3s-kubernetes-with-freebsd-part-8b.gmi +++ b/gemfeed/DRAFT-f3s-kubernetes-with-freebsd-part-8b.gmi @@ -6,6 +6,29 @@ This post covers enabling etcd metrics monitoring for the k3s cluster. The etcd => ./2025-12-07-f3s-kubernetes-with-freebsd-part-8.html Part 8: Observability +## Important Note: GitOps Migration + +**Note:** After the initial observability setup, the f3s cluster was migrated from imperative Helm deployments to declarative GitOps using ArgoCD. The Prometheus configuration and deployment process described in this post have been updated for ArgoCD. + +**To view the configuration as it existed before the ArgoCD migration**, check out the pre-ArgoCD revision: + +```sh +$ git clone https://codeberg.org/snonux/conf.git +$ cd conf +$ git checkout 15a86f3 # Last commit before ArgoCD migration +$ cd f3s/prometheus/ +``` + +**Current master branch** uses ArgoCD with: +- Application manifest: `argocd-apps/monitoring/prometheus.yaml` +- Multi-source Application combining upstream chart + custom manifests +- Justfile commands updated to trigger ArgoCD syncs instead of direct Helm commands + +The etcd configuration concepts remain the same—only the deployment method changed. Instead of running `just upgrade`, you would: +1. Update the configuration in Git +2. Commit and push +3. ArgoCD automatically syncs (or run `just sync` for immediate sync) + ## Enabling etcd metrics in k3s On each control-plane node (r0, r1, r2), create /etc/rancher/k3s/config.yaml: diff --git a/gemfeed/DRAFT-f3s-kubernetes-with-freebsd-part-8b.gmi.tpl b/gemfeed/DRAFT-f3s-kubernetes-with-freebsd-part-8b.gmi.tpl index 7efb1002..98634ff2 100644 --- a/gemfeed/DRAFT-f3s-kubernetes-with-freebsd-part-8b.gmi.tpl +++ b/gemfeed/DRAFT-f3s-kubernetes-with-freebsd-part-8b.gmi.tpl @@ -6,6 +6,29 @@ This post covers enabling etcd metrics monitoring for the k3s cluster. The etcd => ./2025-12-07-f3s-kubernetes-with-freebsd-part-8.html Part 8: Observability +## Important Note: GitOps Migration + +**Note:** After the initial observability setup, the f3s cluster was migrated from imperative Helm deployments to declarative GitOps using ArgoCD. The Prometheus configuration and deployment process described in this post have been updated for ArgoCD. + +**To view the configuration as it existed before the ArgoCD migration**, check out the pre-ArgoCD revision: + +```sh +$ git clone https://codeberg.org/snonux/conf.git +$ cd conf +$ git checkout 15a86f3 # Last commit before ArgoCD migration +$ cd f3s/prometheus/ +``` + +**Current master branch** uses ArgoCD with: +- Application manifest: `argocd-apps/monitoring/prometheus.yaml` +- Multi-source Application combining upstream chart + custom manifests +- Justfile commands updated to trigger ArgoCD syncs instead of direct Helm commands + +The etcd configuration concepts remain the same—only the deployment method changed. Instead of running `just upgrade`, you would: +1. Update the configuration in Git +2. Commit and push +3. ArgoCD automatically syncs (or run `just sync` for immediate sync) + ## Enabling etcd metrics in k3s On each control-plane node (r0, r1, r2), create /etc/rancher/k3s/config.yaml: diff --git a/gemfeed/atom.xml b/gemfeed/atom.xml index 951fe254..18ccc458 100644 --- a/gemfeed/atom.xml +++ b/gemfeed/atom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> - <updated>2026-01-07T23:57:53+02:00</updated> + <updated>2026-01-08T00:01:51+02:00</updated> <title>foo.zone feed</title> <subtitle>To be in the .zone!</subtitle> <link href="gemini://foo.zone/gemfeed/atom.xml" rel="self" /> @@ -2377,7 +2377,7 @@ $ cd f3s/prometheus/ <span>- Resources organized under <span class='inlinecode'>prometheus/manifests/</span>, <span class='inlinecode'>loki/</span>, etc.</span><br /> <span>- Justfiles updated to trigger ArgoCD syncs instead of direct Helm commands</span><br /> <br /> -<span>The deployment concepts and architecture remain the same—only the deployment method changed from imperative (<span class='inlinecode'>helm install/upgrade</span>) to declarative (GitOps with ArgoCD). For details on the GitOps migration, see Part X of this series. </span><br /> +<span>The deployment concepts and architecture remain the same—only the deployment method changed from imperative (<span class='inlinecode'>helm install/upgrade</span>) to declarative (GitOps with ArgoCD). </span><br /> <br /> <h2 style='display: inline' id='persistent-storage-recap'>Persistent storage recap</h2><br /> <br /> @@ -4039,7 +4039,7 @@ $ cd f3s/ <span>- Additional resources under <span class='inlinecode'>*/manifests/</span> directories (e.g., <span class='inlinecode'>prometheus/manifests/</span>)</span><br /> <span>- Justfiles updated to trigger ArgoCD syncs instead of direct Helm commands</span><br /> <br /> -<span>The deployment concepts and architecture remain the same—only the deployment method changed from imperative (<span class='inlinecode'>helm install/upgrade</span>) to declarative (GitOps with ArgoCD). For details on the GitOps migration, see Part X of this series.</span><br /> +<span>The deployment concepts and architecture remain the same—only the deployment method changed from imperative (<span class='inlinecode'>helm install/upgrade</span>) to declarative (GitOps with ArgoCD).</span><br /> <br /> <h2 style='display: inline' id='updating'>Updating</h2><br /> <br /> |