diff --git a/tools/deployment/apparmor/015-ingress.sh b/tools/deployment/apparmor/015-ingress.sh new file mode 100755 index 0000000000..300b12cbc5 --- /dev/null +++ b/tools/deployment/apparmor/015-ingress.sh @@ -0,0 +1,70 @@ +#!/bin/bash + +# Copyright 2017 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 ingress + +: ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_SYSTEM:="$(./tools/deployment/common/get-values-overrides.sh ingress)"} +: ${OSH_INFRA_EXTRA_HELM_ARGS_OPENSTACK:="$(./tools/deployment/common/get-values-overrides.sh ingress)"} +: ${OSH_INFRA_EXTRA_HELM_ARGS_CEPH:="$(./tools/deployment/common/get-values-overrides.sh ingress)"} + +#NOTE: Deploy command +: ${OSH_INFRA_EXTRA_HELM_ARGS:=""} + +#NOTE: Deploy global ingress +tee /tmp/ingress-kube-system.yaml << EOF +deployment: + mode: cluster + type: DaemonSet +network: + host_namespace: true +EOF +helm upgrade --install ingress-kube-system ./ingress \ + --namespace=kube-system \ + --values=/tmp/ingress-kube-system.yaml \ + ${OSH_INFRA_EXTRA_HELM_ARGS} \ + ${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_KUBE_SYSTEM} + +#NOTE: Wait for deploy +./tools/deployment/common/wait-for-pods.sh kube-system + +#NOTE: Display info +helm status ingress-kube-system + +#NOTE: Deploy namespace ingress +helm upgrade --install ingress-osh-infra ./ingress \ + --namespace=osh-infra \ + ${OSH_INFRA_EXTRA_HELM_ARGS} \ + ${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_OPENSTACK} + +#NOTE: Wait for deploy +./tools/deployment/common/wait-for-pods.sh osh-infra + +#NOTE: Display info +helm status ingress-osh-infra + +helm upgrade --install ingress-ceph ./ingress \ + --namespace=ceph \ + ${OSH_INFRA_EXTRA_HELM_ARGS} \ + ${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_CEPH} + +#NOTE: Wait for deploy +./tools/deployment/common/wait-for-pods.sh ceph + +#NOTE: Display info +helm status ingress-ceph diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 998fd186ac..ac6ddc17ac 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -272,6 +272,7 @@ - ./tools/deployment/apparmor/000-install-packages.sh - ./tools/deployment/apparmor/001-setup-apparmor-profiles.sh - ./tools/deployment/apparmor/005-deploy-k8s.sh + - ./tools/deployment/apparmor/015-ingress.sh - ./tools/deployment/apparmor/020-ceph.sh - ./tools/deployment/apparmor/025-ceph-ns-activate.sh - ./tools/deployment/apparmor/030-mariadb.sh