Enable runtime-default Apparmor Profile to Compute Utility Container.
Change-Id: I68a73eedd907bdac0d105795de66ac603ca1f9f5
This commit is contained in:
parent
7fcb7efe3d
commit
a9a80cb19d
@ -65,6 +65,7 @@ spec:
|
||||
name: {{ printf "%s" $envAll.Release.Name }}
|
||||
annotations:
|
||||
{{ tuple . | include "helm-toolkit.snippets.release_uuid" }}
|
||||
{{ dict "envAll" $envAll "podName" "compute-utility" "containerNames" (list "compute-utility") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
|
||||
labels:
|
||||
{{ tuple $envAll "compute" "utility" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
||||
spec:
|
||||
@ -75,7 +76,7 @@ spec:
|
||||
nodeSelector:
|
||||
{{ .Values.labels.utility.node_selector_key }}: {{ .Values.labels.utility.node_selector_value }}
|
||||
containers:
|
||||
- name: {{ printf "%s" $envAll.Release.Name }}
|
||||
- name: compute-utility
|
||||
{{ tuple $envAll "compute_utility" | include "helm-toolkit.snippets.image" | indent 10 }}
|
||||
{{ tuple $envAll $envAll.Values.pod.resources.compute_utility | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
||||
{{ dict "envAll" $envAll "application" "compute" "container" "compute_utility" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
||||
|
@ -58,6 +58,10 @@ pod:
|
||||
default: preferredDuringSchedulingIgnoredDuringExecution
|
||||
topologyKey:
|
||||
default: kubernetes.io/hostname
|
||||
mandatory_access_control:
|
||||
type: apparmor
|
||||
compute-utility:
|
||||
compute-utility: runtime/default
|
||||
resources:
|
||||
enabled: false
|
||||
utility:
|
||||
|
45
tools/deployment/apparmor/020-compute-utility.sh
Executable file
45
tools/deployment/apparmor/020-compute-utility.sh
Executable file
@ -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
|
||||
namespace="utility"
|
||||
CURRENT_DIR="$(pwd)"
|
||||
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
|
||||
|
||||
mkdir charts/compute-utility/charts
|
||||
cp -r ${OSH_INFRA_PATH}/helm-toolkit-0.1.0.tgz ${CURRENT_DIR}/charts/compute-utility/charts
|
||||
cd "${CURRENT_DIR}"/charts
|
||||
sleep 120
|
||||
|
||||
kubectl label nodes --all openstack-helm-node-class=enabled --overwrite
|
||||
helm upgrade --install compute-utility ./compute-utility --namespace=$namespace
|
||||
sleep 180
|
||||
kubectl get pods --namespace=$namespace
|
||||
|
||||
com_pod=$(kubectl get pods --namespace=$namespace -o wide | grep compute | awk '{print $1}')
|
||||
expected_profile="docker-default (enforce)"
|
||||
profile=`kubectl -n $namespace exec $com_pod -- cat /proc/1/attr/current`
|
||||
echo "Profile running: $profile"
|
||||
if test "$profile" != "$expected_profile"
|
||||
then
|
||||
if test "$proc_name" == "pause"
|
||||
then
|
||||
echo "Root process (pause) can run docker-default, it's ok."
|
||||
else
|
||||
echo "$profile is the WRONG PROFILE!!"
|
||||
return 1
|
||||
fi
|
||||
fi
|
Loading…
x
Reference in New Issue
Block a user