Skip to content

Commit

Permalink
Installing ingress-api for contrail namespace
Browse files Browse the repository at this point in the history
As we are installing all contrail resources in contrail namespace we need a
ingress-api in that namespace as well

Change-Id: Iac158d049dd8077a827cd4a8df611b845cec918f
Partial-Bug: #1755651
  • Loading branch information
madhukar32 committed Mar 14, 2018
1 parent fd9751c commit 8b07199
Show file tree
Hide file tree
Showing 4 changed files with 118 additions and 0 deletions.
57 changes: 57 additions & 0 deletions tools/deployment/developer/common/031-ingress-opencontrail.sh
@@ -0,0 +1,57 @@
#!/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: Pull images and lint chart
make pull-images ingress

#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
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_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_INGRESS_KUBE_SYSTEM}

#NOTE: Deploy namespace ingress
helm upgrade --install ingress-openstack ./ingress \
--namespace=openstack \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}

#NOTE: Deploy ingress in contrail namespace
helm upgrade --install ingress-contrail ./ingress \
--namespace=contrail \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_INGRESS_CONTRAIL}

#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh kube-system
./tools/deployment/common/wait-for-pods.sh openstack
./tools/deployment/common/wait-for-pods.sh contrail

#NOTE: Display info
helm status ingress-kube-system
helm status ingress-openstack
helm status ingress-contrail
1 change: 1 addition & 0 deletions tools/deployment/developer/nfs/031-ingress-opencontrail.sh
59 changes: 59 additions & 0 deletions tools/deployment/multinode/021-ingress-opencontrail.sh
@@ -0,0 +1,59 @@
#!/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: Deploy global ingress
tee /tmp/ingress-kube-system.yaml << EOF
pod:
replicas:
error_page: 2
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_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_INGRESS_KUBE_SYSTEM}

#NOTE: Deploy namespace ingress
tee /tmp/ingress-openstack.yaml << EOF
pod:
replicas:
ingress: 2
error_page: 2
EOF
helm upgrade --install ingress-openstack ./ingress \
--namespace=openstack \
--values=/tmp/ingress-openstack.yaml

helm upgrade --install ingress-contrail ./ingress \
--namespace=contrail \
--values=/tmp/ingress-openstack.yaml

#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh kube-system
./tools/deployment/common/wait-for-pods.sh openstack
./tools/deployment/common/wait-for-pods.sh contrail

#NOTE: Display info
helm status ingress-kube-system
helm status ingress-openstack
helm status ingress-contrail

0 comments on commit 8b07199

Please sign in to comment.