Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to kube stack 58.4.0 & prepare for deprecation of cattle.monitoring.io #42

Merged
merged 31 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
f6ee4dc
docs: simplified docs
puffitos Oct 1, 2024
d727ccf
feat: added Makefile
puffitos Oct 1, 2024
e5fbcfa
chore: bumped to kube-prometheus-stack 58.4.0
puffitos Oct 1, 2024
03f9cf5
chore: sensible values.yaml
puffitos Oct 1, 2024
9aae07a
docs: moved app-readme to own folder
puffitos Oct 1, 2024
796cb02
docs: automated README
puffitos Oct 1, 2024
89f151c
chore: removed unneeded helm values
puffitos Oct 1, 2024
afe8ae8
chore: removed some grafana values
puffitos Oct 2, 2024
c512f6e
chore: removed unneeded servicemonitor grafana values
puffitos Oct 2, 2024
0a96a9f
chore: removed uneeded ingress section
puffitos Oct 2, 2024
de972d0
chore: removed uneeded ingressPerReplica section
puffitos Oct 2, 2024
696d527
chore: explained serviceaccounts and added one to grafana
puffitos Oct 2, 2024
c289bb5
chore: removed unneeded service prometheus section
puffitos Oct 2, 2024
ae9c214
chore: removed unneeded servicePerReplica prometheus section
puffitos Oct 2, 2024
5889882
chore: run make chart
puffitos Oct 2, 2024
bc9fb90
chore: removed prometheus image
puffitos Oct 2, 2024
f39f02f
chore: removed some uneeded prometheusSpec fields
puffitos Oct 2, 2024
18a058a
chore: removed more uneeded prometheusSpec fields
puffitos Oct 2, 2024
85c281f
chore: removed even more uneeded prometheusSpec fields
puffitos Oct 2, 2024
77f0923
chore: added standard selector
puffitos Oct 2, 2024
951fdab
chore: removed some more fields which are unneeded
puffitos Oct 2, 2024
3a0696f
chore: removed prometheusspec fields which are not needed
puffitos Oct 2, 2024
78d11f8
chore: removed volume related fields
puffitos Oct 2, 2024
80a3d72
chore: added default selectors
puffitos Oct 2, 2024
77026e9
chore: added default selectors and documented usage
puffitos Oct 2, 2024
afce1ce
fix: proper build of dependend charts
puffitos Oct 2, 2024
ace25ad
feat: added serviceaccount RBAC to allow prometheus-auth to work
puffitos Oct 2, 2024
6b2cddc
docs: development guide
puffitos Oct 2, 2024
78b5915
chore: RBAC reconciliation with prometheus auth
puffitos Oct 16, 2024
2ee9ad7
chore: 1.3.0 rc2
puffitos Oct 16, 2024
ee3d569
fix: grafana OOM sidecar
puffitos Oct 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
charts/kube-prometheus-stack
demomon.yaml
caas-project-monitoring*.tgz
current.yaml
new.yaml
17 changes: 14 additions & 3 deletions .helmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
.git
.pre-commit-config.yaml
rke*.tgz
.github/*
README.md*
logo.png
LICENSE
charts/kube-prometheus-stack
Makefile
LICENCE
hack/
docs/

# needed else the whole git directory is packed in the chart
.git

# ignore self if present in directory
caas-project-monitoring*.tgz
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
repos:
- repo: https://github.com/norwoodj/helm-docs
rev: "v1.11.3"
hooks:
- id: helm-docs
args:
- --chart-search-root=./
6 changes: 3 additions & 3 deletions Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: kube-prometheus-stack
repository: https://prometheus-community.github.io/helm-charts
version: 51.0.3
digest: sha256:09cdfe713d61b9671bb887d3ea87b8cf81944f5c71651b50962c08076f065655
generated: "2024-01-16T10:36:54.774105134+01:00"
version: 58.4.0
digest: sha256:c7af37eec63be66c853f6ee93c80477f23920e46968035ed341845d37d2917c0
generated: "2024-10-01T11:48:30.183932335+02:00"
34 changes: 15 additions & 19 deletions Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
apiVersion: v2
annotations:
catalog.cattle.io/display-name: CaaS Project Monitoring V3
catalog.cattle.io/requests-cpu: 1000m
catalog.cattle.io/requests-memory: 1000Mi
name: caas-project-monitoring
description: A Helm chart for Rancher Project Monitoring V3
version: "1.2.10"
appVersion: "51.0.3"
description: A Helm chart for Rancher Project Monitoring V3.
version: "1.3.0-rc2"
appVersion: "58.4.0"
icon: https://raw.githubusercontent.com/caas-team/caas-project-monitoring/main/logo.png
keywords:
- monitoring
- monitoring
dependencies:
- name: kube-prometheus-stack
version: "51.0.3"
repository: "https://prometheus-community.github.io/helm-charts"
- name: kube-prometheus-stack
version: "58.4.0"
repository: "https://prometheus-community.github.io/helm-charts"
sources:
- https://github.com/caas-team/caas-project-monitoring
- https://github.com/prometheus-community/helm-charts
- https://github.com/caas-team/caas-project-monitoring
- https://github.com/prometheus-community/helm-charts
maintainers:
- name: eumel8
email: [email protected]
url: https://www.telekom.com
- name: puffitos
email: [email protected]
url: https://www.telekom.com
- name: eumel8
email: [email protected]
url: https://www.telekom.com
- name: puffitos
email: [email protected]
url: https://www.telekom.com
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
chart:
./hack/chart.sh

.PHONY: chart
233 changes: 208 additions & 25 deletions README.md

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions README.md.gotmpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{{ template "chart.header" . }}

{{ template "chart.description" . }}
Please read the [Application Readme](./docs/app-readme.md) for more details.

{{ template "chart.homepageLine" . }}

{{ template "chart.maintainersSection" . }}

{{ template "chart.sourcesSection" . }}

{{ template "chart.requirementsSection" . }}

## Installation

This Helm Chart installs `kube-prometheus-spec` with some default values, configured for a hardened and safe deployment.
You can use this chart as part from rancher-monitoring from command line to install in project namespace:

```bash
helm dependency build
helm -n mynamespace upgrade -i project-monitoring -f values.yaml .
```

Or install the chart by using the packaged chart:

```bash
helm -n mynamespace upgrade -i project-monitoring -f values.yaml --repo oci://mtr.devops.telekom.de/caas/charts/caas-project-monitoring --version 1.3.0
```

{{ template "chart.valuesSection" . }}

{{ template "helm-docs.versionFooter" . }}

200 changes: 0 additions & 200 deletions app-readme.md

This file was deleted.

Binary file removed charts/kube-prometheus-stack-51.0.3.tgz
Binary file not shown.
Binary file added charts/kube-prometheus-stack-58.4.0.tgz
puffitos marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Loading
Loading