Add Docker default AppArmor profile to rabbitmq exporter chart
Change-Id: If1b420f91d1d23cc454a9ca8eff95a88a7e0b414
This commit is contained in:
parent
47df9fa6b4
commit
b84f536ebd
@ -37,6 +37,9 @@ spec:
|
|||||||
labels:
|
labels:
|
||||||
{{ tuple $envAll "prometheus_rabbitmq_exporter" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
{{ tuple $envAll "prometheus_rabbitmq_exporter" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
||||||
namespace: {{ $envAll.Values.endpoints.prometheus_rabbitmq_exporter.namespace }}
|
namespace: {{ $envAll.Values.endpoints.prometheus_rabbitmq_exporter.namespace }}
|
||||||
|
annotations:
|
||||||
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
||||||
|
{{ dict "envAll" $envAll "podName" "prometheus-rabbitmq-exporter" "containerNames" (list "init" "rabbitmq-exporter") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
|
||||||
spec:
|
spec:
|
||||||
{{ dict "envAll" $envAll "application" "exporter" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
{{ dict "envAll" $envAll "application" "exporter" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
||||||
serviceAccountName: {{ $rcControllerName | quote }}
|
serviceAccountName: {{ $rcControllerName | quote }}
|
||||||
|
@ -9,3 +9,10 @@ pod:
|
|||||||
rabbitmq-cookie: runtime/default
|
rabbitmq-cookie: runtime/default
|
||||||
rabbitmq-perms: runtime/default
|
rabbitmq-perms: runtime/default
|
||||||
rabbitmq: runtime/default
|
rabbitmq: runtime/default
|
||||||
|
prometheus-rabbitmq-exporter:
|
||||||
|
init: runtime/default
|
||||||
|
rabbitmq-exporter: runtime/default
|
||||||
|
|
||||||
|
monitoring:
|
||||||
|
prometheus:
|
||||||
|
enabled: true
|
||||||
|
35
tools/deployment/apparmor/085-rabbitmq.sh
Executable file
35
tools/deployment/apparmor/085-rabbitmq.sh
Executable file
@ -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 rabbitmq
|
||||||
|
|
||||||
|
: ${OSH_INFRA_EXTRA_HELM_ARGS_RABBITMQ:="$(./tools/deployment/common/get-values-overrides.sh rabbitmq)"}
|
||||||
|
|
||||||
|
#NOTE: Deploy command
|
||||||
|
: ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
|
||||||
|
helm upgrade --install rabbitmq ./rabbitmq \
|
||||||
|
--namespace=osh-infra \
|
||||||
|
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
||||||
|
${OSH_INFRA_EXTRA_HELM_ARGS_RABBITMQ}
|
||||||
|
|
||||||
|
#NOTE: Wait for deploy
|
||||||
|
./tools/deployment/common/wait-for-pods.sh osh-infra
|
||||||
|
|
||||||
|
#NOTE: Validate Deployment info
|
||||||
|
helm status rabbitmq
|
@ -281,6 +281,7 @@
|
|||||||
- ./tools/deployment/apparmor/060-prometheus-node-exporter.sh
|
- ./tools/deployment/apparmor/060-prometheus-node-exporter.sh
|
||||||
- ./tools/deployment/apparmor/070-prometheus-openstack-exporter.sh
|
- ./tools/deployment/apparmor/070-prometheus-openstack-exporter.sh
|
||||||
- ./tools/deployment/apparmor/080-prometheus-process-exporter.sh
|
- ./tools/deployment/apparmor/080-prometheus-process-exporter.sh
|
||||||
|
- ./tools/deployment/apparmor/085-rabbitmq.sh
|
||||||
- ./tools/deployment/apparmor/090-elasticsearch.sh
|
- ./tools/deployment/apparmor/090-elasticsearch.sh
|
||||||
- ./tools/deployment/apparmor/100-fluentbit.sh
|
- ./tools/deployment/apparmor/100-fluentbit.sh
|
||||||
- ./tools/deployment/apparmor/110-fluentd-daemonset.sh
|
- ./tools/deployment/apparmor/110-fluentd-daemonset.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user