Merge pull request #5 from caas-team/chore/bump-prom-remove-k3sserver

Chore/bump prom remove k3sserver

Chart.lock

@@ -1,6 +1,21 @@
 dependencies:
 - name: kube-prometheus-stack
   repository: https://prometheus-community.github.io/helm-charts
-  version: 51.0.3
-digest: sha256:09cdfe713d61b9671bb887d3ea87b8cf81944f5c71651b50962c08076f065655
-generated: "2023-10-25T04:52:25.0010074+02:00"
+  version: 58.4.0
+- name: rkeEtcd
+  repository: file://./charts/rkeEtcd
+  version: 0.1.6
+- name: rkeControllerManager
+  repository: file://./charts/rkeControllerManager
+  version: 0.1.6
+- name: rkeScheduler
+  repository: file://./charts/rkeScheduler
+  version: 0.1.6
+- name: rkeIngressNginx
+  repository: file://./charts/rkeIngressNginx
+  version: 0.1.6
+- name: rkeProxy
+  repository: file://./charts/rkeProxy
+  version: 0.1.6
+digest: sha256:5d76a0559f547b504fc906e3154711815f44b4a8c520ea2eca6248a60496e5aa
+generated: "2024-05-08T11:08:27.921401765+02:00"

Chart.yaml

@@ -5,33 +5,35 @@ annotations:
   catalog.cattle.io/requests-memory: 1000Mi
 name: caas-cluster-monitoring
 description: A Helm chart for Rancher Cluster Monitoring V3
-version: "0.0.8"
-appVersion: "51.0.3"
+version: "0.0.9"
+appVersion: "58.4.0"
 icon: https://raw.githubusercontent.com/caas-team/caas-project-monitoring/main/logo.png
 keywords:
   - monitoring
 dependencies:
   - name: kube-prometheus-stack
-    version: "51.0.3"
+    version: "58.4.0"
     repository: "https://prometheus-community.github.io/helm-charts"
-  - condition: k3sServer.enabled
-    name: k3sServer
-    repository: file://./charts/k3sServer
   - condition: rkeEtcd.enabled
     name: rkeEtcd
+    version: 0.1.6
     repository: file://./charts/rkeEtcd
   - condition: rkeControllerManager.enabled
     name: rkeControllerManager
     repository: file://./charts/rkeControllerManager
+    version: 0.1.6
   - condition: rkeScheduler.enabled
     name: rkeScheduler
     repository: file://./charts/rkeScheduler
+    version: 0.1.6
   - condition: rkeIngressNginx.enabled
     name: rkeIngressNginx
     repository: file://./charts/rkeIngressNginx
+    version: 0.1.6
   - condition: rkeProxy.enabled
     name: rkeProxy
     repository: file://./charts/rkeProxy
+    version: 0.1.6
 sources:
   - https://github.com/caas-team/caas-cluster-monitoring
   - https://github.com/prometheus-community/helm-charts

README.md

@@ -460,42 +460,6 @@ available config parameters:
 | `kube-prometheus-stack.prometheusOperator.prometheusConfigReloader.image.repository` | string | `"kubeprometheusstack/prometheus-config-reloader"` |  |
 | `kube-prometheus-stack.thanosRuler.enabled` | bool | `false` |  |
 
-### k3sServer
-
-| Parameter | Type | Default | Description |
-|-----------|------|---------|-------------|
-| `k3sServer.clients.https.enabled` | bool | `true` |  |
-| `k3sServer.clients.https.insecureSkipVerify` | bool | `true` |  |
-| `k3sServer.clients.https.useServiceAccountCredentials` | bool | `true` |  |
-| `k3sServer.clients.port` | int | `10013` |  |
-| `k3sServer.clients.rbac.additionalRules[0].nonResourceURLs[0]` | string | `"/metrics/cadvisor"` |  |
-| `k3sServer.clients.rbac.additionalRules[0].verbs[0]` | string | `"get"` |  |
-| `k3sServer.clients.rbac.additionalRules[1].apiGroups[0]` | string | `""` |  |
-| `k3sServer.clients.rbac.additionalRules[1].resources[0]` | string | `"nodes/metrics"` |  |
-| `k3sServer.clients.rbac.additionalRules[1].verbs[0]` | string | `"get"` |  |
-| `k3sServer.clients.tolerations[0].effect` | string | `"NoExecute"` |  |
-| `k3sServer.clients.tolerations[0].operator` | string | `"Exists"` |  |
-| `k3sServer.clients.tolerations[1].effect` | string | `"NoSchedule"` |  |
-| `k3sServer.clients.tolerations[1].operator` | string | `"Exists"` |  |
-| `k3sServer.clients.useLocalhost` | bool | `true` |  |
-| `k3sServer.component` | string | `"k3s-server"` |  |
-| `k3sServer.enabled` | bool | `false` |  |
-| `k3sServer.metricsPort` | int | `10250` |  |
-| `k3sServer.serviceMonitor.endpoints[0].honorLabels` | bool | `true` |  |
-| `k3sServer.serviceMonitor.endpoints[0].port` | string | `"metrics"` |  |
-| `k3sServer.serviceMonitor.endpoints[0].relabelings[0].sourceLabels[0]` | string | `"__metrics_path__"` |  |
-| `k3sServer.serviceMonitor.endpoints[0].relabelings[0].targetLabel` | string | `"metrics_path"` |  |
-| `k3sServer.serviceMonitor.endpoints[1].honorLabels` | bool | `true` |  |
-| `k3sServer.serviceMonitor.endpoints[1].path` | string | `"/metrics/cadvisor"` |  |
-| `k3sServer.serviceMonitor.endpoints[1].port` | string | `"metrics"` |  |
-| `k3sServer.serviceMonitor.endpoints[1].relabelings[0].sourceLabels[0]` | string | `"__metrics_path__"` |  |
-| `k3sServer.serviceMonitor.endpoints[1].relabelings[0].targetLabel` | string | `"metrics_path"` |  |
-| `k3sServer.serviceMonitor.endpoints[2].honorLabels` | bool | `true` |  |
-| `k3sServer.serviceMonitor.endpoints[2].path` | string | `"/metrics/probes"` |  |
-| `k3sServer.serviceMonitor.endpoints[2].port` | string | `"metrics"` |  |
-| `k3sServer.serviceMonitor.endpoints[2].relabelings[0].sourceLabels[0]` | string | `"__metrics_path__"` |  |
-| `k3sServer.serviceMonitor.endpoints[2].relabelings[0].targetLabel` | string | `"metrics_path"` |  |
-
 ### rkeControllerManager
 
 | Parameter | Type | Default | Description |

README.md.gotmpl

@@ -72,16 +72,6 @@ available config parameters:
   {{- end }}
 {{- end }}
 
-### k3sServer
-
-| Parameter | Type | Default | Description |
-|-----------|------|---------|-------------|
-{{- range .Values }}
-  {{- if (contains "k3sServer" .Key) }}
-| `{{ .Key }}` | {{ .Type }} | {{ if .Default }}{{ .Default }}{{ else }}{{ .AutoDefault }}{{ end }} | {{ if .Description }}{{ .Description }}{{ else }}{{ .AutoDescription }}{{ end }} |
-  {{- end }}
-{{- end }}
-
 ### rkeControllerManager
 
 | Parameter | Type | Default | Description |