Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

Prometheus: modify config to support k8s 1.6 by default #1080

Merged
merged 3 commits into from
Jul 6, 2017

Conversation

kujenga
Copy link
Contributor

@kujenga kujenga commented May 15, 2017

This commit adds support for Kubernetes 1.6 RBAC within the prometheus configuration for scraping node metrics. This should fix #955

I've tested this on Google Container Engine with a clusters of version 1.5.7 and 1.6.2, both worked as expected.

cc @mgoodness

This commit adds support for Kubernetes 1.6 RBAC restrictions within
the prometheus configuration for scraping node metrics.

Fixes helm#955

Initial discussion of the issue:
prometheus/prometheus#2606
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://github.com/kubernetes/kubernetes/wiki/CLA-FAQ to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 15, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @kujenga. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@kujenga
Copy link
Contributor Author

kujenga commented May 15, 2017

Just signed the CLA!

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels May 15, 2017
@mgoodness
Copy link
Contributor

@k8s-bot ok to test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 30, 2017
@mgoodness
Copy link
Contributor

Matches upstream config & verified working on minikube.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 30, 2017
@mgoodness mgoodness added changes needed and removed lgtm Indicates that a PR is ready to be merged. labels May 30, 2017
@mgoodness
Copy link
Contributor

Oops! Let's bump the chart version to v3.1.0. Also, please allow maintainers to push to your branches in the future.

@kujenga
Copy link
Contributor Author

kujenga commented May 31, 2017

@mgoodness done! will do in the future, I've enabled it here as well 👍

@cortesi
Copy link

cortesi commented Jun 12, 2017

Any news on getting this merged? It's pretty critical.

@viglesiasce
Copy link
Contributor

@k8s-bot ok to test

@viglesiasce viglesiasce merged commit 1db4e9f into helm:master Jul 6, 2017
@kujenga kujenga deleted the prometheus-k8s-1-6-support branch July 6, 2017 00:54
lachie83 added a commit to lachie83/charts that referenced this pull request Jul 10, 2017
* upstream/master: (67 commits)
  Fix json whitespace (helm#1458)
  Use consistent whitespace in template placeholders (helm#1437)
  [stable/selenium] Make hub readiness probe timeout configurable (helm#1391)
  [stable/kube2iam]: add rbac support (helm#1286)
  [stable/traefik] Allow enabling traefik access logs (helm#1302)
  Add Stash chart (helm#1420)
  Add Gearman G2 chart (helm#1421)
  add option to include tolerations to daemonset (helm#1364)
  Moved Artifactory to stable and updated version to 5.3.2 (helm#1314)
  Concourse postgres conditional dependency (helm#1390)
  Typo in helm install command for dask-distributed (helm#1413)
  [stable/fluent-bit] Fluent Bit v0.11.12 (helm#1417)
  fixed cassandra chart's persistence bug (helm#1245)
  Prometheus: modify config to support k8s 1.6 by default (helm#1080)
  Add rocket.chat (helm#752)
  Fix influxdb deployment (helm#1424)
  feat(stable/etcd-operator): add support for supplying additional command args (helm#1418)
  add configurable service annotations helm#1234 (helm#1244)
  [stable/prometheus] extra environment variable for alert manager (helm#1237)
  [stable/heapster] Default service name to Heapster (helm#1266)
  ...
yanns pushed a commit to yanns/charts that referenced this pull request Jul 28, 2017
* charts/stable/prometheus: modify config to support 1.6 by default

This commit adds support for Kubernetes 1.6 RBAC restrictions within
the prometheus configuration for scraping node metrics.

Fixes helm#955

Initial discussion of the issue:
prometheus/prometheus#2606

* stable/prometheus: bump chart minor version
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
changes needed cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Prometheus might not work correctly with 1.6 RBAC
5 participants