Enable Docker default AppArmor profile to Ranger-Agent
This adds default Apparmor profile to Ranger-Agent. Change-Id: I795910892b7a331871e67ca3462929e3a93fd226
This commit is contained in:
parent
771599d718
commit
dfb5f4e51f
|
@ -66,6 +66,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-agent-api" "containerNames" (list "init" "ranger-agent-api") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
|
||||
spec:
|
||||
{{ dict "envAll" $envAll "application" "ranger_agent" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
||||
serviceAccountName: {{ $serviceAccountName }}
|
||||
|
|
|
@ -66,6 +66,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-agent" "containerNames" (list "ranger-agent-engine") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
|
||||
spec:
|
||||
{{ dict "envAll" $envAll "application" "ranger_agent" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
||||
serviceAccountName: {{ $serviceAccountName }}
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
pod:
|
||||
mandatory_access_control:
|
||||
type: apparmor
|
||||
ranger-agent-api:
|
||||
init: runtime/default
|
||||
ranger-agent-api: runtime/default
|
||||
ranger-agent:
|
||||
ranger-agent-engine: runtime/default
|
||||
|
|
@ -84,9 +84,17 @@ dependencies:
|
|||
service: local_image_registry
|
||||
EOF
|
||||
|
||||
#NOTE: Get the over-rides to use
|
||||
: ${OSH_EXTRA_HELM_ARGS_RANGER_AGENT:="$(./tools/deployment/common/get-values-overrides.sh ranger-agent)"}
|
||||
|
||||
#NOTE: Deploy command
|
||||
: ${OSH_EXTRA_HELM_ARGS:=""}
|
||||
|
||||
helm upgrade --install ranger-agent ./ranger-agent \
|
||||
--namespace=openstack \
|
||||
--values=/tmp/ranger-agent.yaml
|
||||
--values=/tmp/ranger-agent.yaml \
|
||||
${OSH_EXTRA_HELM_ARGS} \
|
||||
${OSH_EXTRA_HELM_ARGS_RANGER_AGENT}
|
||||
|
||||
#NOTE: Wait for deploy
|
||||
./tools/deployment/common/wait-for-pods.sh openstack
|
||||
|
|
|
@ -66,7 +66,8 @@
|
|||
osh_params:
|
||||
openstack_release: ocata
|
||||
container_distro_name: ubuntu
|
||||
container_distro_version: xenial
|
||||
container_distro_version: bionic
|
||||
feature_gates: apparmor
|
||||
gate_scripts:
|
||||
- ./tools/deployment/common/install-packages.sh
|
||||
- ./tools/deployment/common/deploy-k8s.sh
|
||||
|
|
Loading…
Reference in New Issue