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.

Sign up for GitHub

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

Jump to bottom

feat: replacing grafana rom stable to its own repo + additional chart maintainer #53

Merged
merged 9 commits into from
Sep 8, 2020
Merged

feat: replacing grafana rom stable to its own repo + additional chart maintainer #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
14de343
feat: replacing grafana own repo
gkarthiks Sep 6, 2020
90d94e1
fix: trailing white spaces
gkarthiks Sep 6, 2020
ccceece
fix: reverting the grafana values
gkarthiks Sep 6, 2020
8ef1002
adding grafana repo for actions
gkarthiks Sep 6, 2020
d893396
add: adding grafana repo in linter
gkarthiks Sep 6, 2020
12306ef
doc(lint): making doc stmt as single stmt
gkarthiks Sep 6, 2020
a2869bd
revert: reverting the old README statement
gkarthiks Sep 6, 2020
c51bdad
feat: adding gkarthiks to codeowners against kube-prometheus-stack
gkarthiks Sep 6, 2020
ec2820d
sync with upstream
gkarthiks Sep 8, 2020
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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Unless a later match takes precedence, they will be requested for review when someone opens a pull request.
* @prometheus-community/helm-charts-admins

/charts/kube-prometheus-stack/ @vsliouniaev @bismarck @gianrubio
/charts/kube-prometheus-stack/ @vsliouniaev @bismarck @gianrubio @gkarthiks
/charts/prometheus/ @gianrubio @zanhsieh @Xtigyro @monotek
/charts/prometheus-adapter/ @mattiasgees @steven-sheehy @hectorj2f
/charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Add dependency chart repos
run: |
helm repo add stable https://kubernetes-charts.storage.googleapis.com/
helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
helm repo add grafana https://grafana.github.io/helm-charts

- name: Run chart-releaser
uses: helm/chart-releaser-action@v1.0.0
Expand Down
4 changes: 3 additions & 1 deletion charts/kube-prometheus-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ maintainers:
- name: bismarck
- name: gianrubio
email: gianrubio@gmail.com
- name: gkarthiks
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO it would be great to have extra help, but up to the existing maintainers of this chart.

email: github.gkarthiks@gmail.com
name: kube-prometheus-stack
sources:
- https://github.com/prometheus-operator/kube-prometheus
- https://github.com/prometheus-operator/prometheus-operator
version: 9.3.2
version: 9.3.3
appVersion: 0.38.1
tillerVersion: ">=2.12.0"
home: https://github.com/prometheus-operator/kube-prometheus
Expand Down
4 changes: 2 additions & 2 deletions charts/kube-prometheus-stack/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ By default this chart installs additional, dependent charts:

- [stable/kube-state-metrics](https://github.com/helm/charts/tree/master/stable/kube-state-metrics)
- [stable/prometheus-node-exporter](https://github.com/prometheus-community/helm-charts/tree/main/prometheus-node-exporter)
- [stable/grafana](https://github.com/helm/charts/tree/master/stable/grafana)
- [grafana/grafana](https://github.com/grafana/helm-charts/tree/main/charts/grafana)

To disable dependencies during installation, see [multiple releases](#multiple-releases) below.

Expand Down Expand Up @@ -192,7 +192,7 @@ For more in-depth documentation of configuration options meanings, please see

- [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator)
- [Prometheus](https://prometheus.io/docs/introduction/overview/)
- [Grafana](https://github.com/helm/charts/tree/master/stable/grafana#grafana-helm-chart)
- [Grafana](https://github.com/grafana/helm-charts/tree/main/charts/grafana#grafana-helm-chart)

## prometheus.io/scrape

Expand Down
4 changes: 2 additions & 2 deletions charts/kube-prometheus-stack/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ dependencies:
condition: nodeExporter.enabled

- name: grafana
version: "5.3.*"
repository: https://kubernetes-charts.storage.googleapis.com/
version: "5.6.*"
repository: https://grafana.github.io/helm-charts
condition: grafana.enabled
2 changes: 1 addition & 1 deletion charts/kube-prometheus-stack/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ alertmanager:
portName: "web"


## Using default values from https://github.com/helm/charts/blob/master/stable/grafana/values.yaml
## Using default values from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml
##
grafana:
enabled: true
Expand Down
1 change: 1 addition & 0 deletions ct.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ chart-dirs:
chart-repos:
- stable=https://kubernetes-charts.storage.googleapis.com/
- prometheus-community=https://prometheus-community.github.io/helm-charts
- grafana=https://grafana.github.io/helm-charts
helm-extra-args: --timeout 600s
excluded-charts:
# If not running on GCE, will error: "Failed to get GCE config"
Expand Down