From 856f64ca96e5d0a3e13bf8b8abb95eee46b705db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n-Garc=C3=ADa?= Date: Wed, 31 Oct 2018 11:43:57 +0100 Subject: [PATCH] [stable/phpbb] Add apache exporter (#8854) * [stable/phpbb] Add apache exporter Signed-off-by: Javier J. Salmeron Garcia * [stable/phpbb] Add podAnnotations Signed-off-by: Javier J. Salmeron Garcia * [stable/phpbb] Add podAnnotations Signed-off-by: Javier J. Salmeron Garcia --- stable/phpbb/Chart.yaml | 2 +- stable/phpbb/README.md | 9 +++++++ stable/phpbb/templates/_helpers.tpl | 10 +++++++ stable/phpbb/templates/deployment.yaml | 36 ++++++++++++++++++++++++++ stable/phpbb/values.yaml | 28 ++++++++++++++++++++ 5 files changed, 84 insertions(+), 1 deletion(-) diff --git a/stable/phpbb/Chart.yaml b/stable/phpbb/Chart.yaml index fd3f0b799d..d680b9b65f 100644 --- a/stable/phpbb/Chart.yaml +++ b/stable/phpbb/Chart.yaml @@ -1,5 +1,5 @@ name: phpbb -version: 3.1.1 +version: 3.2.0 appVersion: 3.2.3 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more. diff --git a/stable/phpbb/README.md b/stable/phpbb/README.md index a8e22f46d7..b1d83a4a1b 100644 --- a/stable/phpbb/README.md +++ b/stable/phpbb/README.md @@ -81,6 +81,15 @@ The following table lists the configurable parameters of the phpBB chart and the | `persistence.phpbb.accessMode` | PVC Access Mode for phpBB volume | `ReadWriteOnce` | | `persistence.phpbb.size` | PVC Storage Request for phpBB volume | `8Gi` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | +| `podAnnotations` | Pod annotations | `{}` | +| `metrics.enabled` | Start a side-car prometheus exporter | `false` | +| `metrics.image.registry` | Apache exporter image registry | `docker.io` | +| `metrics.image.repository` | Apache exporter image name | `lusotycoon/apache-exporter` | +| `metrics.image.tag` | Apache exporter image tag | `v0.5.0` | +| `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` | +| `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `nil` | +| `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{prometheus.io/scrape: "true", prometheus.io/port: "9117"}` | +| `metrics.resources` | Exporter resource requests/limit | {} | The above parameters map to the env variables defined in [bitnami/phpbb](http://github.com/bitnami/bitnami-docker-phpbb). For more information please refer to the [bitnami/phpbb](http://github.com/bitnami/bitnami-docker-phpbb) image documentation. diff --git a/stable/phpbb/templates/_helpers.tpl b/stable/phpbb/templates/_helpers.tpl index aa192d1a09..0cd37d5d45 100644 --- a/stable/phpbb/templates/_helpers.tpl +++ b/stable/phpbb/templates/_helpers.tpl @@ -45,3 +45,13 @@ Also, we can't use a single if because lazy evaluation is not an option {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} {{- end -}} {{- end -}} + +{{/* +Return the proper image name (for the metrics image) +*/}} +{{- define "metrics.image" -}} +{{- $registryName := .Values.metrics.image.registry -}} +{{- $repositoryName := .Values.metrics.image.repository -}} +{{- $tag := .Values.metrics.image.tag | toString -}} +{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} diff --git a/stable/phpbb/templates/deployment.yaml b/stable/phpbb/templates/deployment.yaml index 8bf347b049..a1540c01b2 100644 --- a/stable/phpbb/templates/deployment.yaml +++ b/stable/phpbb/templates/deployment.yaml @@ -20,6 +20,15 @@ spec: app: {{ template "phpbb.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" +{{- if or .Values.podAnnotations .Values.metrics.enabled }} + annotations: + {{- if .Values.podAnnotations }} +{{ toYaml .Values.podAnnotations | indent 8 }} + {{- end }} + {{- if .Values.metrics.podAnnotations }} +{{ toYaml .Values.metrics.podAnnotations | indent 8 }} + {{- end }} +{{- end }} spec: {{- if .Values.image.pullSecrets }} imagePullSecrets: @@ -27,6 +36,10 @@ spec: - name: {{ . }} {{- end}} {{- end }} + hostAliases: + - ip: "127.0.0.1" + hostnames: + - "status.localhost" containers: - name: {{ template "phpbb.fullname" . }} image: {{ template "phpbb.image" . }} @@ -112,6 +125,29 @@ spec: mountPath: /bitnami/phpbb - name: apache-data mountPath: /bitnami/apache +{{- if .Values.metrics.enabled }} + - name: metrics + image: {{ template "metrics.image" . }} + imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} + command: [ '/bin/apache_exporter', '-scrape_uri', 'http://status.localhost:80/server-status/?auto'] + ports: + - name: metrics + containerPort: 9117 + livenessProbe: + httpGet: + path: /metrics + port: metrics + initialDelaySeconds: 15 + timeoutSeconds: 5 + readinessProbe: + httpGet: + path: /metrics + port: metrics + initialDelaySeconds: 5 + timeoutSeconds: 1 + resources: + {{ toYaml .Values.metrics.resources | indent 10 }} +{{- end }} volumes: - name: phpbb-data {{- if .Values.persistence.enabled }} diff --git a/stable/phpbb/values.yaml b/stable/phpbb/values.yaml index 6c5a65f8a9..e1c2b75dae 100644 --- a/stable/phpbb/values.yaml +++ b/stable/phpbb/values.yaml @@ -155,3 +155,31 @@ resources: requests: memory: 512Mi cpu: 300m + +## Pod annotations +## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ +## +podAnnotations: {} +## Prometheus Exporter / Metrics +## +metrics: + enabled: false + image: + registry: docker.io + repository: lusotycoon/apache-exporter + tag: v0.5.0 + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## + # pullSecrets: + # - myRegistrKeySecretName + ## Metrics exporter pod Annotation and Labels + podAnnotations: + prometheus.io/scrape: "true" + prometheus.io/port: "9117" + ## Metrics exporter resource requests and limits + ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ + ## + # resources: {}