airship/porthole
Code Issues Proposed changes

Fix helm Installation Script in Apparmor Scripts

Browse Source 
Added helm dependecy update instead of directory logging
and using MAKE functionality. This way script supports
local deployments.


Change-Id: I40b916f21a11945f4e065983e863922c3f537bbf
Signed-off-by: diwakar thyagaraj <diwakar.chitoor.thyagaraj@att.com>
This commit is contained in:
diwakar thyagaraj 2020-02-27 04:12:16 +00:00
parent 9f9d8d39be
commit 756b81cc1a
15 changed files with 60 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/deployment/apparmor/005-calicoctl-utility.sh
View File

@ -15,19 +15,13 @@
# under the License.
set -xe
namespace="utility"
CURRENT_DIR="$(pwd)"
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
mkdir charts/calicoctl-utility/charts
cp -r ${OSH_INFRA_PATH}/helm-toolkit-0.1.0.tgz ${CURRENT_DIR}/charts/calicoctl-utility/charts
cd "${CURRENT_DIR}"/charts
sleep 120
namespace=utility
kubectl label nodes --all openstack-helm-node-class=enabled --overwrite
helm dependency update charts/calicoctl-utility
cd charts
helm upgrade --install calicoctl-utility ./calicoctl-utility --namespace=$namespace
sleep 180
kubectl get pods --namespace=$namespace
cal_pod=$(kubectl get pods --namespace=$namespace -o wide | grep calico | awk '{print $1}')
expected_profile="docker-default (enforce)"

17
tools/deployment/apparmor/010-ceph-utility.sh
View File

@ -1,9 +1,6 @@
#!/bin/bash
set -xe
namespace="utility"
CURRENT_DIR="$(pwd)"
kubectl get pods --all-namespaces
: ${OSH_INFRA_PATH:="../../openstack-helm-infra"}
cd ${OSH_INFRA_PATH}
@ -210,7 +207,6 @@ done
--no-headers | awk '{ print $1; exit }')
kubectl exec -n ceph ${MON_POD} -- ceph -s
#make -C ${OSH_INFRA_PATH} ceph-provisioners
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
@ -246,16 +242,11 @@ helm upgrade --install ceph-utility-config ${OSH_INFRA_PATH}/ceph-provisioners \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
cd ${CURRENT_DIR}
mkdir charts/ceph-utility/charts
cp -r ${OSH_INFRA_PATH}/helm-toolkit-0.1.0.tgz ${CURRENT_DIR}/charts/ceph-utility/charts
cd "${CURRENT_DIR}"/charts
sleep 120
kubectl get pods --all-namespaces
kubectl label nodes --all openstack-helm-node-class=primary --overwrite
pwd
cd ../porthole
helm dependency update charts/ceph-utility
cd charts
helm upgrade --install ceph-utility ./ceph-utility --namespace=$namespace

11
tools/deployment/apparmor/020-compute-utility.sh
View File

@ -16,17 +16,12 @@
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 dependency update charts/compute-utility
cd charts
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}')

10
tools/deployment/apparmor/030-etcdctl-utility.sh
View File

@ -16,15 +16,9 @@
set -xe
namespace="utility"
CURRENT_DIR="$(pwd)"
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
mkdir charts/etcdctl-utility/charts
cp -r ${OSH_INFRA_PATH}/helm-toolkit-0.1.0.tgz ${CURRENT_DIR}/charts/etcdctl-utility/charts
cd "${CURRENT_DIR}"/charts
sleep 60
kubectl label nodes --all openstack-helm-node-class=primary --overwrite
helm dependency update charts/etcdctl-utility
cd charts
helm upgrade --install etcdctl-utility ./etcdctl-utility --namespace=$namespace
sleep 180
kubectl get pods --namespace=$namespace

14
tools/deployment/apparmor/040-mysqlclient-utility.sh
View File

@ -16,22 +16,16 @@
set -xe
namespace="utility"
CURRENT_DIR="$(pwd)"
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
mkdir charts/mysqlclient-utility/charts
cp -r ${OSH_INFRA_PATH}/helm-toolkit-0.1.0.tgz ${CURRENT_DIR}/charts/mysqlclient-utility/charts
cd "${CURRENT_DIR}"/charts
sleep 120
kubectl label nodes --all openstack-helm-node-class=primary --overwrite
helm dependency update charts/mysqlclient-utility
cd charts
helm upgrade --install mysqlclient-utility ./mysqlclient-utility --namespace=$namespace
sleep 180
kubectl get pods --namespace=$namespace
com_pod=$(kubectl get pods --namespace=$namespace -o wide | grep mysqlclient | awk '{print $1}')
mysql_pod=$(kubectl get pods --namespace=$namespace -o wide | grep mysqlclient | awk '{print $1}')
expected_profile="docker-default (enforce)"
profile=`kubectl -n $namespace exec $com_pod -- cat /proc/1/attr/current`
profile=`kubectl -n $namespace exec $mysql_pod -- cat /proc/1/attr/current`
echo "Profile running: $profile"
if test "$profile" != "$expected_profile"
then

13
tools/deployment/apparmor/050-openstack-utility.sh
View File

@ -18,17 +18,8 @@ set -xe
kubectl label nodes --all openstack-helm-node-class=primary --overwrite
namespace="utility"
cd /tmp
git clone https://git.openstack.org/openstack/openstack-helm-infra.git || true
cd openstack-helm-infra
git reset --hard 200b5e902b3a176fbfbe669b6a10a254c9b50f5d
make helm-toolkit
cd /home/zuul/src/opendev.org/airship/porthole/charts/openstack-utility/
mkdir charts
cp -r /tmp/openstack-helm-infra/helm-toolkit-0.1.0.tgz /home/zuul/src/opendev.org/airship/porthole/charts/openstack-utility/charts
cd /home/zuul/src/opendev.org/airship/porthole/charts
helm dependency update charts/openstack-utility
cd charts
kubectl get pods --all-namespaces
sleep 120

11
tools/deployment/apparmor/060-postgresql-utility.sh
View File

@ -16,15 +16,10 @@
set -xe
namespace="utility"
CURRENT_DIR="$(pwd)"
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
mkdir charts/postgresql-utility/charts
cp -r ${OSH_INFRA_PATH}/helm-toolkit-0.1.0.tgz ${CURRENT_DIR}/charts/postgresql-utility/charts
cd "${CURRENT_DIR}"/charts
sleep 60
kubectl label nodes --all openstack-helm-node-class=primary --overwrite
helm dependency update charts/postgresql-utility
cd charts
helm upgrade --install postgresql-utility ./postgresql-utility --namespace=$namespace
sleep 180
kubectl get pods --namespace=$namespace

3
tools/deployment/utilities/005-calicoctl-utility.sh
View File

@ -1,7 +1,8 @@
#!/bin/bash
set -xe
kubectl label nodes --all openstack-helm-node-class=enabled --overwrite
helm dependency update charts/calicoctl-utility
cd charts
helm upgrade --install calicoctl-utility ./calicoctl-utility --namespace=utility

4
tools/deployment/utilities/010-ceph-utility.sh
View File

@ -3,7 +3,6 @@ set -xe
#NOTE: Lint and package chart
: ${OSH_INFRA_PATH:="../../openstack-helm-infra"}
#: ${PORTHOLE_PATH}:=""
make -C ${OSH_INFRA_PATH} ceph-provisioners
#NOTE: Deploy command
@ -40,9 +39,8 @@ helm upgrade --install ceph-utility-config ${OSH_INFRA_PATH}/ceph-provisioners \
#NOTE: Wait for deploy
./${OSH_INFRA_PATH}/tools/deployment/common/wait-for-pods.sh utility
helm dependency update charts/ceph-utility
cd charts
make ceph-utility
helm upgrade --install ceph-utility ./ceph-utility \
--namespace=utility

7
tools/deployment/utilities/020-compute-utility.sh
View File

@ -1,9 +1,10 @@
#!/bin/bash
set -xe
CURRENT_DIR="$(pwd)"
cd "${CURRENT_DIR}"/charts
make compute-utility
kubectl label nodes --all openstack-helm-node-class=primary --overwrite
helm dependency update charts/compute-utility
cd charts
kubectl label nodes --all openstack-helm-node-class=primary --overwrite
helm upgrade --install compute-utility ./compute-utility --namespace=utility

6
tools/deployment/utilities/030-etcdctl-utility.sh
View File

@ -1,11 +1,9 @@
#!/bin/bash
set -xe
CURRENT_DIR="$(pwd)"
cd "${CURRENT_DIR}"/charts
make etcdctl-utility
kubectl label nodes --all openstack-helm-node-class=primary --overwrite
helm dependency update charts/calicoctl-utility
cd charts
helm upgrade --install etcdctl-utility ./etcdctl-utility --namespace=utility
#NOTE: Validate Deployment info

7
tools/deployment/utilities/040-mysqlclient-utility.sh
View File

@ -1,11 +1,8 @@
#!/bin/bash
set -xe
CURRENT_DIR="$(pwd)"
cd "${CURRENT_DIR}"/charts
make mysqlclient-utility
kubectl label nodes --all openstack-helm-node-class=primary --overwrite
helm dependency update charts/mysqlclient-utility
cd charts
helm upgrade --install mysqlclient-utility ./mysqlclient-utility --namespace=utility
#NOTE: Validate Deployment info

8
tools/deployment/utilities/050-openstack-utility.sh
View File

@ -1,13 +1,9 @@
#!/bin/bash
set -xe
#NOTE: Lint and package chart
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
cd charts
make openstack-utility
kubectl label nodes --all openstack-helm-node-class=primary --overwrite
helm dependency update charts/calicoctl-utility
cd charts
helm upgrade --install openstack-utility ./openstack-utility --namespace=utility
#NOTE: Validate Deployment info

6
tools/deployment/utilities/060-postgresql-utility.sh
View File

@ -1,11 +1,9 @@
#!/bin/bash
set -xe
CURRENT_DIR="$(pwd)"
cd "${CURRENT_DIR}"/charts
kubectl label nodes --all openstack-helm-node-class=primary --overwrite
helm dependency update charts/postgresql-utility
cd charts
helm upgrade --install postgresql-utility ./postgresql-utility --namespace=utility
sleep 60

38
zuul.d/base.yaml
View File

@ -81,6 +81,26 @@
timeout: 300
nodeset: airship-porthole-single-node
- job:
name: airship-porthole-apparmor
description: Checks Pods for Apparmor profile
timeout: 7200
run: tools/gate/playbooks/airship-porthole-gate-runner.yaml
nodeset: airship-porthole-single-node
vars:
gate_scripts:
- ./tools/deployment/apparmor/000-install-packages.sh
- ./tools/deployment/apparmor/001-setup-apparmor-profiles.sh
- ./tools/deployment/apparmor/002-deploy-k8s.sh
- ./tools/deployment/apparmor/005-calicoctl-utility.sh
- ./tools/deployment/apparmor/010-ceph-utility.sh
- ./tools/deployment/apparmor/030-etcdctl-utility.sh
- ./tools/deployment/apparmor/040-mysqlclient-utility.sh
- ./tools/deployment/apparmor/050-openstack-utility.sh
- ./tools/deployment/apparmor/060-postgresql-utility.sh
args:
chdir: "{{ zuul.project.src_dir }}"
- secret:
name: quay_credentials
data:
@ -106,21 +126,3 @@
JXcwlGoK6kvXmYaG2c7yEiH2xNtTzVTai10fsalubQWR4FTmJA5LU9+HatHBa46XLy4gS
vMHs2uJudmxhqLIhs5Er248FVjfxw7le5dPun3ir4J7Mjgypu5y8eLCMZAFIwpeqlJrVU
uih8ByaTlSEh6FBzle7Hb330RjSztC4pX6xiNAmtkpxhF2rEEFS66B/ixwCphQ=
- job:
name: airship-porthole-apparmor
description: Checks Pods for Apparmor profile
timeout: 7200
run: tools/gate/playbooks/airship-porthole-gate-runner.yaml
nodeset: airship-porthole-single-node
vars:
gate_scripts:
- ./tools/deployment/apparmor/000-install-packages.sh
- ./tools/deployment/apparmor/001-setup-apparmor-profiles.sh
- ./tools/deployment/apparmor/002-deploy-k8s.sh
- ./tools/deployment/apparmor/005-calicoctl-utility.sh
- ./tools/deployment/apparmor/010-ceph-utility.sh
- ./tools/deployment/apparmor/030-etcdctl-utility.sh
- ./tools/deployment/apparmor/040-mysqlclient-utility.sh
- ./tools/deployment/apparmor/050-openstack-utility.sh
- ./tools/deployment/apparmor/060-postgresql-utility.sh