From c13483fa243403f3a96263b5d8578c5033be15b7 Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Wed, 13 Dec 2023 17:54:55 +0100
Subject: [PATCH 001/114] break(monitoring): remove prometheus-stack and loki
---
README.md | 1 -
.../grafana-ressources/nginx-dashboard.yml | 1473 -----------------
manifests/monitoring/loki-stack.jsonnet | 39 -
manifests/monitoring/prometheus-stack.jsonnet | 47 -
4 files changed, 1560 deletions(-)
delete mode 100644 manifests/monitoring/grafana-ressources/nginx-dashboard.yml
delete mode 100644 manifests/monitoring/loki-stack.jsonnet
delete mode 100644 manifests/monitoring/prometheus-stack.jsonnet
diff --git a/README.md b/README.md
index 6c2a9c2..cc194d0 100644
--- a/README.md
+++ b/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)
diff --git a/manifests/monitoring/grafana-ressources/nginx-dashboard.yml b/manifests/monitoring/grafana-ressources/nginx-dashboard.yml
deleted file mode 100644
index b4d9810..0000000
--- a/manifests/monitoring/grafana-ressources/nginx-dashboard.yml
+++ /dev/null
@@ -1,1473 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: grafana-nginx-dashbaord
- namespace: metrics
- labels:
- grafana_dashboard: "1"
-data:
- nginx.json: |
- {
- "__inputs": [
- {
- "name": "DS_PROMETHEUS",
- "label": "Prometheus",
- "description": "",
- "type": "datasource",
- "pluginId": "prometheus",
- "pluginName": "Prometheus"
- }
- ],
- "__requires": [
- {
- "type": "grafana",
- "id": "grafana",
- "name": "Grafana",
- "version": "5.2.1"
- },
- {
- "type": "datasource",
- "id": "prometheus",
- "name": "Prometheus",
- "version": "5.0.0"
- },
- {
- "type": "panel",
- "id": "singlestat",
- "name": "Singlestat",
- "version": "5.0.0"
- }
- ],
- "annotations": {
- "list": [
- {
- "builtIn": 1,
- "datasource": "-- Grafana --",
- "enable": true,
- "hide": true,
- "iconColor": "rgba(0, 211, 255, 1)",
- "name": "Annotations & Alerts",
- "type": "dashboard"
- },
- {
- "datasource": "${DS_PROMETHEUS}",
- "enable": true,
- "expr": "sum(changes(nginx_ingress_controller_config_last_reload_successful_timestamp_seconds{instance!=\"unknown\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[30s])) by (controller_class)",
- "hide": false,
- "iconColor": "rgba(255, 96, 96, 1)",
- "limit": 100,
- "name": "Config Reloads",
- "showIn": 0,
- "step": "30s",
- "tagKeys": "controller_class",
- "tags": [],
- "titleFormat": "Config Reloaded",
- "type": "tags"
- }
- ]
- },
- "editable": true,
- "gnetId": null,
- "graphTooltip": 0,
- "iteration": 1534359654832,
- "links": [],
- "panels": [
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": "${DS_PROMETHEUS}",
- "format": "ops",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 6,
- "x": 0,
- "y": 0
- },
- "id": 20,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": true,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[2m])), 0.001)",
- "format": "time_series",
- "intervalFactor": 1,
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": "",
- "title": "Controller Request Volume",
- "transparent": false,
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "avg"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": "${DS_PROMETHEUS}",
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 6,
- "x": 6,
- "y": 0
- },
- "id": 82,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": true,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "sum(avg_over_time(nginx_ingress_controller_nginx_process_connections{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",state=\"active\"}[2m]))",
- "format": "time_series",
- "instant": false,
- "intervalFactor": 1,
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": "",
- "title": "Controller Connections",
- "transparent": false,
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "avg"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": "${DS_PROMETHEUS}",
- "format": "percentunit",
- "gauge": {
- "maxValue": 100,
- "minValue": 80,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": false
- },
- "gridPos": {
- "h": 3,
- "w": 6,
- "x": 12,
- "y": 0
- },
- "id": 21,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": true,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",status!~\"[4-5].*\"}[2m])) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[2m]))",
- "format": "time_series",
- "intervalFactor": 1,
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": "95, 99, 99.5",
- "title": "Controller Success Rate (non-4|5xx responses)",
- "transparent": false,
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "avg"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 0,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 3,
- "x": 18,
- "y": 0
- },
- "id": 81,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": true,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "avg(irate(nginx_ingress_controller_success{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[1m])) * 60",
- "format": "time_series",
- "instant": false,
- "intervalFactor": 1,
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": "",
- "title": "Config Reloads",
- "transparent": false,
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "total"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 0,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 3,
- "x": 21,
- "y": 0
- },
- "id": 83,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": true,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "count(nginx_ingress_controller_config_last_reload_successful{controller_pod=~\"$controller\",controller_namespace=~\"$namespace\"} == 0)",
- "format": "time_series",
- "instant": true,
- "intervalFactor": 1,
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": "",
- "title": "Last Config Failed",
- "transparent": false,
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "avg"
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 2,
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "gridPos": {
- "h": 7,
- "w": 12,
- "x": 0,
- "y": 3
- },
- "height": "200px",
- "id": 86,
- "isNew": true,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "hideEmpty": false,
- "hideZero": true,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "sideWidth": 300,
- "sort": "current",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "h",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (ingress), 0.001)",
- "format": "time_series",
- "hide": false,
- "instant": false,
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "{{ ingress }}",
- "metric": "network",
- "refId": "A",
- "step": 10
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Ingress Request Volume",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 2,
- "value_type": "cumulative"
- },
- "transparent": false,
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "reqps",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "Bps",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": false
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {
- "max - istio-proxy": "#890f02",
- "max - master": "#bf1b00",
- "max - prometheus": "#bf1b00"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 2,
- "editable": false,
- "error": false,
- "fill": 0,
- "grid": {},
- "gridPos": {
- "h": 7,
- "w": 12,
- "x": 12,
- "y": 3
- },
- "id": 87,
- "isNew": true,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "hideEmpty": true,
- "hideZero": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "sideWidth": 300,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",ingress=~\"$ingress\",status!~\"[4-5].*\"}[2m])) by (ingress) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (ingress)",
- "format": "time_series",
- "instant": false,
- "interval": "10s",
- "intervalFactor": 1,
- "legendFormat": "{{ ingress }}",
- "metric": "container_memory_usage:sort_desc",
- "refId": "A",
- "step": 10
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Ingress Success Rate (non-4|5xx responses)",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 1,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "percentunit",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": false
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 2,
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "gridPos": {
- "h": 6,
- "w": 8,
- "x": 0,
- "y": 10
- },
- "height": "200px",
- "id": 32,
- "isNew": true,
- "legend": {
- "alignAsTable": false,
- "avg": true,
- "current": true,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": false,
- "sideWidth": 200,
- "sort": "current",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum (irate (nginx_ingress_controller_request_size_sum{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[2m]))",
- "format": "time_series",
- "instant": false,
- "interval": "10s",
- "intervalFactor": 1,
- "legendFormat": "Received",
- "metric": "network",
- "refId": "A",
- "step": 10
- },
- {
- "expr": "- sum (irate (nginx_ingress_controller_response_size_sum{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[2m]))",
- "format": "time_series",
- "hide": false,
- "interval": "10s",
- "intervalFactor": 1,
- "legendFormat": "Sent",
- "metric": "network",
- "refId": "B",
- "step": 10
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Network I/O pressure",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "cumulative"
- },
- "transparent": false,
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "Bps",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "Bps",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": false
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {
- "max - istio-proxy": "#890f02",
- "max - master": "#bf1b00",
- "max - prometheus": "#bf1b00"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 2,
- "editable": false,
- "error": false,
- "fill": 0,
- "grid": {},
- "gridPos": {
- "h": 6,
- "w": 8,
- "x": 8,
- "y": 10
- },
- "id": 77,
- "isNew": true,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": true,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": false,
- "sideWidth": 200,
- "sort": "current",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "avg(nginx_ingress_controller_nginx_process_resident_memory_bytes{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}) ",
- "format": "time_series",
- "instant": false,
- "interval": "10s",
- "intervalFactor": 1,
- "legendFormat": "nginx",
- "metric": "container_memory_usage:sort_desc",
- "refId": "A",
- "step": 10
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Average Memory Usage",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 2,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": false
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {
- "max - istio-proxy": "#890f02",
- "max - master": "#bf1b00"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 3,
- "editable": false,
- "error": false,
- "fill": 0,
- "grid": {},
- "gridPos": {
- "h": 6,
- "w": 8,
- "x": 16,
- "y": 10
- },
- "height": "",
- "id": 79,
- "isNew": true,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": true,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": false,
- "sort": null,
- "sortDesc": null,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "avg (rate (nginx_ingress_controller_nginx_process_cpu_seconds_total{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[2m])) ",
- "format": "time_series",
- "interval": "10s",
- "intervalFactor": 1,
- "legendFormat": "nginx",
- "metric": "container_cpu",
- "refId": "A",
- "step": 10
- }
- ],
- "thresholds": [
- {
- "colorMode": "critical",
- "fill": true,
- "line": true,
- "op": "gt"
- }
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "Average CPU Usage",
- "tooltip": {
- "msResolution": true,
- "shared": true,
- "sort": 2,
- "value_type": "cumulative"
- },
- "transparent": false,
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "none",
- "label": "cores",
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "columns": [],
- "datasource": "${DS_PROMETHEUS}",
- "fontSize": "100%",
- "gridPos": {
- "h": 8,
- "w": 24,
- "x": 0,
- "y": 16
- },
- "hideTimeOverride": false,
- "id": 75,
- "links": [],
- "pageSize": 7,
- "repeat": null,
- "repeatDirection": "h",
- "scroll": true,
- "showHeader": true,
- "sort": {
- "col": 1,
- "desc": true
- },
- "styles": [
- {
- "alias": "Ingress",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 2,
- "pattern": "ingress",
- "preserveFormat": false,
- "sanitize": false,
- "thresholds": [],
- "type": "string",
- "unit": "short"
- },
- {
- "alias": "Requests",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 2,
- "pattern": "Value #A",
- "thresholds": [
- ""
- ],
- "type": "number",
- "unit": "ops"
- },
- {
- "alias": "Errors",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 2,
- "pattern": "Value #B",
- "thresholds": [],
- "type": "number",
- "unit": "ops"
- },
- {
- "alias": "P50 Latency",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 0,
- "link": false,
- "pattern": "Value #C",
- "thresholds": [],
- "type": "number",
- "unit": "dtdurations"
- },
- {
- "alias": "P90 Latency",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 0,
- "pattern": "Value #D",
- "thresholds": [],
- "type": "number",
- "unit": "dtdurations"
- },
- {
- "alias": "P99 Latency",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 0,
- "pattern": "Value #E",
- "thresholds": [],
- "type": "number",
- "unit": "dtdurations"
- },
- {
- "alias": "IN",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 2,
- "pattern": "Value #F",
- "thresholds": [
- ""
- ],
- "type": "number",
- "unit": "Bps"
- },
- {
- "alias": "",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 2,
- "pattern": "Time",
- "thresholds": [],
- "type": "hidden",
- "unit": "short"
- },
- {
- "alias": "OUT",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 2,
- "mappingType": 1,
- "pattern": "Value #G",
- "thresholds": [],
- "type": "number",
- "unit": "Bps"
- }
- ],
- "targets": [
- {
- "expr": "histogram_quantile(0.50, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le, ingress))",
- "format": "table",
- "hide": false,
- "instant": true,
- "intervalFactor": 1,
- "legendFormat": "{{ ingress }}",
- "refId": "C"
- },
- {
- "expr": "histogram_quantile(0.90, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le, ingress))",
- "format": "table",
- "hide": false,
- "instant": true,
- "intervalFactor": 1,
- "legendFormat": "{{ ingress }}",
- "refId": "D"
- },
- {
- "expr": "histogram_quantile(0.99, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le, ingress))",
- "format": "table",
- "hide": false,
- "instant": true,
- "intervalFactor": 1,
- "legendFormat": "{{ destination_service }}",
- "refId": "E"
- },
- {
- "expr": "sum(irate(nginx_ingress_controller_request_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (ingress)",
- "format": "table",
- "hide": false,
- "instant": true,
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "{{ ingress }}",
- "refId": "F"
- },
- {
- "expr": "sum(irate(nginx_ingress_controller_response_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (ingress)",
- "format": "table",
- "instant": true,
- "intervalFactor": 1,
- "legendFormat": "{{ ingress }}",
- "refId": "G"
- }
- ],
- "timeFrom": null,
- "title": "Ingress Percentile Response Times and Transfer Rates",
- "transform": "table",
- "transparent": false,
- "type": "table"
- },
- {
- "columns": [
- {
- "text": "Current",
- "value": "current"
- }
- ],
- "datasource": "${DS_PROMETHEUS}",
- "fontSize": "100%",
- "gridPos": {
- "h": 8,
- "w": 24,
- "x": 0,
- "y": 24
- },
- "height": "1024",
- "id": 85,
- "links": [],
- "pageSize": 7,
- "scroll": true,
- "showHeader": true,
- "sort": {
- "col": 1,
- "desc": false
- },
- "styles": [
- {
- "alias": "Time",
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "pattern": "Time",
- "type": "date"
- },
- {
- "alias": "TTL",
- "colorMode": "cell",
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 0,
- "pattern": "Current",
- "thresholds": [
- "0",
- "691200"
- ],
- "type": "number",
- "unit": "s"
- },
- {
- "alias": "",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "decimals": 2,
- "pattern": "/.*/",
- "thresholds": [],
- "type": "number",
- "unit": "short"
- }
- ],
- "targets": [
- {
- "expr": "avg(nginx_ingress_controller_ssl_expire_time_seconds{kubernetes_pod_name=~\"$controller\",namespace=~\"$namespace\",ingress=~\"$ingress\"}) by (host) - time()",
- "format": "time_series",
- "intervalFactor": 1,
- "legendFormat": "{{ host }}",
- "metric": "gke_letsencrypt_cert_expiration",
- "refId": "A",
- "step": 1
- }
- ],
- "title": "Ingress Certificate Expiry",
- "transform": "timeseries_aggregations",
- "type": "table"
- }
- ],
- "refresh": "5s",
- "schemaVersion": 16,
- "style": "dark",
- "tags": [
- "nginx"
- ],
- "templating": {
- "list": [
- {
- "hide": 0,
- "label": "datasource",
- "name": "DS_PROMETHEUS",
- "options": [],
- "query": "prometheus",
- "refresh": 1,
- "regex": "",
- "type": "datasource"
- },
- {
- "allValue": ".*",
- "current": {
- "text": "All",
- "value": "$__all"
- },
- "datasource": "${DS_PROMETHEUS}",
- "hide": 0,
- "includeAll": true,
- "label": "Namespace",
- "multi": false,
- "name": "namespace",
- "options": [],
- "query": "label_values(nginx_ingress_controller_config_hash, controller_namespace)",
- "refresh": 1,
- "regex": "",
- "sort": 0,
- "tagValuesQuery": "",
- "tags": [],
- "tagsQuery": "",
- "type": "query",
- "useTags": false
- },
- {
- "allValue": ".*",
- "current": {
- "text": "All",
- "value": "$__all"
- },
- "datasource": "${DS_PROMETHEUS}",
- "hide": 0,
- "includeAll": true,
- "label": "Controller Class",
- "multi": false,
- "name": "controller_class",
- "options": [],
- "query": "label_values(nginx_ingress_controller_config_hash{namespace=~\"$namespace\"}, controller_class) ",
- "refresh": 1,
- "regex": "",
- "sort": 0,
- "tagValuesQuery": "",
- "tags": [],
- "tagsQuery": "",
- "type": "query",
- "useTags": false
- },
- {
- "allValue": ".*",
- "current": {
- "text": "All",
- "value": "$__all"
- },
- "datasource": "${DS_PROMETHEUS}",
- "hide": 0,
- "includeAll": true,
- "label": "Controller",
- "multi": false,
- "name": "controller",
- "options": [],
- "query": "label_values(nginx_ingress_controller_config_hash{namespace=~\"$namespace\",controller_class=~\"$controller_class\"}, controller_pod) ",
- "refresh": 1,
- "regex": "",
- "sort": 0,
- "tagValuesQuery": "",
- "tags": [],
- "tagsQuery": "",
- "type": "query",
- "useTags": false
- },
- {
- "allValue": ".*",
- "current": {
- "tags": [],
- "text": "All",
- "value": "$__all"
- },
- "datasource": "${DS_PROMETHEUS}",
- "hide": 0,
- "includeAll": true,
- "label": "Ingress",
- "multi": false,
- "name": "ingress",
- "options": [],
- "query": "label_values(nginx_ingress_controller_requests{namespace=~\"$namespace\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"}, ingress) ",
- "refresh": 1,
- "regex": "",
- "sort": 2,
- "tagValuesQuery": "",
- "tags": [],
- "tagsQuery": "",
- "type": "query",
- "useTags": false
- }
- ]
- },
- "time": {
- "from": "now-1h",
- "to": "now"
- },
- "timepicker": {
- "refresh_intervals": [
- "5s",
- "10s",
- "30s",
- "2m",
- "5m",
- "15m",
- "30m",
- "1h",
- "2h",
- "1d"
- ],
- "time_options": [
- "5m",
- "15m",
- "1h",
- "6h",
- "12h",
- "24h",
- "2d",
- "7d",
- "30d"
- ]
- },
- "timezone": "browser",
- "title": "NGINX Ingress controller",
- "uid": "nginx",
- "version": 1
- }
diff --git a/manifests/monitoring/loki-stack.jsonnet b/manifests/monitoring/loki-stack.jsonnet
deleted file mode 100644
index d7d6c48..0000000
--- a/manifests/monitoring/loki-stack.jsonnet
+++ /dev/null
@@ -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
- |||
-}
-]
diff --git a/manifests/monitoring/prometheus-stack.jsonnet b/manifests/monitoring/prometheus-stack.jsonnet
deleted file mode 100644
index 080e69d..0000000
--- a/manifests/monitoring/prometheus-stack.jsonnet
+++ /dev/null
@@ -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
- |||
-}
-]
From ac81d02ad408f8bf1f57764d08cf7f9387babfca Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 22 Dec 2023 02:01:05 +0000
Subject: [PATCH 002/114] chore: update helm release ingress-nginx to 4.9.*
---
manifests/ingress-nginx.jsonnet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manifests/ingress-nginx.jsonnet b/manifests/ingress-nginx.jsonnet
index 273dfa5..9f71adf 100644
--- a/manifests/ingress-nginx.jsonnet
+++ b/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.9.*",
values:: |||
defaultBackend:
enabled: true
From 4fe927d03fbc28421dd632c503e40ae3c002cf49 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 22 Dec 2023 02:01:01 +0000
Subject: [PATCH 003/114] chore: update dependency k3s-io/k3s to v1.29.0+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index bf79703..a891697 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -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.29.0+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From 9b01641729322118c3a7b25c3680a793c4ed0b04 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sun, 31 Dec 2023 02:00:39 +0000
Subject: [PATCH 004/114] chore: update helm release argo-cd to v5.52.0
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 27399c0..8ae8459 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 5.51.6
+ version: 5.52.0
targetNamespace: argocd
valuesContent: |-
applicationSet:
From b5e505ac58d6744c04eaf0f1817928ceee4ce532 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Tue, 23 Jan 2024 02:00:36 +0000
Subject: [PATCH 005/114] chore: update helm release argo-cd to v5.53.8
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 8ae8459..1ce58a8 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 5.52.0
+ version: 5.53.8
targetNamespace: argocd
valuesContent: |-
applicationSet:
From d5c063115763580607f91c269359e5e4eafff22e Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sat, 3 Feb 2024 02:01:06 +0000
Subject: [PATCH 006/114] chore: update helm release argocd-apps to v1.6.1
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 1ce58a8..c579441 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -32,7 +32,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argocd-apps
- version: 1.4.1
+ version: 1.6.1
targetNamespace: argocd
valuesContent: |-
projects:
From 17034fcad5ecdad1ec0e8a815fcfb95c3ec27469 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 7 Feb 2024 02:01:01 +0000
Subject: [PATCH 007/114] chore: update helm release argo-cd to v5.54.0
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index c579441..bc8d6ce 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 5.53.8
+ version: 5.54.0
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 05636c86129cf9fac2bb0a08fcf797f59a09466e Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sat, 3 Feb 2024 02:01:07 +0000
Subject: [PATCH 008/114] chore: update helm release cert-manager to 1.14.*
---
manifests/cert-manager/cert-manager.jsonnet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manifests/cert-manager/cert-manager.jsonnet b/manifests/cert-manager/cert-manager.jsonnet
index ec684ac..925f64a 100644
--- a/manifests/cert-manager/cert-manager.jsonnet
+++ b/manifests/cert-manager/cert-manager.jsonnet
@@ -4,7 +4,7 @@ local app = import "../_templates/argocd_app.libsonnet";
app + {
chart:: "cert-manager",
repo:: "https://charts.jetstack.io",
- version:: "1.13.*",
+ version:: "1.14.*",
values:: |||
installCRDs: true
|||
From 6908578a1a281a1928fc2ffe85aa13f552170bf2 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 8 Feb 2024 02:01:10 +0000
Subject: [PATCH 009/114] chore: update helm release argo-cd to v5.55.0
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index bc8d6ce..ef8b6c1 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 5.54.0
+ version: 5.55.0
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 8b2c0b2ba2e93c257f91417bd1fe502118bc9425 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 15 Feb 2024 02:00:43 +0000
Subject: [PATCH 010/114] chore: update helm release argo-cd to v6
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index ef8b6c1..4295f2c 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 5.55.0
+ version: 6.0.14
targetNamespace: argocd
valuesContent: |-
applicationSet:
From d2f0a6550c5e73c4aa66dda906c4955c55adc492 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 7 Feb 2024 02:00:55 +0000
Subject: [PATCH 011/114] chore: update dependency k3s-io/k3s to v1.29.1+k3s2
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index a891697..7032a36 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.29.0+k3s1
+ INSTALL_K3S_CHANNEL: v1.29.1+k3s2
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From b9ee994658b12ecb7def0e1a694a3f648c53b253 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sat, 24 Feb 2024 02:00:48 +0000
Subject: [PATCH 012/114] chore: update helm release argo-cd to v6.3.1
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 4295f2c..441a6f4 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.0.14
+ version: 6.3.1
targetNamespace: argocd
valuesContent: |-
applicationSet:
From ec34ab2ac649df0a5e68581f03dc773c74798a13 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Mon, 26 Feb 2024 02:00:47 +0000
Subject: [PATCH 013/114] chore: update helm release argocd-apps to v1.6.2
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 441a6f4..31b40df 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -32,7 +32,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argocd-apps
- version: 1.6.1
+ version: 1.6.2
targetNamespace: argocd
valuesContent: |-
projects:
From b09c862403e697b7c0aaf72767c0323a4b67eb1b Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Mon, 26 Feb 2024 02:00:50 +0000
Subject: [PATCH 014/114] chore: update helm release argo-cd to v6.4.0
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 31b40df..e41376c 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.3.1
+ version: 6.4.0
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 03d00df939f0b4df5252dd78618d7889104bc230 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Tue, 12 Mar 2024 02:01:03 +0000
Subject: [PATCH 015/114] chore: update helm release argo-cd to v6.7.1
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index e41376c..487a212 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.4.0
+ version: 6.7.1
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 54f86f100b668eca1c1a090c3f1e8bf3fe62b882 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 29 Feb 2024 02:00:53 +0000
Subject: [PATCH 016/114] chore: update helm release ingress-nginx to 4.10.*
---
manifests/ingress-nginx.jsonnet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manifests/ingress-nginx.jsonnet b/manifests/ingress-nginx.jsonnet
index 9f71adf..4cbab9c 100644
--- a/manifests/ingress-nginx.jsonnet
+++ b/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.9.*",
+ version:: "4.10.*",
values:: |||
defaultBackend:
enabled: true
From 4d2f192a01a915f99163bb584e0848dc347e7f1c Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Tue, 5 Mar 2024 02:01:19 +0000
Subject: [PATCH 017/114] chore: update dependency k3s-io/k3s to v1.29.2+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index 7032a36..329e796 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.29.1+k3s2
+ INSTALL_K3S_CHANNEL: v1.29.2+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From 4359716e0785a60afed5e8e9d2e558b912298884 Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Wed, 13 Mar 2024 09:28:16 +0100
Subject: [PATCH 018/114] feat: add task to create a monthly cronjob for
restarting k3s
---
pb_install.yml | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/pb_install.yml b/pb_install.yml
index 329e796..2afe7f2 100644
--- a/pb_install.yml
+++ b/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
@@ -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
From 92d61457e77032bcbcb587c3b19cd3561a9234b5 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 28 Mar 2024 02:00:42 +0000
Subject: [PATCH 019/114] chore: update dependency k3s-io/k3s to v1.29.3+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index 2afe7f2..ef0804d 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.29.2+k3s1
+ INSTALL_K3S_CHANNEL: v1.29.3+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From 43da19c70f70513c06add5c93bc370d32e1d25b2 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 5 Apr 2024 02:00:40 +0000
Subject: [PATCH 020/114] chore: update helm release argo-cd to v6.7.9
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 487a212..852f026 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.7.1
+ version: 6.7.9
targetNamespace: argocd
valuesContent: |-
applicationSet:
From f24fdc4e566882a0b318cb48e11a19df6b97bc2d Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sun, 24 Mar 2024 02:00:52 +0000
Subject: [PATCH 021/114] chore: update helm release argocd-apps to v2
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 852f026..155740e 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -32,7 +32,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argocd-apps
- version: 1.6.2
+ version: 2.0.0
targetNamespace: argocd
valuesContent: |-
projects:
From 7c7d88ab04391d38d81baef22425a95dedb64856 Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Fri, 5 Apr 2024 09:33:52 +0200
Subject: [PATCH 022/114] fix(init): update argocd app definition format
update project an application definition based an this (mostly useless)
changelog entry:
> make the chart use maps instead of lists
Usefull hints on the new structure can be found in then git diff:
https://github.com/argoproj/argo-helm/compare/argo-events-2.4.4...argocd-apps-2.0.0
or in the new valuesContent:
https://artifacthub.io/packages/helm/argo/argocd-apps?modal=values
---
argocd-init.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 155740e..f4385b0 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -36,7 +36,7 @@ spec:
targetNamespace: argocd
valuesContent: |-
projects:
- - name: baseline
+ baseline:
namespace: argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
@@ -49,8 +49,7 @@ spec:
- group: '*'
kind: '*'
applications:
- - name: baseline
- namespace: argocd
+ baseline:
project: baseline
finalizers:
- resources-finalizer.argocd.argoproj.io
From 71c63bb31fedccd7aac91e334969da65d4a0d7a6 Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Fri, 5 Apr 2024 10:14:32 +0200
Subject: [PATCH 023/114] fix: downgrade k3s to v1.29.2+k3s1
v1.29.3+k3s1 breaks patching the ingress controller
This reverts commit 638f1a7a46d63bff1bc891eb126b0f96876d995d.
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index ef0804d..2afe7f2 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.29.3+k3s1
+ INSTALL_K3S_CHANNEL: v1.29.2+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From d51008810bb3819ee4001dbf196d6f2ba32a8106 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sat, 6 Apr 2024 02:00:38 +0000
Subject: [PATCH 024/114] chore: update helm release argo-cd to v6.7.10
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index f4385b0..2051ed2 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.7.9
+ version: 6.7.10
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 0877ff9e4fdd7eaa375fa342414bb23135c1365b Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 11 Apr 2024 02:01:14 +0000
Subject: [PATCH 025/114] chore: update helm release argo-cd to v6.7.11
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 2051ed2..a1ee3ab 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.7.10
+ version: 6.7.11
targetNamespace: argocd
valuesContent: |-
applicationSet:
From b7a40ffeda6bd9f9ff0c746fffe552895374999b Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Fri, 19 Apr 2024 09:07:09 +0200
Subject: [PATCH 026/114] feat(argocd): force-set server replicas
---
argocd-init.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/argocd-init.yml b/argocd-init.yml
index a1ee3ab..51906c6 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -16,6 +16,8 @@ spec:
version: 6.7.11
targetNamespace: argocd
valuesContent: |-
+ server:
+ replicas: 1
applicationSet:
enabled: false
notifications:
From b99b34c5455a439132394fe756d1f3651ca0fd60 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Mon, 22 Apr 2024 02:00:36 +0000
Subject: [PATCH 027/114] chore: update helm release argo-cd to v6.7.14
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 51906c6..646f7b6 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.7.11
+ version: 6.7.14
targetNamespace: argocd
valuesContent: |-
server:
From e75cc17ea2207691870f2bf751a0a6f4c25cd2ed Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Thu, 25 Apr 2024 12:23:05 +0200
Subject: [PATCH 028/114] fix: consistent jsonnet format for renovate
---
.renovaterc.json | 10 +++++-----
argocd-init.yml | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.renovaterc.json b/.renovaterc.json
index 8ee6a2b..bce5feb 100644
--- a/.renovaterc.json
+++ b/.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"
diff --git a/argocd-init.yml b/argocd-init.yml
index 646f7b6..2b9a451 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -11,8 +11,8 @@ metadata:
namespace: kube-system
spec:
# do not change order! (needed for renovate)
- repo: https://argoproj.github.io/argo-helm
chart: argo-cd
+ repo: https://argoproj.github.io/argo-helm
version: 6.7.14
targetNamespace: argocd
valuesContent: |-
@@ -32,8 +32,8 @@ metadata:
namespace: kube-system
spec:
# do not change order! (needed for renovate)
- repo: https://argoproj.github.io/argo-helm
chart: argocd-apps
+ repo: https://argoproj.github.io/argo-helm
version: 2.0.0
targetNamespace: argocd
valuesContent: |-
From acdcbe0e2f68b51f0a91468ee682be640bc69cf9 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 25 Apr 2024 10:26:57 +0000
Subject: [PATCH 029/114] chore: update helm release argo-cd to v6.7.15
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 2b9a451..8205272 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 6.7.14
+ version: 6.7.15
targetNamespace: argocd
valuesContent: |-
server:
From 1292fa252e921ffa5242b029fa6b7e67ade4d5c8 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sat, 27 Apr 2024 02:00:53 +0000
Subject: [PATCH 030/114] chore: update dependency k3s-io/k3s to v1.29.4+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index 2afe7f2..ebe4653 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.29.2+k3s1
+ INSTALL_K3S_CHANNEL: v1.29.4+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From dca117e8bc1f8aaf7653abc309efd709b32e79e2 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 1 May 2024 02:00:55 +0000
Subject: [PATCH 031/114] chore: update helm release argo-cd to v6.7.18
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 8205272..bb52603 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 6.7.15
+ version: 6.7.18
targetNamespace: argocd
valuesContent: |-
server:
From fad48c2e7a13bd961161d3fffb7395675521d080 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 9 May 2024 02:00:43 +0000
Subject: [PATCH 032/114] chore: update helm release argo-cd to v6.8.0
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index bb52603..0fb2ab2 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 6.7.18
+ version: 6.8.0
targetNamespace: argocd
valuesContent: |-
server:
From 64eaf66fd4c9b0664c547abd6184c04e2dfda67a Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 15 May 2024 02:00:43 +0000
Subject: [PATCH 033/114] chore: update helm release argo-cd to v6.9.2
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 0fb2ab2..1092e9a 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 6.8.0
+ version: 6.9.2
targetNamespace: argocd
valuesContent: |-
server:
From 39b7162d2c75143daa240afd975cbfc709f4b025 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sat, 11 May 2024 02:00:41 +0000
Subject: [PATCH 034/114] chore: update dependency k3s-io/k3s to v1.30.0+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index ebe4653..35a5b89 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.29.4+k3s1
+ INSTALL_K3S_CHANNEL: v1.30.0+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From 66ab77a6c4d50fc6a2d50cd50116d6da4deb34c2 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 24 May 2024 02:00:39 +0000
Subject: [PATCH 035/114] chore: update helm release argo-cd to v6.11.1
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 1092e9a..88bfa39 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 6.9.2
+ version: 6.11.1
targetNamespace: argocd
valuesContent: |-
server:
From 02af75408d13f16f92589d62e755db9cd481e95b Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 29 May 2024 02:00:50 +0000
Subject: [PATCH 036/114] chore: update dependency k3s-io/k3s to v1.30.1+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index 35a5b89..6fc7a0d 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.30.0+k3s1
+ INSTALL_K3S_CHANNEL: v1.30.1+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From bc21e5b9992281625467b6b8f6252ed3bc265456 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 5 Jun 2024 06:18:59 +0000
Subject: [PATCH 037/114] chore: update helm release argo-cd to v7
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 88bfa39..b9b05e7 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 6.11.1
+ version: 7.1.1
targetNamespace: argocd
valuesContent: |-
server:
From 053cee9a3d0900c6fea93dc5b3379c8844fac468 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 6 Jun 2024 02:00:57 +0000
Subject: [PATCH 038/114] chore: update helm release cert-manager to 1.15.*
---
manifests/cert-manager/cert-manager.jsonnet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manifests/cert-manager/cert-manager.jsonnet b/manifests/cert-manager/cert-manager.jsonnet
index 925f64a..40bffe9 100644
--- a/manifests/cert-manager/cert-manager.jsonnet
+++ b/manifests/cert-manager/cert-manager.jsonnet
@@ -4,7 +4,7 @@ local app = import "../_templates/argocd_app.libsonnet";
app + {
chart:: "cert-manager",
repo:: "https://charts.jetstack.io",
- version:: "1.14.*",
+ version:: "1.15.*",
values:: |||
installCRDs: true
|||
From d43bcd8732ab574399b52f2668ff64fd87073f03 Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Thu, 6 Jun 2024 07:55:09 +0200
Subject: [PATCH 039/114] break(cert-manager): adjust chart values for CRDs
---
manifests/cert-manager/cert-manager.jsonnet | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/manifests/cert-manager/cert-manager.jsonnet b/manifests/cert-manager/cert-manager.jsonnet
index 40bffe9..6ea4824 100644
--- a/manifests/cert-manager/cert-manager.jsonnet
+++ b/manifests/cert-manager/cert-manager.jsonnet
@@ -6,7 +6,9 @@ app + {
repo:: "https://charts.jetstack.io",
version:: "1.15.*",
values:: |||
- installCRDs: true
+ crds:
+ enabled: true
+ keep: false
|||
},
]
From 21a787e06aa6aa7dc8369fb24b928a4263578f05 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 7 Jun 2024 02:00:57 +0000
Subject: [PATCH 040/114] chore: update helm release argo-cd to v7.1.2
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index b9b05e7..2dd3da2 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.1.1
+ version: 7.1.2
targetNamespace: argocd
valuesContent: |-
server:
From aa4545a53dde1cb97be9ecd02df9678dd7f9319e Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Tue, 18 Jun 2024 02:01:03 +0000
Subject: [PATCH 041/114] chore: update helm release argo-cd to v7.1.4
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 2dd3da2..42bb4e2 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.1.2
+ version: 7.1.4
targetNamespace: argocd
valuesContent: |-
server:
From 38f70d7e2636f8fbe2f15e208b91b8f35efb8778 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 20 Jun 2024 02:00:43 +0000
Subject: [PATCH 042/114] chore: update helm release argo-cd to v7.1.5
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 42bb4e2..8caa428 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.1.4
+ version: 7.1.5
targetNamespace: argocd
valuesContent: |-
server:
From fd40981ec3267a1a88d5182fb20793b509713d38 Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Thu, 20 Jun 2024 14:13:31 +0200
Subject: [PATCH 043/114] feat(zabbix-proxy): update helm chart repository to
v7
---
manifests/monitoring/zabbix-proxy.jsonnet | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/manifests/monitoring/zabbix-proxy.jsonnet b/manifests/monitoring/zabbix-proxy.jsonnet
index 92016b4..124c7aa 100644
--- a/manifests/monitoring/zabbix-proxy.jsonnet
+++ b/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",
- version:: "1.3.*",
+ repo:: "https://cdn.zabbix.com/zabbix/integrations/kubernetes-helm/7.0",
+ version:: "0.0.*",
values:: |||
zabbixAgent:
enabled: false
From ddf7df239bd93c8c84f77f6e57a5b73b0cf9925f Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 21 Jun 2024 02:00:44 +0000
Subject: [PATCH 044/114] chore: update helm release argo-cd to v7.2.0
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 8caa428..5d5a0aa 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.1.5
+ version: 7.2.0
targetNamespace: argocd
valuesContent: |-
server:
From 98ac0beeddc6ebe5ab5fb2e731d70a54fbdd7e7f Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 26 Jun 2024 02:00:49 +0000
Subject: [PATCH 045/114] chore: update helm release argo-cd to v7.3.1
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 5d5a0aa..692813d 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.2.0
+ version: 7.3.1
targetNamespace: argocd
valuesContent: |-
server:
From 3f6a130e587cf1437574c5c3983a1931a5bf6bd5 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 28 Jun 2024 02:00:47 +0000
Subject: [PATCH 046/114] chore: update dependency k3s-io/k3s to v1.30.2+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index 6fc7a0d..09c2e5b 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.30.1+k3s1
+ INSTALL_K3S_CHANNEL: v1.30.2+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From 98a31e7e4b15c0ebc4c66ee3c55b9c469fc4496a Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 3 Jul 2024 02:00:50 +0000
Subject: [PATCH 047/114] chore: update helm release argo-cd to v7.3.4
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 692813d..2a9e50c 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.1
+ version: 7.3.4
targetNamespace: argocd
valuesContent: |-
server:
From 00404e59a9f263f3a32ab6c0f0a1630c13ea6876 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Tue, 9 Jul 2024 02:00:46 +0000
Subject: [PATCH 048/114] chore: update helm release ingress-nginx to 4.11.*
---
manifests/ingress-nginx.jsonnet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manifests/ingress-nginx.jsonnet b/manifests/ingress-nginx.jsonnet
index 4cbab9c..0782b1e 100644
--- a/manifests/ingress-nginx.jsonnet
+++ b/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.10.*",
+ version:: "4.11.*",
values:: |||
defaultBackend:
enabled: true
From 327f9bc32e87081289fb64581390c3e99c3dc8e6 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 12 Jul 2024 02:00:44 +0000
Subject: [PATCH 049/114] chore: update helm release argo-cd to v7.3.6
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 2a9e50c..624df84 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.4
+ version: 7.3.6
targetNamespace: argocd
valuesContent: |-
server:
From 7ba4334b2373c7d8b6ba5dc2c6c3ab8477ea3bf9 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 18 Jul 2024 02:04:34 +0000
Subject: [PATCH 050/114] chore: update helm release argo-cd to v7.3.8
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 624df84..7415f99 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.6
+ version: 7.3.8
targetNamespace: argocd
valuesContent: |-
server:
From 3e4fd63f1cca0fca48146c178fed237df890475d Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sun, 21 Jul 2024 02:01:02 +0000
Subject: [PATCH 051/114] chore: update helm release argo-cd to v7.3.9
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 7415f99..c9260da 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.8
+ version: 7.3.9
targetNamespace: argocd
valuesContent: |-
server:
From 5cb5107539c52684a6b8db82b12b7ba4a6a55e0f Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Tue, 23 Jul 2024 02:00:57 +0000
Subject: [PATCH 052/114] chore: update helm release argo-cd to v7.3.10
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index c9260da..bd3e9a9 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.9
+ version: 7.3.10
targetNamespace: argocd
valuesContent: |-
server:
From 1168f3657148c885dd9dd6771abe5e88f56485c2 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 25 Jul 2024 02:00:46 +0000
Subject: [PATCH 053/114] chore: update helm release argo-cd to v7.3.11
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index bd3e9a9..2dd428b 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.10
+ version: 7.3.11
targetNamespace: argocd
valuesContent: |-
server:
From 2d1a33d17ad71d37cb7a75a1ec827bb940b964a7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 2 Aug 2024 02:00:18 +0000
Subject: [PATCH 054/114] chore: update dependency k3s-io/k3s to v1.30.3+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index 09c2e5b..758aac1 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.30.2+k3s1
+ INSTALL_K3S_CHANNEL: v1.30.3+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From ba77aa92db867610fc1d40874cedefaac27b94fa Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 7 Aug 2024 02:00:22 +0000
Subject: [PATCH 055/114] chore: update helm release argo-cd to v7.4.1
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 2dd428b..f0f5563 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.11
+ version: 7.4.1
targetNamespace: argocd
valuesContent: |-
server:
From 5ed2d0c583a5def92f755e7a6719121f2c5a61b0 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 8 Aug 2024 21:22:17 +0000
Subject: [PATCH 056/114] chore: update helm release argo-cd to v7.4.2
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index f0f5563..7038d25 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.4.1
+ version: 7.4.2
targetNamespace: argocd
valuesContent: |-
server:
From 954ce828c040b1a1c05d155d22e3ac6e491ee184 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Mon, 12 Aug 2024 16:00:18 +0000
Subject: [PATCH 057/114] chore: update helm release argo-cd to v7.4.3
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 7038d25..1a39bfe 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.4.2
+ version: 7.4.3
targetNamespace: argocd
valuesContent: |-
server:
From 9b45d13ba1424b4fdb60925c53272cb36f1237c3 Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Wed, 13 Dec 2023 17:54:55 +0100
Subject: [PATCH 058/114] break(monitoring): remove prometheus-stack and loki
---
README.md | 1 -
manifests/ingress-nginx.jsonnet | 6 -
.../grafana-ressources/nginx-dashboard.yml | 1473 -----------------
manifests/monitoring/loki-stack.jsonnet | 39 -
manifests/monitoring/prometheus-stack.jsonnet | 47 -
5 files changed, 1566 deletions(-)
delete mode 100644 manifests/monitoring/grafana-ressources/nginx-dashboard.yml
delete mode 100644 manifests/monitoring/loki-stack.jsonnet
delete mode 100644 manifests/monitoring/prometheus-stack.jsonnet
diff --git a/README.md b/README.md
index 6c2a9c2..cc194d0 100644
--- a/README.md
+++ b/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)
diff --git a/manifests/ingress-nginx.jsonnet b/manifests/ingress-nginx.jsonnet
index 273dfa5..18a7b58 100644
--- a/manifests/ingress-nginx.jsonnet
+++ b/manifests/ingress-nginx.jsonnet
@@ -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
|||
}
]
diff --git a/manifests/monitoring/grafana-ressources/nginx-dashboard.yml b/manifests/monitoring/grafana-ressources/nginx-dashboard.yml
deleted file mode 100644
index b4d9810..0000000
--- a/manifests/monitoring/grafana-ressources/nginx-dashboard.yml
+++ /dev/null
@@ -1,1473 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: grafana-nginx-dashbaord
- namespace: metrics
- labels:
- grafana_dashboard: "1"
-data:
- nginx.json: |
- {
- "__inputs": [
- {
- "name": "DS_PROMETHEUS",
- "label": "Prometheus",
- "description": "",
- "type": "datasource",
- "pluginId": "prometheus",
- "pluginName": "Prometheus"
- }
- ],
- "__requires": [
- {
- "type": "grafana",
- "id": "grafana",
- "name": "Grafana",
- "version": "5.2.1"
- },
- {
- "type": "datasource",
- "id": "prometheus",
- "name": "Prometheus",
- "version": "5.0.0"
- },
- {
- "type": "panel",
- "id": "singlestat",
- "name": "Singlestat",
- "version": "5.0.0"
- }
- ],
- "annotations": {
- "list": [
- {
- "builtIn": 1,
- "datasource": "-- Grafana --",
- "enable": true,
- "hide": true,
- "iconColor": "rgba(0, 211, 255, 1)",
- "name": "Annotations & Alerts",
- "type": "dashboard"
- },
- {
- "datasource": "${DS_PROMETHEUS}",
- "enable": true,
- "expr": "sum(changes(nginx_ingress_controller_config_last_reload_successful_timestamp_seconds{instance!=\"unknown\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[30s])) by (controller_class)",
- "hide": false,
- "iconColor": "rgba(255, 96, 96, 1)",
- "limit": 100,
- "name": "Config Reloads",
- "showIn": 0,
- "step": "30s",
- "tagKeys": "controller_class",
- "tags": [],
- "titleFormat": "Config Reloaded",
- "type": "tags"
- }
- ]
- },
- "editable": true,
- "gnetId": null,
- "graphTooltip": 0,
- "iteration": 1534359654832,
- "links": [],
- "panels": [
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": "${DS_PROMETHEUS}",
- "format": "ops",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 6,
- "x": 0,
- "y": 0
- },
- "id": 20,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": true,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[2m])), 0.001)",
- "format": "time_series",
- "intervalFactor": 1,
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": "",
- "title": "Controller Request Volume",
- "transparent": false,
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "avg"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": "${DS_PROMETHEUS}",
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 6,
- "x": 6,
- "y": 0
- },
- "id": 82,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": true,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "sum(avg_over_time(nginx_ingress_controller_nginx_process_connections{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",state=\"active\"}[2m]))",
- "format": "time_series",
- "instant": false,
- "intervalFactor": 1,
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": "",
- "title": "Controller Connections",
- "transparent": false,
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "avg"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": "${DS_PROMETHEUS}",
- "format": "percentunit",
- "gauge": {
- "maxValue": 100,
- "minValue": 80,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": false
- },
- "gridPos": {
- "h": 3,
- "w": 6,
- "x": 12,
- "y": 0
- },
- "id": 21,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": true,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",status!~\"[4-5].*\"}[2m])) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[2m]))",
- "format": "time_series",
- "intervalFactor": 1,
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": "95, 99, 99.5",
- "title": "Controller Success Rate (non-4|5xx responses)",
- "transparent": false,
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "avg"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 0,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 3,
- "x": 18,
- "y": 0
- },
- "id": 81,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": true,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "avg(irate(nginx_ingress_controller_success{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[1m])) * 60",
- "format": "time_series",
- "instant": false,
- "intervalFactor": 1,
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": "",
- "title": "Config Reloads",
- "transparent": false,
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "total"
- },
- {
- "cacheTimeout": null,
- "colorBackground": false,
- "colorValue": false,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 0,
- "format": "none",
- "gauge": {
- "maxValue": 100,
- "minValue": 0,
- "show": false,
- "thresholdLabels": false,
- "thresholdMarkers": true
- },
- "gridPos": {
- "h": 3,
- "w": 3,
- "x": 21,
- "y": 0
- },
- "id": 83,
- "interval": null,
- "links": [],
- "mappingType": 1,
- "mappingTypes": [
- {
- "name": "value to text",
- "value": 1
- },
- {
- "name": "range to text",
- "value": 2
- }
- ],
- "maxDataPoints": 100,
- "nullPointMode": "connected",
- "nullText": null,
- "postfix": "",
- "postfixFontSize": "50%",
- "prefix": "",
- "prefixFontSize": "50%",
- "rangeMaps": [
- {
- "from": "null",
- "text": "N/A",
- "to": "null"
- }
- ],
- "sparkline": {
- "fillColor": "rgba(31, 118, 189, 0.18)",
- "full": true,
- "lineColor": "rgb(31, 120, 193)",
- "show": true
- },
- "tableColumn": "",
- "targets": [
- {
- "expr": "count(nginx_ingress_controller_config_last_reload_successful{controller_pod=~\"$controller\",controller_namespace=~\"$namespace\"} == 0)",
- "format": "time_series",
- "instant": true,
- "intervalFactor": 1,
- "refId": "A",
- "step": 4
- }
- ],
- "thresholds": "",
- "title": "Last Config Failed",
- "transparent": false,
- "type": "singlestat",
- "valueFontSize": "80%",
- "valueMaps": [
- {
- "op": "=",
- "text": "N/A",
- "value": "null"
- }
- ],
- "valueName": "avg"
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 2,
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "gridPos": {
- "h": 7,
- "w": 12,
- "x": 0,
- "y": 3
- },
- "height": "200px",
- "id": 86,
- "isNew": true,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "hideEmpty": false,
- "hideZero": true,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "sideWidth": 300,
- "sort": "current",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "repeat": null,
- "repeatDirection": "h",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (ingress), 0.001)",
- "format": "time_series",
- "hide": false,
- "instant": false,
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "{{ ingress }}",
- "metric": "network",
- "refId": "A",
- "step": 10
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Ingress Request Volume",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 2,
- "value_type": "cumulative"
- },
- "transparent": false,
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "reqps",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "Bps",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": false
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {
- "max - istio-proxy": "#890f02",
- "max - master": "#bf1b00",
- "max - prometheus": "#bf1b00"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 2,
- "editable": false,
- "error": false,
- "fill": 0,
- "grid": {},
- "gridPos": {
- "h": 7,
- "w": 12,
- "x": 12,
- "y": 3
- },
- "id": 87,
- "isNew": true,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": false,
- "hideEmpty": true,
- "hideZero": false,
- "max": false,
- "min": false,
- "rightSide": true,
- "show": true,
- "sideWidth": 300,
- "sort": "avg",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",ingress=~\"$ingress\",status!~\"[4-5].*\"}[2m])) by (ingress) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (ingress)",
- "format": "time_series",
- "instant": false,
- "interval": "10s",
- "intervalFactor": 1,
- "legendFormat": "{{ ingress }}",
- "metric": "container_memory_usage:sort_desc",
- "refId": "A",
- "step": 10
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Ingress Success Rate (non-4|5xx responses)",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 1,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "percentunit",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": false
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 2,
- "editable": true,
- "error": false,
- "fill": 1,
- "grid": {},
- "gridPos": {
- "h": 6,
- "w": 8,
- "x": 0,
- "y": 10
- },
- "height": "200px",
- "id": 32,
- "isNew": true,
- "legend": {
- "alignAsTable": false,
- "avg": true,
- "current": true,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": false,
- "sideWidth": 200,
- "sort": "current",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "sum (irate (nginx_ingress_controller_request_size_sum{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[2m]))",
- "format": "time_series",
- "instant": false,
- "interval": "10s",
- "intervalFactor": 1,
- "legendFormat": "Received",
- "metric": "network",
- "refId": "A",
- "step": 10
- },
- {
- "expr": "- sum (irate (nginx_ingress_controller_response_size_sum{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[2m]))",
- "format": "time_series",
- "hide": false,
- "interval": "10s",
- "intervalFactor": 1,
- "legendFormat": "Sent",
- "metric": "network",
- "refId": "B",
- "step": 10
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Network I/O pressure",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 0,
- "value_type": "cumulative"
- },
- "transparent": false,
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "Bps",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "Bps",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": false
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {
- "max - istio-proxy": "#890f02",
- "max - master": "#bf1b00",
- "max - prometheus": "#bf1b00"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 2,
- "editable": false,
- "error": false,
- "fill": 0,
- "grid": {},
- "gridPos": {
- "h": 6,
- "w": 8,
- "x": 8,
- "y": 10
- },
- "id": 77,
- "isNew": true,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": true,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": false,
- "sideWidth": 200,
- "sort": "current",
- "sortDesc": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "avg(nginx_ingress_controller_nginx_process_resident_memory_bytes{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}) ",
- "format": "time_series",
- "instant": false,
- "interval": "10s",
- "intervalFactor": 1,
- "legendFormat": "nginx",
- "metric": "container_memory_usage:sort_desc",
- "refId": "A",
- "step": 10
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeShift": null,
- "title": "Average Memory Usage",
- "tooltip": {
- "msResolution": false,
- "shared": true,
- "sort": 2,
- "value_type": "cumulative"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "bytes",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": false
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "aliasColors": {
- "max - istio-proxy": "#890f02",
- "max - master": "#bf1b00"
- },
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "${DS_PROMETHEUS}",
- "decimals": 3,
- "editable": false,
- "error": false,
- "fill": 0,
- "grid": {},
- "gridPos": {
- "h": 6,
- "w": 8,
- "x": 16,
- "y": 10
- },
- "height": "",
- "id": 79,
- "isNew": true,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": true,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": false,
- "sort": null,
- "sortDesc": null,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 2,
- "links": [],
- "nullPointMode": "connected",
- "percentage": false,
- "pointradius": 5,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "avg (rate (nginx_ingress_controller_nginx_process_cpu_seconds_total{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[2m])) ",
- "format": "time_series",
- "interval": "10s",
- "intervalFactor": 1,
- "legendFormat": "nginx",
- "metric": "container_cpu",
- "refId": "A",
- "step": 10
- }
- ],
- "thresholds": [
- {
- "colorMode": "critical",
- "fill": true,
- "line": true,
- "op": "gt"
- }
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "Average CPU Usage",
- "tooltip": {
- "msResolution": true,
- "shared": true,
- "sort": 2,
- "value_type": "cumulative"
- },
- "transparent": false,
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "format": "none",
- "label": "cores",
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
- {
- "columns": [],
- "datasource": "${DS_PROMETHEUS}",
- "fontSize": "100%",
- "gridPos": {
- "h": 8,
- "w": 24,
- "x": 0,
- "y": 16
- },
- "hideTimeOverride": false,
- "id": 75,
- "links": [],
- "pageSize": 7,
- "repeat": null,
- "repeatDirection": "h",
- "scroll": true,
- "showHeader": true,
- "sort": {
- "col": 1,
- "desc": true
- },
- "styles": [
- {
- "alias": "Ingress",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 2,
- "pattern": "ingress",
- "preserveFormat": false,
- "sanitize": false,
- "thresholds": [],
- "type": "string",
- "unit": "short"
- },
- {
- "alias": "Requests",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 2,
- "pattern": "Value #A",
- "thresholds": [
- ""
- ],
- "type": "number",
- "unit": "ops"
- },
- {
- "alias": "Errors",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 2,
- "pattern": "Value #B",
- "thresholds": [],
- "type": "number",
- "unit": "ops"
- },
- {
- "alias": "P50 Latency",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 0,
- "link": false,
- "pattern": "Value #C",
- "thresholds": [],
- "type": "number",
- "unit": "dtdurations"
- },
- {
- "alias": "P90 Latency",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 0,
- "pattern": "Value #D",
- "thresholds": [],
- "type": "number",
- "unit": "dtdurations"
- },
- {
- "alias": "P99 Latency",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 0,
- "pattern": "Value #E",
- "thresholds": [],
- "type": "number",
- "unit": "dtdurations"
- },
- {
- "alias": "IN",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 2,
- "pattern": "Value #F",
- "thresholds": [
- ""
- ],
- "type": "number",
- "unit": "Bps"
- },
- {
- "alias": "",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 2,
- "pattern": "Time",
- "thresholds": [],
- "type": "hidden",
- "unit": "short"
- },
- {
- "alias": "OUT",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 2,
- "mappingType": 1,
- "pattern": "Value #G",
- "thresholds": [],
- "type": "number",
- "unit": "Bps"
- }
- ],
- "targets": [
- {
- "expr": "histogram_quantile(0.50, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le, ingress))",
- "format": "table",
- "hide": false,
- "instant": true,
- "intervalFactor": 1,
- "legendFormat": "{{ ingress }}",
- "refId": "C"
- },
- {
- "expr": "histogram_quantile(0.90, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le, ingress))",
- "format": "table",
- "hide": false,
- "instant": true,
- "intervalFactor": 1,
- "legendFormat": "{{ ingress }}",
- "refId": "D"
- },
- {
- "expr": "histogram_quantile(0.99, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (le, ingress))",
- "format": "table",
- "hide": false,
- "instant": true,
- "intervalFactor": 1,
- "legendFormat": "{{ destination_service }}",
- "refId": "E"
- },
- {
- "expr": "sum(irate(nginx_ingress_controller_request_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (ingress)",
- "format": "table",
- "hide": false,
- "instant": true,
- "interval": "",
- "intervalFactor": 1,
- "legendFormat": "{{ ingress }}",
- "refId": "F"
- },
- {
- "expr": "sum(irate(nginx_ingress_controller_response_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[2m])) by (ingress)",
- "format": "table",
- "instant": true,
- "intervalFactor": 1,
- "legendFormat": "{{ ingress }}",
- "refId": "G"
- }
- ],
- "timeFrom": null,
- "title": "Ingress Percentile Response Times and Transfer Rates",
- "transform": "table",
- "transparent": false,
- "type": "table"
- },
- {
- "columns": [
- {
- "text": "Current",
- "value": "current"
- }
- ],
- "datasource": "${DS_PROMETHEUS}",
- "fontSize": "100%",
- "gridPos": {
- "h": 8,
- "w": 24,
- "x": 0,
- "y": 24
- },
- "height": "1024",
- "id": 85,
- "links": [],
- "pageSize": 7,
- "scroll": true,
- "showHeader": true,
- "sort": {
- "col": 1,
- "desc": false
- },
- "styles": [
- {
- "alias": "Time",
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "pattern": "Time",
- "type": "date"
- },
- {
- "alias": "TTL",
- "colorMode": "cell",
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": 0,
- "pattern": "Current",
- "thresholds": [
- "0",
- "691200"
- ],
- "type": "number",
- "unit": "s"
- },
- {
- "alias": "",
- "colorMode": null,
- "colors": [
- "rgba(245, 54, 54, 0.9)",
- "rgba(237, 129, 40, 0.89)",
- "rgba(50, 172, 45, 0.97)"
- ],
- "decimals": 2,
- "pattern": "/.*/",
- "thresholds": [],
- "type": "number",
- "unit": "short"
- }
- ],
- "targets": [
- {
- "expr": "avg(nginx_ingress_controller_ssl_expire_time_seconds{kubernetes_pod_name=~\"$controller\",namespace=~\"$namespace\",ingress=~\"$ingress\"}) by (host) - time()",
- "format": "time_series",
- "intervalFactor": 1,
- "legendFormat": "{{ host }}",
- "metric": "gke_letsencrypt_cert_expiration",
- "refId": "A",
- "step": 1
- }
- ],
- "title": "Ingress Certificate Expiry",
- "transform": "timeseries_aggregations",
- "type": "table"
- }
- ],
- "refresh": "5s",
- "schemaVersion": 16,
- "style": "dark",
- "tags": [
- "nginx"
- ],
- "templating": {
- "list": [
- {
- "hide": 0,
- "label": "datasource",
- "name": "DS_PROMETHEUS",
- "options": [],
- "query": "prometheus",
- "refresh": 1,
- "regex": "",
- "type": "datasource"
- },
- {
- "allValue": ".*",
- "current": {
- "text": "All",
- "value": "$__all"
- },
- "datasource": "${DS_PROMETHEUS}",
- "hide": 0,
- "includeAll": true,
- "label": "Namespace",
- "multi": false,
- "name": "namespace",
- "options": [],
- "query": "label_values(nginx_ingress_controller_config_hash, controller_namespace)",
- "refresh": 1,
- "regex": "",
- "sort": 0,
- "tagValuesQuery": "",
- "tags": [],
- "tagsQuery": "",
- "type": "query",
- "useTags": false
- },
- {
- "allValue": ".*",
- "current": {
- "text": "All",
- "value": "$__all"
- },
- "datasource": "${DS_PROMETHEUS}",
- "hide": 0,
- "includeAll": true,
- "label": "Controller Class",
- "multi": false,
- "name": "controller_class",
- "options": [],
- "query": "label_values(nginx_ingress_controller_config_hash{namespace=~\"$namespace\"}, controller_class) ",
- "refresh": 1,
- "regex": "",
- "sort": 0,
- "tagValuesQuery": "",
- "tags": [],
- "tagsQuery": "",
- "type": "query",
- "useTags": false
- },
- {
- "allValue": ".*",
- "current": {
- "text": "All",
- "value": "$__all"
- },
- "datasource": "${DS_PROMETHEUS}",
- "hide": 0,
- "includeAll": true,
- "label": "Controller",
- "multi": false,
- "name": "controller",
- "options": [],
- "query": "label_values(nginx_ingress_controller_config_hash{namespace=~\"$namespace\",controller_class=~\"$controller_class\"}, controller_pod) ",
- "refresh": 1,
- "regex": "",
- "sort": 0,
- "tagValuesQuery": "",
- "tags": [],
- "tagsQuery": "",
- "type": "query",
- "useTags": false
- },
- {
- "allValue": ".*",
- "current": {
- "tags": [],
- "text": "All",
- "value": "$__all"
- },
- "datasource": "${DS_PROMETHEUS}",
- "hide": 0,
- "includeAll": true,
- "label": "Ingress",
- "multi": false,
- "name": "ingress",
- "options": [],
- "query": "label_values(nginx_ingress_controller_requests{namespace=~\"$namespace\",controller_class=~\"$controller_class\",controller_pod=~\"$controller\"}, ingress) ",
- "refresh": 1,
- "regex": "",
- "sort": 2,
- "tagValuesQuery": "",
- "tags": [],
- "tagsQuery": "",
- "type": "query",
- "useTags": false
- }
- ]
- },
- "time": {
- "from": "now-1h",
- "to": "now"
- },
- "timepicker": {
- "refresh_intervals": [
- "5s",
- "10s",
- "30s",
- "2m",
- "5m",
- "15m",
- "30m",
- "1h",
- "2h",
- "1d"
- ],
- "time_options": [
- "5m",
- "15m",
- "1h",
- "6h",
- "12h",
- "24h",
- "2d",
- "7d",
- "30d"
- ]
- },
- "timezone": "browser",
- "title": "NGINX Ingress controller",
- "uid": "nginx",
- "version": 1
- }
diff --git a/manifests/monitoring/loki-stack.jsonnet b/manifests/monitoring/loki-stack.jsonnet
deleted file mode 100644
index d7d6c48..0000000
--- a/manifests/monitoring/loki-stack.jsonnet
+++ /dev/null
@@ -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
- |||
-}
-]
diff --git a/manifests/monitoring/prometheus-stack.jsonnet b/manifests/monitoring/prometheus-stack.jsonnet
deleted file mode 100644
index 080e69d..0000000
--- a/manifests/monitoring/prometheus-stack.jsonnet
+++ /dev/null
@@ -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
- |||
-}
-]
From 8d14dc880c0add8f98c6f95d954914a5b24d5247 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 22 Dec 2023 02:01:05 +0000
Subject: [PATCH 059/114] chore: update helm release ingress-nginx to 4.9.*
---
manifests/ingress-nginx.jsonnet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manifests/ingress-nginx.jsonnet b/manifests/ingress-nginx.jsonnet
index 18a7b58..0659461 100644
--- a/manifests/ingress-nginx.jsonnet
+++ b/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.9.*",
values:: |||
defaultBackend:
enabled: true
From cdd7dfe2cecb34a400a567cf4a2fa99f30ee05da Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 22 Dec 2023 02:01:01 +0000
Subject: [PATCH 060/114] chore: update dependency k3s-io/k3s to v1.29.0+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index bf79703..a891697 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -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.29.0+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From c8939657312235d2cd4f3cd1a3972ad834bb3bc0 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sun, 31 Dec 2023 02:00:39 +0000
Subject: [PATCH 061/114] chore: update helm release argo-cd to v5.52.0
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 27399c0..8ae8459 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 5.51.6
+ version: 5.52.0
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 249f9c5b8f4daec35ca493bba160a7b4bd1ad8f6 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Tue, 23 Jan 2024 02:00:36 +0000
Subject: [PATCH 062/114] chore: update helm release argo-cd to v5.53.8
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 8ae8459..1ce58a8 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 5.52.0
+ version: 5.53.8
targetNamespace: argocd
valuesContent: |-
applicationSet:
From dc3bd9fb0158d6df4a9b27a0e57405927a9b7003 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sat, 3 Feb 2024 02:01:06 +0000
Subject: [PATCH 063/114] chore: update helm release argocd-apps to v1.6.1
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 1ce58a8..c579441 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -32,7 +32,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argocd-apps
- version: 1.4.1
+ version: 1.6.1
targetNamespace: argocd
valuesContent: |-
projects:
From 6e6b14e8bbc495522eb2182e9b8b613ba2aec1bb Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 7 Feb 2024 02:01:01 +0000
Subject: [PATCH 064/114] chore: update helm release argo-cd to v5.54.0
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index c579441..bc8d6ce 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 5.53.8
+ version: 5.54.0
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 586c4267fb275b2882ab4e3f86d3195d8a4a37bb Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sat, 3 Feb 2024 02:01:07 +0000
Subject: [PATCH 065/114] chore: update helm release cert-manager to 1.14.*
---
manifests/cert-manager/cert-manager.jsonnet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manifests/cert-manager/cert-manager.jsonnet b/manifests/cert-manager/cert-manager.jsonnet
index ec684ac..925f64a 100644
--- a/manifests/cert-manager/cert-manager.jsonnet
+++ b/manifests/cert-manager/cert-manager.jsonnet
@@ -4,7 +4,7 @@ local app = import "../_templates/argocd_app.libsonnet";
app + {
chart:: "cert-manager",
repo:: "https://charts.jetstack.io",
- version:: "1.13.*",
+ version:: "1.14.*",
values:: |||
installCRDs: true
|||
From 4d497570fdd782678f7214727186921e79ecc66c Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 8 Feb 2024 02:01:10 +0000
Subject: [PATCH 066/114] chore: update helm release argo-cd to v5.55.0
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index bc8d6ce..ef8b6c1 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 5.54.0
+ version: 5.55.0
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 34cf0b5e20114c1f145543fdbeb1d3d3feaab6fb Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 15 Feb 2024 02:00:43 +0000
Subject: [PATCH 067/114] chore: update helm release argo-cd to v6
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index ef8b6c1..4295f2c 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 5.55.0
+ version: 6.0.14
targetNamespace: argocd
valuesContent: |-
applicationSet:
From e19977bf8afbb393547f88b0d55a4a9263d28bc8 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 7 Feb 2024 02:00:55 +0000
Subject: [PATCH 068/114] chore: update dependency k3s-io/k3s to v1.29.1+k3s2
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index a891697..7032a36 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.29.0+k3s1
+ INSTALL_K3S_CHANNEL: v1.29.1+k3s2
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From cc7a50046a8aa7e3bcc5631111a9db2cb5a7985c Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sat, 24 Feb 2024 02:00:48 +0000
Subject: [PATCH 069/114] chore: update helm release argo-cd to v6.3.1
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 4295f2c..441a6f4 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.0.14
+ version: 6.3.1
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 0e92a240b454c9e015d5106187419700c140d251 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Mon, 26 Feb 2024 02:00:47 +0000
Subject: [PATCH 070/114] chore: update helm release argocd-apps to v1.6.2
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 441a6f4..31b40df 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -32,7 +32,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argocd-apps
- version: 1.6.1
+ version: 1.6.2
targetNamespace: argocd
valuesContent: |-
projects:
From 8b1b5f5ee1ee0feafe4ddbffcc93ace71c3fb506 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Mon, 26 Feb 2024 02:00:50 +0000
Subject: [PATCH 071/114] chore: update helm release argo-cd to v6.4.0
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 31b40df..e41376c 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.3.1
+ version: 6.4.0
targetNamespace: argocd
valuesContent: |-
applicationSet:
From bcccb659466e0a77fea053b0092f43349f9d236c Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Tue, 12 Mar 2024 02:01:03 +0000
Subject: [PATCH 072/114] chore: update helm release argo-cd to v6.7.1
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index e41376c..487a212 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.4.0
+ version: 6.7.1
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 4c1aaf4becb7b2a85e7025c4933cec7b0d97c54f Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 29 Feb 2024 02:00:53 +0000
Subject: [PATCH 073/114] chore: update helm release ingress-nginx to 4.10.*
---
manifests/ingress-nginx.jsonnet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manifests/ingress-nginx.jsonnet b/manifests/ingress-nginx.jsonnet
index 0659461..8913652 100644
--- a/manifests/ingress-nginx.jsonnet
+++ b/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.9.*",
+ version:: "4.10.*",
values:: |||
defaultBackend:
enabled: true
From b51baf055e69f42fde6fc01bd8d63ba1be19867d Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Tue, 5 Mar 2024 02:01:19 +0000
Subject: [PATCH 074/114] chore: update dependency k3s-io/k3s to v1.29.2+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index 7032a36..329e796 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.29.1+k3s2
+ INSTALL_K3S_CHANNEL: v1.29.2+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From db14d28bf7049ecf7ba6ca7ad97d51e75f152e7a Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Wed, 13 Mar 2024 09:28:16 +0100
Subject: [PATCH 075/114] feat: add task to create a monthly cronjob for
restarting k3s
---
pb_install.yml | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/pb_install.yml b/pb_install.yml
index 329e796..2afe7f2 100644
--- a/pb_install.yml
+++ b/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
@@ -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
From faa055e5f344f571012392ecbccdb695c62f5ab4 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 28 Mar 2024 02:00:42 +0000
Subject: [PATCH 076/114] chore: update dependency k3s-io/k3s to v1.29.3+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index 2afe7f2..ef0804d 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.29.2+k3s1
+ INSTALL_K3S_CHANNEL: v1.29.3+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From 71d8d429049d1b56f17b8a04f462f8c03bc7181f Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 5 Apr 2024 02:00:40 +0000
Subject: [PATCH 077/114] chore: update helm release argo-cd to v6.7.9
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 487a212..852f026 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.7.1
+ version: 6.7.9
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 3cc0d6665e765c35a3f0fd10333f4ee5e82ad269 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sun, 24 Mar 2024 02:00:52 +0000
Subject: [PATCH 078/114] chore: update helm release argocd-apps to v2
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 852f026..155740e 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -32,7 +32,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argocd-apps
- version: 1.6.2
+ version: 2.0.0
targetNamespace: argocd
valuesContent: |-
projects:
From 9b8adc39586dd0a93047eb046814810c8d1208dc Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Fri, 5 Apr 2024 09:33:52 +0200
Subject: [PATCH 079/114] fix(init): update argocd app definition format
update project an application definition based an this (mostly useless)
changelog entry:
> make the chart use maps instead of lists
Usefull hints on the new structure can be found in then git diff:
https://github.com/argoproj/argo-helm/compare/argo-events-2.4.4...argocd-apps-2.0.0
or in the new valuesContent:
https://artifacthub.io/packages/helm/argo/argocd-apps?modal=values
---
argocd-init.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 155740e..f4385b0 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -36,7 +36,7 @@ spec:
targetNamespace: argocd
valuesContent: |-
projects:
- - name: baseline
+ baseline:
namespace: argocd
finalizers:
- resources-finalizer.argocd.argoproj.io
@@ -49,8 +49,7 @@ spec:
- group: '*'
kind: '*'
applications:
- - name: baseline
- namespace: argocd
+ baseline:
project: baseline
finalizers:
- resources-finalizer.argocd.argoproj.io
From 2d9de25e2e8ecd84046a4373f72b3c92747f77c2 Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Fri, 5 Apr 2024 10:14:32 +0200
Subject: [PATCH 080/114] fix: downgrade k3s to v1.29.2+k3s1
v1.29.3+k3s1 breaks patching the ingress controller
This reverts commit 638f1a7a46d63bff1bc891eb126b0f96876d995d.
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index ef0804d..2afe7f2 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.29.3+k3s1
+ INSTALL_K3S_CHANNEL: v1.29.2+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From 47304c84db4f17b225dc8cb1195721cdf8cd6e9d Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sat, 6 Apr 2024 02:00:38 +0000
Subject: [PATCH 081/114] chore: update helm release argo-cd to v6.7.10
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index f4385b0..2051ed2 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.7.9
+ version: 6.7.10
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 781a77555afa373af899350949a582b59ecfcbf1 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 11 Apr 2024 02:01:14 +0000
Subject: [PATCH 082/114] chore: update helm release argo-cd to v6.7.11
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 2051ed2..a1ee3ab 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.7.10
+ version: 6.7.11
targetNamespace: argocd
valuesContent: |-
applicationSet:
From 5fcd757adb42e0d20f1adb131709145a862bfb3b Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Fri, 19 Apr 2024 09:07:09 +0200
Subject: [PATCH 083/114] feat(argocd): force-set server replicas
---
argocd-init.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/argocd-init.yml b/argocd-init.yml
index a1ee3ab..51906c6 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -16,6 +16,8 @@ spec:
version: 6.7.11
targetNamespace: argocd
valuesContent: |-
+ server:
+ replicas: 1
applicationSet:
enabled: false
notifications:
From 59ed1f53e5282ced6511aba72d19a5e99518e662 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Mon, 22 Apr 2024 02:00:36 +0000
Subject: [PATCH 084/114] chore: update helm release argo-cd to v6.7.14
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 51906c6..646f7b6 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
repo: https://argoproj.github.io/argo-helm
chart: argo-cd
- version: 6.7.11
+ version: 6.7.14
targetNamespace: argocd
valuesContent: |-
server:
From e8df949f2dc7df85eecfde89863aed1ed92e5961 Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Thu, 25 Apr 2024 12:23:05 +0200
Subject: [PATCH 085/114] fix: consistent jsonnet format for renovate
---
.renovaterc.json | 10 +++++-----
argocd-init.yml | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.renovaterc.json b/.renovaterc.json
index 8ee6a2b..bce5feb 100644
--- a/.renovaterc.json
+++ b/.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"
diff --git a/argocd-init.yml b/argocd-init.yml
index 646f7b6..2b9a451 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -11,8 +11,8 @@ metadata:
namespace: kube-system
spec:
# do not change order! (needed for renovate)
- repo: https://argoproj.github.io/argo-helm
chart: argo-cd
+ repo: https://argoproj.github.io/argo-helm
version: 6.7.14
targetNamespace: argocd
valuesContent: |-
@@ -32,8 +32,8 @@ metadata:
namespace: kube-system
spec:
# do not change order! (needed for renovate)
- repo: https://argoproj.github.io/argo-helm
chart: argocd-apps
+ repo: https://argoproj.github.io/argo-helm
version: 2.0.0
targetNamespace: argocd
valuesContent: |-
From 07507b276c60fe23de0dd49e3d6ab938f47c5e8c Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 25 Apr 2024 10:26:57 +0000
Subject: [PATCH 086/114] chore: update helm release argo-cd to v6.7.15
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 2b9a451..8205272 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 6.7.14
+ version: 6.7.15
targetNamespace: argocd
valuesContent: |-
server:
From fe9166fbea1d5afaea60e3cb14fc49dd4fe3bd44 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sat, 27 Apr 2024 02:00:53 +0000
Subject: [PATCH 087/114] chore: update dependency k3s-io/k3s to v1.29.4+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index 2afe7f2..ebe4653 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.29.2+k3s1
+ INSTALL_K3S_CHANNEL: v1.29.4+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From 06c0b90ee033636696d30978a6dbbb60169e0c1e Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 1 May 2024 02:00:55 +0000
Subject: [PATCH 088/114] chore: update helm release argo-cd to v6.7.18
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 8205272..bb52603 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 6.7.15
+ version: 6.7.18
targetNamespace: argocd
valuesContent: |-
server:
From 11e13ed5d3b2c672663952803ae4efb815272b0b Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 9 May 2024 02:00:43 +0000
Subject: [PATCH 089/114] chore: update helm release argo-cd to v6.8.0
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index bb52603..0fb2ab2 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 6.7.18
+ version: 6.8.0
targetNamespace: argocd
valuesContent: |-
server:
From d9f4f6aa09a3ea70dac2fcf6be4758d8dbbf0575 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 15 May 2024 02:00:43 +0000
Subject: [PATCH 090/114] chore: update helm release argo-cd to v6.9.2
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 0fb2ab2..1092e9a 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 6.8.0
+ version: 6.9.2
targetNamespace: argocd
valuesContent: |-
server:
From 7a4402a775c873b673d128053b6dbfbb50d2fa16 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sat, 11 May 2024 02:00:41 +0000
Subject: [PATCH 091/114] chore: update dependency k3s-io/k3s to v1.30.0+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index ebe4653..35a5b89 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.29.4+k3s1
+ INSTALL_K3S_CHANNEL: v1.30.0+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From 63bdf27ef7c53dce4a8dd967f0e975cad34200d5 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 24 May 2024 02:00:39 +0000
Subject: [PATCH 092/114] chore: update helm release argo-cd to v6.11.1
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 1092e9a..88bfa39 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 6.9.2
+ version: 6.11.1
targetNamespace: argocd
valuesContent: |-
server:
From a88c2c8c03863c3907312eb7cc18ae4614ccd42e Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 29 May 2024 02:00:50 +0000
Subject: [PATCH 093/114] chore: update dependency k3s-io/k3s to v1.30.1+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index 35a5b89..6fc7a0d 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.30.0+k3s1
+ INSTALL_K3S_CHANNEL: v1.30.1+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From 40202745db97d4b1df7239e8e81405cf14bf3959 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 5 Jun 2024 06:18:59 +0000
Subject: [PATCH 094/114] chore: update helm release argo-cd to v7
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 88bfa39..b9b05e7 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 6.11.1
+ version: 7.1.1
targetNamespace: argocd
valuesContent: |-
server:
From a52797a5f201c5b44d9155e941a112aff02cb0d1 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 6 Jun 2024 02:00:57 +0000
Subject: [PATCH 095/114] chore: update helm release cert-manager to 1.15.*
---
manifests/cert-manager/cert-manager.jsonnet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manifests/cert-manager/cert-manager.jsonnet b/manifests/cert-manager/cert-manager.jsonnet
index 925f64a..40bffe9 100644
--- a/manifests/cert-manager/cert-manager.jsonnet
+++ b/manifests/cert-manager/cert-manager.jsonnet
@@ -4,7 +4,7 @@ local app = import "../_templates/argocd_app.libsonnet";
app + {
chart:: "cert-manager",
repo:: "https://charts.jetstack.io",
- version:: "1.14.*",
+ version:: "1.15.*",
values:: |||
installCRDs: true
|||
From 2dc99cc971817717987c230bfbc9b936cf2b67ff Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Thu, 6 Jun 2024 07:55:09 +0200
Subject: [PATCH 096/114] break(cert-manager): adjust chart values for CRDs
---
manifests/cert-manager/cert-manager.jsonnet | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/manifests/cert-manager/cert-manager.jsonnet b/manifests/cert-manager/cert-manager.jsonnet
index 40bffe9..6ea4824 100644
--- a/manifests/cert-manager/cert-manager.jsonnet
+++ b/manifests/cert-manager/cert-manager.jsonnet
@@ -6,7 +6,9 @@ app + {
repo:: "https://charts.jetstack.io",
version:: "1.15.*",
values:: |||
- installCRDs: true
+ crds:
+ enabled: true
+ keep: false
|||
},
]
From bf4519bd77de59f07c82a75be9c6d40105abab9c Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 7 Jun 2024 02:00:57 +0000
Subject: [PATCH 097/114] chore: update helm release argo-cd to v7.1.2
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index b9b05e7..2dd3da2 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.1.1
+ version: 7.1.2
targetNamespace: argocd
valuesContent: |-
server:
From c23cf23b50f5ecd13966e4c36496122f43a959a9 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Tue, 18 Jun 2024 02:01:03 +0000
Subject: [PATCH 098/114] chore: update helm release argo-cd to v7.1.4
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 2dd3da2..42bb4e2 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.1.2
+ version: 7.1.4
targetNamespace: argocd
valuesContent: |-
server:
From c44c8dff5702118357380c9abc8ad6e061e52ad7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 20 Jun 2024 02:00:43 +0000
Subject: [PATCH 099/114] chore: update helm release argo-cd to v7.1.5
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 42bb4e2..8caa428 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.1.4
+ version: 7.1.5
targetNamespace: argocd
valuesContent: |-
server:
From 571b2e150eddd6be13ecc7da114d87ebc7b9bc9c Mon Sep 17 00:00:00 2001
From: Sebastian Mark <smark@posteo.net>
Date: Thu, 20 Jun 2024 14:13:31 +0200
Subject: [PATCH 100/114] feat(zabbix-proxy): update helm chart repository to
v7
---
manifests/monitoring/zabbix-proxy.jsonnet | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/manifests/monitoring/zabbix-proxy.jsonnet b/manifests/monitoring/zabbix-proxy.jsonnet
index 92016b4..124c7aa 100644
--- a/manifests/monitoring/zabbix-proxy.jsonnet
+++ b/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",
- version:: "1.3.*",
+ repo:: "https://cdn.zabbix.com/zabbix/integrations/kubernetes-helm/7.0",
+ version:: "0.0.*",
values:: |||
zabbixAgent:
enabled: false
From 50fb295b15959197b1331582372cd6e4ab5e98ae Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 21 Jun 2024 02:00:44 +0000
Subject: [PATCH 101/114] chore: update helm release argo-cd to v7.2.0
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 8caa428..5d5a0aa 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.1.5
+ version: 7.2.0
targetNamespace: argocd
valuesContent: |-
server:
From 9075198e78178852af874bbfd7f31d7435558aa1 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 26 Jun 2024 02:00:49 +0000
Subject: [PATCH 102/114] chore: update helm release argo-cd to v7.3.1
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 5d5a0aa..692813d 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.2.0
+ version: 7.3.1
targetNamespace: argocd
valuesContent: |-
server:
From 5465481d634a4c4d6af224de3c0c69364b32585c Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 28 Jun 2024 02:00:47 +0000
Subject: [PATCH 103/114] chore: update dependency k3s-io/k3s to v1.30.2+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index 6fc7a0d..09c2e5b 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.30.1+k3s1
+ INSTALL_K3S_CHANNEL: v1.30.2+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From 19f1426176748a56936b9c4bc42eaef8b6c049b7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 3 Jul 2024 02:00:50 +0000
Subject: [PATCH 104/114] chore: update helm release argo-cd to v7.3.4
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 692813d..2a9e50c 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.1
+ version: 7.3.4
targetNamespace: argocd
valuesContent: |-
server:
From f5238a882f192dd232a1ae3b26ff6ad0c32023ad Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Tue, 9 Jul 2024 02:00:46 +0000
Subject: [PATCH 105/114] chore: update helm release ingress-nginx to 4.11.*
---
manifests/ingress-nginx.jsonnet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manifests/ingress-nginx.jsonnet b/manifests/ingress-nginx.jsonnet
index 8913652..8c6b088 100644
--- a/manifests/ingress-nginx.jsonnet
+++ b/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.10.*",
+ version:: "4.11.*",
values:: |||
defaultBackend:
enabled: true
From 0f6706e975f3adbc587491181bd1f473ffb0348d Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 12 Jul 2024 02:00:44 +0000
Subject: [PATCH 106/114] chore: update helm release argo-cd to v7.3.6
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 2a9e50c..624df84 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.4
+ version: 7.3.6
targetNamespace: argocd
valuesContent: |-
server:
From 16857fc4985182eacb48fe84c92c68426ea2a54a Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 18 Jul 2024 02:04:34 +0000
Subject: [PATCH 107/114] chore: update helm release argo-cd to v7.3.8
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 624df84..7415f99 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.6
+ version: 7.3.8
targetNamespace: argocd
valuesContent: |-
server:
From 2f743da4a411c8b88588cf34bdae49a3e4e5eded Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Sun, 21 Jul 2024 02:01:02 +0000
Subject: [PATCH 108/114] chore: update helm release argo-cd to v7.3.9
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 7415f99..c9260da 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.8
+ version: 7.3.9
targetNamespace: argocd
valuesContent: |-
server:
From 62191620e93660b276bac59f21369b89f91dc7af Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Tue, 23 Jul 2024 02:00:57 +0000
Subject: [PATCH 109/114] chore: update helm release argo-cd to v7.3.10
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index c9260da..bd3e9a9 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.9
+ version: 7.3.10
targetNamespace: argocd
valuesContent: |-
server:
From 24a72326f44149d78c7f57329c98c83633d75889 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 25 Jul 2024 02:00:46 +0000
Subject: [PATCH 110/114] chore: update helm release argo-cd to v7.3.11
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index bd3e9a9..2dd428b 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.10
+ version: 7.3.11
targetNamespace: argocd
valuesContent: |-
server:
From 9a67d25386da6b303988473cd019b290cb1ca406 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Fri, 2 Aug 2024 02:00:18 +0000
Subject: [PATCH 111/114] chore: update dependency k3s-io/k3s to v1.30.3+k3s1
---
pb_install.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pb_install.yml b/pb_install.yml
index 09c2e5b..758aac1 100644
--- a/pb_install.yml
+++ b/pb_install.yml
@@ -12,7 +12,7 @@
- name: Install k3s server
ansible.builtin.command: "k3s_install.sh"
environment:
- INSTALL_K3S_CHANNEL: v1.30.2+k3s1
+ INSTALL_K3S_CHANNEL: v1.30.3+k3s1
INSTALL_K3S_EXEC: "--disable traefik"
changed_when: false
- name: Start and enable k3s server
From 40384212ecb866d0a2822852c5243b07e6013041 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Wed, 7 Aug 2024 02:00:22 +0000
Subject: [PATCH 112/114] chore: update helm release argo-cd to v7.4.1
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 2dd428b..f0f5563 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.3.11
+ version: 7.4.1
targetNamespace: argocd
valuesContent: |-
server:
From c82b80a998e7e0d3348414d273526d6fa4ed65bd Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Thu, 8 Aug 2024 21:22:17 +0000
Subject: [PATCH 113/114] chore: update helm release argo-cd to v7.4.2
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index f0f5563..7038d25 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.4.1
+ version: 7.4.2
targetNamespace: argocd
valuesContent: |-
server:
From 0604e5b5750fe26b9d596e6f8b28d2af5dac16fe Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovate@smsvc.net>
Date: Mon, 12 Aug 2024 16:00:18 +0000
Subject: [PATCH 114/114] chore: update helm release argo-cd to v7.4.3
---
argocd-init.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/argocd-init.yml b/argocd-init.yml
index 7038d25..1a39bfe 100644
--- a/argocd-init.yml
+++ b/argocd-init.yml
@@ -13,7 +13,7 @@ spec:
# do not change order! (needed for renovate)
chart: argo-cd
repo: https://argoproj.github.io/argo-helm
- version: 7.4.2
+ version: 7.4.3
targetNamespace: argocd
valuesContent: |-
server: