diff --git a/stable/kube2iam/Chart.yaml b/stable/kube2iam/Chart.yaml index f4c7aa01a8..1247d6d086 100644 --- a/stable/kube2iam/Chart.yaml +++ b/stable/kube2iam/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: kube2iam -version: 1.0.1 -appVersion: 0.10.4 +version: 1.1.0 +appVersion: 0.10.7 description: Provide IAM credentials to pods based on annotations. keywords: - kube2iam diff --git a/stable/kube2iam/README.md b/stable/kube2iam/README.md index 07ff4e9f6e..c055304ada 100644 --- a/stable/kube2iam/README.md +++ b/stable/kube2iam/README.md @@ -55,6 +55,8 @@ Parameter | Description | Default `podAnnotations` | annotations to be added to pods | `{}` `priorityClassName` | priorityClassName to be added to pods | `{}` `prometheus.metricsPort` | Port to expose prometheus metrics on (if unspecified, `host.port` is used) | `host.port` +`prometheus.service.enabled` | If true, create a Service resource for Prometheus | `false` +`prometheus.service.annotations` | Annotations to be added to the service | `{}` `prometheus.serviceMonitor.enabled` | If true, create a Prometheus Operator ServiceMonitor resource | `false` `prometheus.serviceMonitor.interval` | Interval at which the metrics endpoint is scraped | `10s` `prometheus.serviceMonitor.namespace` | An alternative namespace in which to install the ServiceMonitor | `""` diff --git a/stable/kube2iam/templates/service.yaml b/stable/kube2iam/templates/service.yaml index 80727e1345..fcc567b709 100644 --- a/stable/kube2iam/templates/service.yaml +++ b/stable/kube2iam/templates/service.yaml @@ -1,14 +1,17 @@ -{{- if .Values.prometheus.serviceMonitor.enabled }} +{{- if or .Values.prometheus.serviceMonitor.enabled .Values.prometheus.service.enabled }} apiVersion: v1 kind: Service metadata: - annotations: name: {{ template "kube2iam.fullname" . }}-metrics labels: app: {{ template "kube2iam.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- if .Values.prometheus.service.annotations }} + annotations: + {{- toYaml .Values.prometheus.service.annotations | nindent 4 }} + {{- end }} spec: selector: app: {{ template "kube2iam.name" . }} diff --git a/stable/kube2iam/values.yaml b/stable/kube2iam/values.yaml index 68cf059b94..8814964f03 100644 --- a/stable/kube2iam/values.yaml +++ b/stable/kube2iam/values.yaml @@ -16,7 +16,14 @@ host: prometheus: # Port to expose the /metrics endpoint on. If unset, defaults to `host.port` - # metricsPort: 8181 + # metricsPort: 9543 + + service: + enabled: false +# annotations: +# prometheus.io/scrape: "true" +# prometheus.io/port: "9543" +# prometheus.io/path: "/metrics" serviceMonitor: # Create prometheus-operator ServiceMonitor @@ -28,7 +35,7 @@ prometheus: image: repository: jtblin/kube2iam - tag: 0.10.4 + tag: 0.10.7 pullPolicy: IfNotPresent # AWS Access keys to inject as environment variables