Merge "This commit adds docker-default apparmor profile for prometheus-openstack-exporter."

prometheus-openstack-exporter/values.yaml

@@ -38,10 +38,6 @@ labels:
     node_selector_value: enabled
 
 pod:
-  mandatory_access_control:
-    type: apparmor
-    openstack-metrics-exporter:
-      openstack-metrics-exporter: localhost/docker-default
   security_context:
     openstack_exporter:
       pod:

tools/deployment/apparmor/070-prometheus-openstack-exporter.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Copyright 2019 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 prometheus-openstack-exporter
+
+#NOTE: Deploy command
+tee /tmp/prometheus-openstack-exporter.yaml << EOF
+manifests:
+  job_ks_user: false
+dependencies:
+  static:
+    prometheus_openstack_exporter:
+      jobs: null
+      services: null
+pod:
+  mandatory_access_control:
+    type: apparmor
+    prometheus-openstack-exporter:
+      openstack-metrics-exporter: localhost/docker-default
+EOF
+helm upgrade --install prometheus-openstack-exporter ./prometheus-openstack-exporter \
+    --namespace=openstack \
+    --values=/tmp/prometheus-openstack-exporter.yaml
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+helm status prometheus-openstack-exporter

zuul.d/jobs.yaml

@@ -210,6 +210,7 @@
         - ./tools/deployment/apparmor/005-deploy-k8s.sh
         - ./tools/deployment/apparmor/040-memcached.sh
         - ./tools/deployment/apparmor/060-prometheus-node-exporter.sh
+        - ./tools/deployment/apparmor/070-prometheus-openstack-exporter.sh
         - ./tools/deployment/apparmor/080-prometheus-process-exporter.sh
         - ./tools/deployment/apparmor/020-ceph.sh