Enable Docker default AppArmor profile to mini-mirror
This adds default Apparmor profile to mini-mirror. Change-Id: I4f801580ae7f6f6e59fab38a6742102004ddff05
This commit is contained in:
parent
37b47ca4af
commit
479f50db8b
|
@ -39,6 +39,7 @@ spec:
|
||||||
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
||||||
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
||||||
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
|
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
|
||||||
|
{{ dict "envAll" $envAll "podName" "mini-mirror" "containerNames" (list "mini-mirror-api") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
|
||||||
spec:
|
spec:
|
||||||
{{ dict "envAll" $envAll "application" "mini_mirror" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
{{ dict "envAll" $envAll "application" "mini_mirror" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
pod:
|
||||||
|
mandatory_access_control:
|
||||||
|
type: apparmor
|
||||||
|
mini-mirror:
|
||||||
|
mini-mirror-api: runtime/default
|
|
@ -0,0 +1,31 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Copyright 2020 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 mini-mirror
|
||||||
|
|
||||||
|
#NOTE: Get the over-rides to use
|
||||||
|
: ${OSH_EXTRA_HELM_ARGS_MINI_MIRROR:="$(./tools/deployment/common/get-values-overrides.sh mini-mirror)"}
|
||||||
|
|
||||||
|
#NOTE: Deploy command
|
||||||
|
: ${OSH_EXTRA_HELM_ARGS:=""}
|
||||||
|
|
||||||
|
helm upgrade --install mini-mirror ./mini-mirror \
|
||||||
|
--namespace=osh-addons \
|
||||||
|
${OSH_EXTRA_HELM_ARGS} \
|
||||||
|
${OSH_EXTRA_HELM_ARGS_MINI_MIRROR}
|
|
@ -78,3 +78,20 @@
|
||||||
- ./tools/deployment/component/keystone/keystone.sh
|
- ./tools/deployment/component/keystone/keystone.sh
|
||||||
- ./tools/deployment/component/ranger/ranger.sh
|
- ./tools/deployment/component/ranger/ranger.sh
|
||||||
- ./tools/deployment/component/ranger/ranger-agent.sh
|
- ./tools/deployment/component/ranger/ranger-agent.sh
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: osh-addons-mini-mirror
|
||||||
|
parent: osh-addons-base
|
||||||
|
run: tools/gate/playbooks/osh-gate-runner.yaml
|
||||||
|
timeout: 7200
|
||||||
|
nodeset: openstack-helm-single-node
|
||||||
|
vars:
|
||||||
|
osh_params:
|
||||||
|
container_distro_name: ubuntu
|
||||||
|
container_distro_version: bionic
|
||||||
|
feature_gates: apparmor
|
||||||
|
gate_scripts:
|
||||||
|
- ./tools/deployment/common/install-packages.sh
|
||||||
|
- ./tools/deployment/common/deploy-k8s.sh
|
||||||
|
- ./tools/deployment/common/setup-client.sh
|
||||||
|
- ./tools/deployment/component/mini-mirror/mini-mirror.sh
|
||||||
|
|
|
@ -17,8 +17,10 @@
|
||||||
- openstack-helm-lint
|
- openstack-helm-lint
|
||||||
- osh-addons-sonobuoy
|
- osh-addons-sonobuoy
|
||||||
- osh-addons-ranger
|
- osh-addons-ranger
|
||||||
|
- osh-addons-mini-mirror
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-helm-lint
|
- openstack-helm-lint
|
||||||
- osh-addons-sonobuoy
|
- osh-addons-sonobuoy
|
||||||
- osh-addons-ranger
|
- osh-addons-ranger
|
||||||
|
- osh-addons-mini-mirror
|
||||||
|
|
Loading…
Reference in New Issue