mirror of
https://github.com/prometheus-operator/prometheus-operator.git
synced 2025-04-21 03:38:43 +00:00
[helm] Add imagePullSecrets option for ServiceAccounts, Prometheus and Alertmanager (#1518)
* [helm] Add imagePullSecrets option for ServiceAccounts, Prometheus and Alertmanager * Use empty array as default for imagePullSecrets
This commit is contained in:
parent
cbc69a4d34
commit
451031460b
22 changed files with 56 additions and 13 deletions
helm
alertmanager
exporter-kube-state
exporter-node
grafana
kube-prometheus
prometheus-operator
prometheus
|
@ -8,9 +8,9 @@ name: alertmanager
|
|||
sources:
|
||||
- https://github.com/coreos/prometheus-operator
|
||||
- https://github.com/prometheus/alertmanager
|
||||
version: 0.1.2
|
||||
version: 0.1.3
|
||||
appVersion: "0.14.0"
|
||||
home: https://github.com/prometheus/alertmanager
|
||||
home: https://github.com/prometheus/alertmanager
|
||||
keywords:
|
||||
- alertmanager
|
||||
- monitoring
|
||||
|
|
|
@ -58,3 +58,5 @@ spec:
|
|||
tolerations:
|
||||
{{ toYaml .Values.tolerations | indent 4 }}
|
||||
{{- end }}
|
||||
imagePullSecrets:
|
||||
{{ toYaml .Values.global.imagePullSecrets | indent 4 }}
|
||||
|
|
|
@ -175,6 +175,10 @@ service:
|
|||
global:
|
||||
rbacEnable: true
|
||||
pspEnable: true
|
||||
|
||||
# Reference to one or more secrets to be used when pulling images
|
||||
imagePullSecrets: []
|
||||
# - name: "image-pull-secret"
|
||||
|
||||
## Alertmanager StorageSpec for persistent data
|
||||
## Ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/user-guides/storage.md
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
apiVersion: v1
|
||||
description: A Helm chart singleton for kube-state-metrics
|
||||
name: exporter-kube-state
|
||||
version: 0.2.3
|
||||
version: 0.2.4
|
||||
maintainers:
|
||||
- name: Giancarlo Rubio
|
||||
email: gianrubio@gmail.com
|
||||
|
|
|
@ -8,4 +8,6 @@ metadata:
|
|||
heritage: {{ .Release.Service }}
|
||||
release: {{ .Release.Name }}
|
||||
name: {{ template "exporter-kube-state.fullname" . }}
|
||||
imagePullSecrets:
|
||||
{{ toYaml .Values.global.imagePullSecrets | indent 2 }}
|
||||
{{- end }}
|
||||
|
|
|
@ -8,6 +8,10 @@ replicaCount: 1
|
|||
global:
|
||||
rbacEnable: true
|
||||
pspEnable: true
|
||||
|
||||
# Reference to one or more secrets to be used when pulling images
|
||||
imagePullSecrets: []
|
||||
# - name: "image-pull-secret"
|
||||
|
||||
kube_state_metrics:
|
||||
image:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
apiVersion: v1
|
||||
description: A Helm chart for Kubernetes node exporter
|
||||
name: exporter-node
|
||||
version: 0.3.2
|
||||
version: 0.3.3
|
||||
maintainers:
|
||||
- name: Giancarlo Rubio
|
||||
email: gianrubio@gmail.com
|
||||
|
|
|
@ -8,4 +8,6 @@ metadata:
|
|||
heritage: {{ .Release.Service }}
|
||||
release: {{ .Release.Name }}
|
||||
name: {{ template "exporter-node.fullname" . }}
|
||||
imagePullSecrets:
|
||||
{{ toYaml .Values.global.imagePullSecrets | indent 2 }}
|
||||
{{- end }}
|
||||
|
|
|
@ -51,6 +51,10 @@ tolerations:
|
|||
global:
|
||||
rbacEnable: true
|
||||
pspEnable: true
|
||||
|
||||
# Reference to one or more secrets to be used when pulling images
|
||||
imagePullSecrets: []
|
||||
# - name: "image-pull-secret"
|
||||
|
||||
# default rules are in templates/node.rules.yaml
|
||||
# prometheusRules: {}
|
||||
|
|
|
@ -8,4 +8,4 @@ maintainers:
|
|||
name: grafana
|
||||
sources:
|
||||
- https://github.com/coreos/prometheus-operator
|
||||
version: 0.0.35
|
||||
version: 0.0.36
|
||||
|
|
|
@ -8,4 +8,6 @@ metadata:
|
|||
heritage: {{ .Release.Service }}
|
||||
release: {{ .Release.Name }}
|
||||
name: {{ template "grafana.server.fullname" . }}
|
||||
imagePullSecrets:
|
||||
{{ toYaml .Values.global.imagePullSecrets | indent 2 }}
|
||||
{{- end }}
|
||||
|
|
|
@ -23,6 +23,10 @@ additionalServiceMonitorLabels: {}
|
|||
global:
|
||||
rbacEnable: true
|
||||
pspEnable: true
|
||||
|
||||
# Reference to one or more secrets to be used when pulling images
|
||||
imagePullSecrets: []
|
||||
# - name: "image-pull-secret"
|
||||
|
||||
## Pass extra environment variables to the Grafana container.
|
||||
##
|
||||
|
|
|
@ -7,4 +7,4 @@ maintainers:
|
|||
name: kube-prometheus
|
||||
sources:
|
||||
- https://github.com/coreos/prometheus-operator
|
||||
version: 0.0.89
|
||||
version: 0.0.90
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
dependencies:
|
||||
- name: alertmanager
|
||||
version: 0.1.2
|
||||
version: 0.1.3
|
||||
#e2e-repository: file://../alertmanager
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
condition: deployAlertManager
|
||||
|
||||
- name: prometheus
|
||||
version: 0.0.48
|
||||
version: 0.0.49
|
||||
#e2e-repository: file://../prometheus
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
|
||||
|
@ -41,7 +41,7 @@ dependencies:
|
|||
condition: deployKubeScheduler
|
||||
|
||||
- name: exporter-kube-state
|
||||
version: 0.2.3
|
||||
version: 0.2.4
|
||||
#e2e-repository: file://../exporter-kube-state
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
condition: deployKubeState
|
||||
|
@ -58,13 +58,13 @@ dependencies:
|
|||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
|
||||
- name: exporter-node
|
||||
version: 0.3.2
|
||||
version: 0.3.3
|
||||
#e2e-repository: file://../exporter-node
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
condition: deployExporterNode
|
||||
|
||||
- name: grafana
|
||||
version: 0.0.35
|
||||
version: 0.0.36
|
||||
#e2e-repository: file://../grafana
|
||||
repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
|
||||
condition: deployGrafana
|
||||
|
|
|
@ -21,6 +21,10 @@ deployKubeState: True
|
|||
global:
|
||||
rbacEnable: true
|
||||
pspEnable: true
|
||||
|
||||
# Reference to one or more secrets to be used when pulling images
|
||||
imagePullSecrets: []
|
||||
# - name: "image-pull-secret"
|
||||
|
||||
# AlertManager
|
||||
deployAlertManager: True
|
||||
|
|
|
@ -7,7 +7,7 @@ maintainers:
|
|||
name: prometheus-operator
|
||||
sources:
|
||||
- https://github.com/coreos/prometheus-operator
|
||||
version: 0.0.26
|
||||
version: 0.0.27
|
||||
appVersion: "0.20.0"
|
||||
home: https://github.com/coreos/prometheus-operator
|
||||
keywords:
|
||||
|
|
|
@ -8,4 +8,6 @@ metadata:
|
|||
heritage: {{ .Release.Service }}
|
||||
release: {{ .Release.Name }}
|
||||
name: {{ template "prometheus-operator.fullname" . }}
|
||||
imagePullSecrets:
|
||||
{{ toYaml .Values.imagePullSecrets | indent 2 }}
|
||||
{{- end }}
|
||||
|
|
|
@ -48,6 +48,10 @@ rbacEnable: true
|
|||
## If true, create Pod Security Policy resources
|
||||
pspEnable: true
|
||||
|
||||
# Reference to one or more secrets to be used when pulling images
|
||||
imagePullSecrets: []
|
||||
# - name: "image-pull-secret"
|
||||
|
||||
## Prometheus-operator resource limits & requests
|
||||
## Ref: https://kubernetes.io/docs/user-guide/compute-resources/
|
||||
##
|
||||
|
|
|
@ -7,4 +7,5 @@ maintainers:
|
|||
name: prometheus
|
||||
sources:
|
||||
- https://github.com/coreos/prometheus-operator
|
||||
version: 0.0.48
|
||||
version: 0.0.49
|
||||
|
||||
|
|
|
@ -128,6 +128,8 @@ spec:
|
|||
tolerations:
|
||||
{{ toYaml .Values.tolerations | indent 4 }}
|
||||
{{- end }}
|
||||
imagePullSecrets:
|
||||
{{ toYaml .Values.global.imagePullSecrets | indent 4 }}
|
||||
{{- if .Values.additionalScrapeConfigs }}
|
||||
additionalScrapeConfigs:
|
||||
name: prometheus-{{ .Release.Name }}-additional-scrape-configs
|
||||
|
|
|
@ -8,4 +8,6 @@ metadata:
|
|||
heritage: {{ .Release.Service }}
|
||||
release: {{ .Release.Name }}
|
||||
name: {{ template "prometheus.serviceAccountName" .}}
|
||||
imagePullSecrets:
|
||||
{{ toYaml .Values.global.imagePullSecrets | indent 2 }}
|
||||
{{- end }}
|
||||
|
|
|
@ -102,6 +102,10 @@ paused: false
|
|||
global:
|
||||
rbacEnable: true
|
||||
pspEnable: true
|
||||
|
||||
# Reference to one or more secrets to be used when pulling images
|
||||
imagePullSecrets: []
|
||||
# - name: "image-pull-secret"
|
||||
|
||||
## serviceAccount to use by Prometheus
|
||||
##
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue