diff --git a/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml b/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml index af4da0209..7d76af7f8 100644 --- a/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml @@ -37,6 +37,9 @@ spec: labels: {{ tuple $envAll "prometheus-mysql-exporter" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} namespace: {{ .Values.endpoints.prometheus_mysql_exporter.namespace }} + annotations: +{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} +{{ dict "envAll" $envAll "podName" "prometheus-mysql-exporter" "containerNames" (list "mysql-exporter") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} spec: {{ dict "envAll" $envAll "application" "mysql_exporter" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} shareProcessNamespace: true diff --git a/mariadb/values_overrides/apparmor.yaml b/mariadb/values_overrides/apparmor.yaml index a73f65b09..abb4964f4 100644 --- a/mariadb/values_overrides/apparmor.yaml +++ b/mariadb/values_overrides/apparmor.yaml @@ -7,3 +7,9 @@ pod: ingress: runtime/default mariadb-server: mariadb: runtime/default + prometheus-mysql-exporter: + mysql-exporter: runtime/default + +monitoring: + prometheus: + enabled: true diff --git a/tools/deployment/apparmor/030-mariadb.sh b/tools/deployment/apparmor/030-mariadb.sh new file mode 100755 index 000000000..2fe0dc20d --- /dev/null +++ b/tools/deployment/apparmor/030-mariadb.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Copyright 2017 The Openstack-Helm Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +set -xe + +#NOTE: Lint and package chart +make mariadb + +: ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB:="$(./tools/deployment/common/get-values-overrides.sh mariadb)"} + +#NOTE: Deploy command +: ${OSH_INFRA_EXTRA_HELM_ARGS:=""} +helm upgrade --install mariadb ./mariadb \ + --namespace=osh-infra \ + ${OSH_INFRA_EXTRA_HELM_ARGS} \ + ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB} + +#NOTE: Wait for deploy +./tools/deployment/common/wait-for-pods.sh osh-infra + +#NOTE: Validate Deployment info +helm status mariadb diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 87c6f433f..e8bc5f59d 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -276,6 +276,7 @@ - ./tools/deployment/apparmor/005-deploy-k8s.sh - ./tools/deployment/apparmor/020-ceph.sh - ./tools/deployment/apparmor/025-ceph-ns-activate.sh + - ./tools/deployment/apparmor/030-mariadb.sh - ./tools/deployment/apparmor/040-memcached.sh - ./tools/deployment/apparmor/050-prometheus-alertmanager.sh - ./tools/deployment/apparmor/055-prometheus.sh