github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for custom service annotations for prometheus and alertmanager (#8966)

Browse Source 
* Allow for custom service annotations for prometheus and alertmanager

Signed-off-by: Rajat Vig <rvig@etsy.com>

* Add documentation for the values.yaml

Signed-off-by: Rajat Vig <rvig@etsy.com>

* Update the CI file

Signed-off-by: Rajat Vig <rvig@etsy.com>

* Bump the chart version

Signed-off-by: Rajat Vig <rajat.vig@gmail.com>
This commit is contained in:
Rajat Vig
2018-11-11 10:04:27 -08:00
committed by k8s-ci-robot
parent 758dbdc8ff
commit 75b020f7e8
7 changed files with 81 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/prometheus-operator/Chart.yaml
+1 -1
View File
@@ -9,7 +9,7 @@ name: prometheus-operator
sources:
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 0.1.16
version: 0.1.17
appVersion: "0.25.0"
home: https://github.com/coreos/prometheus-operator
keywords:
stable/prometheus-operator/README.md
+9
View File
@@ -74,6 +74,9 @@ The following tables lists the configurable parameters of the prometheus-operato
| `prometheusOperator.kubeletService.enabled` | If true, the operator will create and maintain a service for scraping kubelets | `true` |
| `prometheusOperator.kubeletService.namespace` | Namespace to deploy kubelet service | `true` |
| `prometheusOperator.serviceMonitor.selfMonitor` | Enable monitoring of prometheus operator | `true` |
| `prometheusOperator.service.type` | Prometheus operator service type | `ClusterIP` |
| `prometheusOperator.service.nodePort` | Port to expose prometheus operator service on each node | `38080` |
| `prometheusOperator.service.annotations` | Annotations to be added to the prometheus operator service | `{}` |
| `prometheusOperator.resources` | Resource limits for prometheus operator | `{}` |
| `prometheusOperator.nodeSelector` | Prometheus operator node selector https://kubernetes.io/docs/user-guide/node-selection/ | `{}` |
| `prometheusOperator.tolerations` | Tolerations for use with node taints https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | `[]` |
@@ -96,6 +99,9 @@ The following tables lists the configurable parameters of the prometheus-operato
| `prometheus.serviceMonitor.selfMonitor` | Create a `serviceMonitor` to automatically monitor the prometheus instance | `true` |
| `prometheus.serviceAccount.create` | Create a default serviceaccount for prometheus to use | `true` |
| `prometheus.serviceAccount.name` | Name for prometheus serviceaccount | `""` |
| `prometheus.service.type` | Prometheus service type | `ClusterIP` |
| `prometheus.service.nodePort` | Port to expose Prometheus service on each node | `39090` |
| `prometheus.service.annotations` | Annotations to be added to the prometheus service | `{}` |
| `prometheus.rbac.roleNamespaces` | Create role bindings in the specified namespaces, to allow Prometheus monitoring a role binding in the release namespace will always be created. | `["kube-system"]` |
| `prometheus.podDisruptionBudget.enabled` | If true, create a pod disruption budget for prometheus pods. The created resource cannot be modified once created - it must be deleted to perform a change | `true` |
| `prometheus.podDisruptionBudget.minAvailable` | Minimum number / percentage of pods that should remain scheduled | `1` |
@@ -148,6 +154,9 @@ The following tables lists the configurable parameters of the prometheus-operato
| `alertmanager.enabled` | Deploy alertmanager | `true` |
| `alertmanager.serviceAccount.create` | Create a `serviceAccount` for alertmanager | `true` |
| `alertmanager.serviceAccount.name` | Name for Alertmanager service account | `""` |
| alertmanager.service.type | Alertmanager service type | ClusterIP |
| alertmanager.service.nodePort | Port to expose alertmanager service on each node | 39093 |
| alertmanager.service.annotations | Annotations to be added to the alertmanager service | {} |
| `alertmanager.podDisruptionBudget.enabled` | If true, create a pod disruption budget for Alertmanager pods. The created resource cannot be modified once created - it must be deleted to perform a change | `true` |
| `alertmanager.podDisruptionBudget.minAvailable` | Minimum number / percentage of pods that should remain scheduled | `1` |
| `alertmanager.podDisruptionBudget.maxUnavailable` | Maximum number / percentage of pods that may be made unavailable | `""` |
stable/prometheus-operator/ci/test-values.yaml
+24
View File
@@ -449,6 +449,18 @@ prometheusOperator:
create: true
name: ""
## Configuration for Prometheus operator service
##
service:
## Port to expose on each node
## Only used if service.type is 'NodePort'
##
nodePort: 38080
## Service type
##
type: ClusterIP
## Deploy CRDs used by Prometheus Operator.
##
createCustomResource: true
@@ -549,6 +561,18 @@ prometheus:
create: true
name: ""
## Configuration for Prometheus service
##
service:
## Port to expose on each node
## Only used if service.type is 'NodePort'
##
nodePort: 39090
## Service type
##
type: ClusterIP
rbac:
## Create role bindings in the specified namespaces, to allow Prometheus monitoring
## a role binding in the release namespace will always be created.
stable/prometheus-operator/templates/alertmanager/service.yaml
+5 -1
View File
@@ -6,6 +6,10 @@ metadata:
labels:
app: {{ template "prometheus-operator.name" . }}-alertmanager
{{ include "prometheus-operator.labels" . | indent 4 }}
{{- if .Values.alertmanager.service.annotations }}
annotations:
{{ toYaml .Values.alertmanager.service.annotations | indent 4 }}
{{- end }}
spec:
ports:
- name: web
@@ -19,4 +23,4 @@ spec:
app: alertmanager
alertmanager: {{ template "prometheus-operator.fullname" . }}-alertmanager
type: "{{ .Values.alertmanager.service.type }}"
{{- end }}
{{- end }}
stable/prometheus-operator/templates/prometheus-operator/service.yaml
+9 -2
View File
@@ -6,14 +6,21 @@ metadata:
labels:
app: {{ template "prometheus-operator.name" . }}-operator
{{ include "prometheus-operator.labels" . | indent 4 }}
{{- if .Values.prometheusOperator.service.annotations }}
annotations:
{{ toYaml .Values.prometheusOperator.service.annotations | indent 4 }}
{{- end }}
spec:
clusterIP: None
ports:
- name: http
{{- if eq .Values.prometheusOperator.service.type "NodePort" }}
nodePort: {{ .Values.prometheusOperator.service.nodePort }}
{{- end }}
port: 8080
targetPort: http
selector:
app: {{ template "prometheus-operator.name" . }}-operator
release: {{ .Release.Name | quote }}
{{- end }}
type: "{{ .Values.prometheusOperator.service.type }}"
{{- end }}
stable/prometheus-operator/templates/prometheus/service.yaml
+9 -1
View File
@@ -6,12 +6,20 @@ metadata:
labels:
app: {{ template "prometheus-operator.name" . }}-prometheus
{{ include "prometheus-operator.labels" . | indent 4 }}
{{- if .Values.prometheus.service.annotations }}
annotations:
{{ toYaml .Values.prometheus.service.annotations | indent 4 }}
{{- end }}
spec:
ports:
- name: web
{{- if eq .Values.prometheus.service.type "NodePort" }}
nodePort: {{ .Values.prometheus.service.nodePort }}
{{- end }}
port: 9090
targetPort: web
selector:
app: prometheus
prometheus: {{ template "prometheus-operator.fullname" . }}-prometheus
{{- end }}
type: "{{ .Values.prometheus.service.type }}"
{{- end }}
stable/prometheus-operator/values.yaml
+24
View File
@@ -449,6 +449,18 @@ prometheusOperator:
create: true
name: ""
## Configuration for Prometheus operator service
##
service:
## Port to expose on each node
## Only used if service.type is 'NodePort'
##
nodePort: 38080
## Service type
##
type: ClusterIP
## Deploy CRDs used by Prometheus Operator.
##
createCustomResource: true
@@ -549,6 +561,18 @@ prometheus:
create: true
name: ""
## Configuration for Prometheus service
##
service:
## Port to expose on each node
## Only used if service.type is 'NodePort'
##
nodePort: 39090
## Service type
##
type: ClusterIP
rbac:
## Create role bindings in the specified namespaces, to allow Prometheus monitoring
## a role binding in the release namespace will always be created.