chore: update helm release argo-cd to v7.4.3

v1.29.3+k3s1 breaks patching the ingress controller

This reverts commit 638f1a7a46.

.renovaterc.json

@@ -23,7 +23,7 @@
         "argocd-init\\.yml$"
       ],
       "matchStrings": [
-        "\\s+repo:\\s(?<registryUrl>.*)\\n\\s+chart:\\s(?<depName>.*)\\n\\s+version:\\s(?<currentValue>.*)\\n"
+        "\\s+chart:\\s(?<depName>.*)\\n\\s+repo:\\s(?<registryUrl>.*)\\n\\s+version:\\s(?<currentValue>.*)\\n"
       ],
       "datasourceTemplate": "helm"
     },
@@ -35,8 +35,8 @@
       ],
       "matchStrings": [
         "\\s+chart::\\s\\\"(?<depName>.*)\\\",",
-        "\\s+version::\\s\\\"(?<currentValue>.*)\\\",",
+        "\\s+repo::\\s\\\"(?<registryUrl>.*)\\\",",
-        "\\s+repo::\\s\\\"(?<registryUrl>.*)\\\","
+        "\\s+version::\\s\\\"(?<currentValue>.*)\\\","
       ],
       "matchStringsStrategy": "combination",
       "datasourceTemplate": "helm"
@@ -49,8 +49,8 @@
       ],
       "matchStrings": [
         "\\s+chart::\\s\\\"(?<depName>.*)\\\",",
-        "\\s+\\\"version\\\":\\s\\\"(?<currentValue>.*)\\\",",
+        "\\s+repo::\\s\\\"(?<registryUrl>.*)\\\",",
-        "\\s+repo::\\s\\\"(?<registryUrl>.*)\\\","
+        "\\s+\\\"version\\\":\\s\\\"(?<currentValue>.*)\\\","
       ],
       "matchStringsStrategy": "combination",
       "datasourceTemplate": "helm"

README.md

@@ -5,7 +5,6 @@
   * [cert-manager](https://cert-manager.io/)
     * selfsigned issuer
     * LetsEncrypt issuers (Prod and Staging)
-  * [prometheus and grafana](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack)
   * [zabbix-proxy](https://git.zabbix.com/projects/ZT/repos/kubernetes-helm/browse?at=refs%2Fheads%2Frelease%2F6.4)
   * [loki](https://grafana.com/docs/loki/latest/)
   * [keel](https://keel.sh)

argocd-init.yml

@@ -11,11 +11,13 @@ metadata:
   namespace: kube-system
 spec:
   # do not change order! (needed for renovate)
-  repo: https://argoproj.github.io/argo-helm
   chart: argo-cd
-  version: 5.51.6
+  repo: https://argoproj.github.io/argo-helm
+  version: 7.4.3
   targetNamespace: argocd
   valuesContent: |-
+    server:
+      replicas: 1
     applicationSet:
       enabled: false
     notifications:
@@ -30,13 +32,13 @@ metadata:
   namespace: kube-system
 spec:
   # do not change order! (needed for renovate)
-  repo: https://argoproj.github.io/argo-helm
   chart: argocd-apps
-  version: 1.4.1
+  repo: https://argoproj.github.io/argo-helm
+  version: 2.0.0
   targetNamespace: argocd
   valuesContent: |-
     projects:
-      - name: baseline
+      baseline:
         namespace: argocd
         finalizers:
           - resources-finalizer.argocd.argoproj.io
@@ -49,8 +51,7 @@ spec:
           - group: '*'
             kind: '*'
     applications:
-      - name: baseline
+      baseline:
-        namespace: argocd
         project: baseline
         finalizers:
           - resources-finalizer.argocd.argoproj.io

manifests/cert-manager/cert-manager.jsonnet

@@ -4,9 +4,11 @@ local app = import "../_templates/argocd_app.libsonnet";
 app + {
   chart:: "cert-manager",
   repo:: "https://charts.jetstack.io",
-  version:: "1.13.*",
+  version:: "1.15.*",
   values:: |||
-    installCRDs: true
+    crds:
+      enabled: true
+      keep: false
   |||
 },
 ]

manifests/ingress-nginx.jsonnet

@@ -4,7 +4,7 @@ local app = import "../_templates/argocd_app.libsonnet";
 app + {
   chart:: "ingress-nginx",
   repo:: "https://kubernetes.github.io/ingress-nginx",
-  version:: "4.8.*",
+  version:: "4.11.*",
   values:: |||
     defaultBackend:
       enabled: true
@@ -19,12 +19,6 @@ app + {
         pullPolicy: Always
       service:
         externalTrafficPolicy: Local
-      metrics:
-        enabled: true
-        serviceMonitor:
-          enabled: true
-          additionalLabels:
-            release: prometheus-grafana  # same as prometheus-community chart name
   |||
 }
 ]

manifests/monitoring/loki-stack.jsonnet

@@ -1,39 +0,0 @@
-local app = import "../../_templates/argocd_app.libsonnet";
-
-[
-app + {
-  name:: "loki",
-  namespace:: "metrics",
-  chart:: "loki-stack",
-  repo:: "https://grafana.github.io/helm-charts",
-  version:: "2.9.*",
-	syncOptions:: ["CreateNamespace=true", "Force=true"],
-  values:: |||
-    loki:
-      isDefault: false
-    promtail:
-      extraScrapeConfigs:
-        - job_name: journal
-          journal:
-            path: /var/log/journal
-            max_age: 12h
-            labels:
-              job: systemd-journal
-          relabel_configs:
-            - source_labels:
-                - '__journal__systemd_unit'
-              target_label: 'unit'
-            - source_labels:
-                - '__journal__hostname'
-              target_label: 'hostname'
-      extraVolumes:
-        - name: journal
-          hostPath:
-            path: /var/log/journal
-      extraVolumeMounts:
-        - name: journal
-          mountPath: /var/log/journal
-          readOnly: true
-  |||
-}
-]

manifests/monitoring/prometheus-stack.jsonnet

@@ -1,47 +0,0 @@
-# see https://blog.ediri.io/kube-prometheus-stack-and-argocd-23-how-to-remove-a-workaround
-local app = import "../../_templates/argocd_app.libsonnet";
-
-local vars = {
-	"version": "55.3.1",
-	"namespace": "metrics"
-};
-
-[
-app + {
-  name:: "prometheus-crds",
-  namespace:: vars.namespace,
-  path:: "charts/kube-prometheus-stack/charts/crds/crds",
-  repo:: "https://github.com/prometheus-community/helm-charts.git",
-  version:: "kube-prometheus-stack-" + vars.version,
-  syncOptions:: ["CreateNamespace=true", "Replace=true"],
-  sync_wave:: -1,
-},
-app + {
-  name:: "prometheus-grafana",
-  namespace: vars.namespace,
-  chart:: "kube-prometheus-stack",
-  repo:: "https://prometheus-community.github.io/helm-charts",
-  version:: vars.version,
-  skipCrds:: true,
-  values:: |||
-    fullnameOverride: prometheus-stack
-    kubeProxy:
-      enabled: false
-    kubeScheduler:
-      enabled: false
-    kubeControllerManager:
-      enabled: false
-    alertmanager:
-      enabled: false
-    prometheus:
-      prometheusSpec:
-        storageSpec:
-          volumeClaimTemplate:
-            spec:
-              accessModes: ["ReadWriteOnce"]
-              resources:
-                requests:
-                  storage: 10Gi
-  |||
-}
-]

manifests/monitoring/zabbix-proxy.jsonnet

@@ -5,8 +5,8 @@ app + {
   name:: "zabbix-proxy",
   namespace:: "monitoring",
   chart:: "zabbix-helm-chrt",
-  repo:: "https://cdn.zabbix.com/zabbix/integrations/kubernetes-helm/6.4",
+  repo:: "https://cdn.zabbix.com/zabbix/integrations/kubernetes-helm/7.0",
-  version:: "1.3.*",
+  version:: "0.0.*",
   values:: |||
     zabbixAgent:
       enabled: false

pb_install.yml

@@ -1,7 +1,7 @@
 ---
-- hosts: all
+- name: Install k3s server
+  hosts: all
   gather_facts: false
-  name: Install k3s server
   tags: k3s-server
   tasks:
     - name: Download k3s install script
@@ -12,7 +12,7 @@
     - name: Install k3s server
       ansible.builtin.command: "k3s_install.sh"
       environment:
-        INSTALL_K3S_CHANNEL: v1.28.4+k3s1
+        INSTALL_K3S_CHANNEL: v1.30.3+k3s1
         INSTALL_K3S_EXEC: "--disable traefik"
       changed_when: false
     - name: Start and enable k3s server
@@ -20,15 +20,20 @@
         name: k3s
         state: started
         enabled: true
+    - name: Add restart cronjob
+      ansible.builtin.cron:
+        name: "restart k3s (and regenerate certs if necessary)"
+        special_time: monthly
+        job: "systemctl restart k3s"
     - name: Get kubeconfig
       ansible.builtin.fetch:
         src: /etc/rancher/k3s/k3s.yaml
         dest: kubeconfig_{{ ansible_host }}.yml
         flat: true
 
-- hosts: all
+- name: Deploy baseline
+  hosts: all
   gather_facts: false
-  name: Deploy baseline
   tags: baseline
   tasks:
     - name: Copy manifest