Remove unused ingress.sh script
This script used to deploy the ingress controller using OSH-infra ingress chart. We switched all the test jobs to the upstream Ingress-nginx Helm chart some time ago and now we can remove this script. Change-Id: I5282e98eb4387ce05ae4dec4fba8f21550a22617
This commit is contained in:
Vladimir Kozhukalov
parent
643d643b8d
commit
3d748215ec
@ -1,43 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# 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
|
||||
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
|
||||
make -C ${OSH_INFRA_PATH} ingress
|
||||
|
||||
#NOTE: Deploy global ingress
|
||||
helm install ${OSH_INFRA_PATH}/ingress \
|
||||
--namespace=kube-system \
|
||||
--name=ingress-kube-system \
|
||||
--set deployment.mode=cluster \
|
||||
--set deployment.type=DaemonSet \
|
||||
--set network.host_namespace=true \
|
||||
--set network.vip.manage=false \
|
||||
--set network.vip.addr=172.18.0.1/32 \
|
||||
--set conf.services.udp.53='kube-system/kube-dns:53'
|
||||
|
||||
#NOTE: Deploy namespace ingress
|
||||
helm install ${OSH_INFRA_PATH}/ingress \
|
||||
--namespace=ceph \
|
||||
--name=ingress-ceph
|
||||
helm install ${OSH_INFRA_PATH}/ingress \
|
||||
--namespace=openstack \
|
||||
--name=ingress-openstack
|
||||
|
||||
#NOTE: Wait for deploy
|
||||
./tools/deployment/common/wait-for-pods.sh kube-system
|
||||
./tools/deployment/common/wait-for-pods.sh ceph
|
||||
./tools/deployment/common/wait-for-pods.sh openstack
|
||||
@ -1,82 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# 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: Get the over-rides to use
|
||||
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
|
||||
: ${OSH_EXTRA_HELM_ARGS_INGRESS:="$(./tools/deployment/common/get-values-overrides.sh ingress)"}
|
||||
|
||||
#NOTE: Lint and package chart
|
||||
make -C ${HELM_CHART_ROOT_PATH} 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
|
||||
|
||||
touch /tmp/ingress-component.yaml
|
||||
|
||||
if [ -n "${OSH_DEPLOY_MULTINODE}" ]; then
|
||||
tee --append /tmp/ingress-kube-system.yaml << EOF
|
||||
pod:
|
||||
replicas:
|
||||
error_page: 2
|
||||
EOF
|
||||
|
||||
tee /tmp/ingress-component.yaml << EOF
|
||||
pod:
|
||||
replicas:
|
||||
ingress: 2
|
||||
error_page: 2
|
||||
EOF
|
||||
fi
|
||||
|
||||
helm upgrade --install ingress-kube-system ${HELM_CHART_ROOT_PATH}/ingress \
|
||||
--namespace=kube-system \
|
||||
--values=/tmp/ingress-kube-system.yaml \
|
||||
${OSH_EXTRA_HELM_ARGS} \
|
||||
${OSH_EXTRA_HELM_ARGS_INGRESS} \
|
||||
${OSH_EXTRA_HELM_ARGS_INGRESS_KUBE_SYSTEM}
|
||||
|
||||
#NOTE: Wait for deploy
|
||||
./tools/deployment/common/wait-for-pods.sh kube-system
|
||||
|
||||
#NOTE: Deploy namespace ingress
|
||||
helm upgrade --install ingress-openstack ${HELM_CHART_ROOT_PATH}/ingress \
|
||||
--namespace=openstack \
|
||||
--values=/tmp/ingress-component.yaml \
|
||||
--set deployment.cluster.class=nginx \
|
||||
${OSH_EXTRA_HELM_ARGS} \
|
||||
${OSH_EXTRA_HELM_ARGS_INGRESS} \
|
||||
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
||||
|
||||
#NOTE: Wait for deploy
|
||||
./tools/deployment/common/wait-for-pods.sh openstack
|
||||
|
||||
helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \
|
||||
--namespace=ceph \
|
||||
--values=/tmp/ingress-component.yaml \
|
||||
--set deployment.cluster.class=nginx-ceph \
|
||||
${OSH_EXTRA_HELM_ARGS} \
|
||||
${OSH_EXTRA_HELM_ARGS_INGRESS} \
|
||||
${OSH_EXTRA_HELM_ARGS_INGRESS_CEPH}
|
||||
|
||||
#NOTE: Wait for deploy
|
||||
./tools/deployment/common/wait-for-pods.sh ceph
|
||||
@ -196,7 +196,6 @@
|
||||
- ^placement/.*$
|
||||
- ^tools/deployment/common/force-cronjob-run.sh$
|
||||
- ^tools/deployment/common/setup-client.sh$
|
||||
- ^tools/deployment/component/common/ingress.sh$
|
||||
- ^tools/deployment/component/common/openstack.sh$
|
||||
- ^tools/deployment/common/use-it.sh$
|
||||
- ^tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh$
|
||||
@ -272,7 +271,7 @@
|
||||
gate_scripts:
|
||||
- ./tools/deployment/common/prepare-k8s.sh
|
||||
- ./tools/deployment/common/setup-client.sh
|
||||
- ./tools/deployment/component/common/ingress.sh
|
||||
- ./tools/deployment/common/ingress.sh
|
||||
- - ./tools/deployment/component/common/mariadb.sh
|
||||
- ./tools/deployment/component/common/memcached.sh
|
||||
- ./tools/deployment/component/common/rabbitmq.sh
|
||||
@ -300,7 +299,7 @@
|
||||
gate_scripts:
|
||||
- ./tools/deployment/common/prepare-k8s.sh
|
||||
- ./tools/deployment/common/setup-client.sh
|
||||
- ./tools/deployment/component/common/ingress.sh
|
||||
- ./tools/deployment/common/ingress.sh
|
||||
- ./tools/deployment/common/lockdown-netpol.sh
|
||||
- ./tools/deployment/component/common/mariadb.sh
|
||||
- ./tools/deployment/component/common/memcached.sh
|
||||
@ -333,7 +332,7 @@
|
||||
- ./tools/deployment/component/ceph/ceph.sh
|
||||
- ./tools/deployment/component/ceph/ceph-ns-activate.sh
|
||||
- ./tools/deployment/common/lockdown-netpol.sh
|
||||
- ./tools/deployment/component/common/ingress.sh
|
||||
- ./tools/deployment/common/ingress.sh
|
||||
- ./tools/deployment/component/common/mariadb.sh
|
||||
- ./tools/deployment/component/common/memcached.sh
|
||||
- ./tools/deployment/component/common/rabbitmq.sh
|
||||
@ -352,7 +351,7 @@
|
||||
gate_scripts:
|
||||
- ./tools/deployment/common/prepare-k8s.sh
|
||||
- ./tools/deployment/common/setup-client.sh
|
||||
- ./tools/deployment/component/common/ingress.sh
|
||||
- ./tools/deployment/common/ingress.sh
|
||||
- - ./tools/deployment/component/common/rabbitmq.sh
|
||||
- ./tools/deployment/component/common/mariadb.sh
|
||||
- ./tools/deployment/component/common/memcached.sh
|
||||
|
||||
Loading…
Reference in New Issue
Block a user