Merge "Enable Docker default AppArmor profile to Ranger"

ranger/templates/deployment-ranger-services.yaml

@@ -50,6 +50,7 @@ spec:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+{{ dict "envAll" $envAll "podName" "ranger" "containerNames" (list "init" "ranger-services") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
 {{ dict "envAll" $envAll "application" "ranger" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}

ranger/values_overrides/apparmor.yaml

@@ -0,0 +1,6 @@
+pod:
+  mandatory_access_control:
+    type: apparmor
+    ranger:
+      init: runtime/default
+      ranger-services: runtime/default

tools/deployment/component/ranger/ranger.sh

@@ -29,9 +29,17 @@ conf:
     ranger_agent_client_cert: null
 EOF
 
+#NOTE: Get the over-rides to use
+: ${OSH_EXTRA_HELM_ARGS_RANGER:="$(./tools/deployment/common/get-values-overrides.sh ranger)"}
+
+#NOTE: Deploy command
+: ${OSH_EXTRA_HELM_ARGS:=""}
+
 helm upgrade --install ranger ./ranger \
   --namespace=openstack \
-  --values=/tmp/ranger.yaml
+  --values=/tmp/ranger.yaml \
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_RANGER}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
@@ -39,4 +47,4 @@ helm upgrade --install ranger ./ranger \
 helm status ranger
 kubectl delete pods -l application=ranger,release_group=ranger,component=test \
   --namespace=openstack --ignore-not-found
-helm test ranger --timeout 900
+helm test ranger --timeout 900