Deploy ingress in osh-infra dev and multinode gates

This deploys the ingress chart in the openstack-helm-infra dev
and multinode gates, which allows for enabling ingresses in the
charts where defined

Change-Id: I055c7b02d9af68f6e3c5eda33d69dd0b8b1b70ca

tools/deployment/common/140-kibana.sh

@@ -21,9 +21,7 @@ make kibana
 
 #NOTE: Deploy command
 helm upgrade --install kibana ./kibana \
-    --namespace=openstack \
-    --set network.kibana.node_port.enabled=true \
-    --set network.kibana.ingress.public=false
+    --namespace=openstack
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/020-ingress.sh

@@ -0,0 +1,45 @@
+#!/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
+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
+
+#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 controllers
+helm upgrade --install ingress-openstack ./ingress \
+  --namespace=openstack
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Display info
+helm status ingress-openstack

tools/deployment/developer/020-lma-nfs-provisioner.sh

@@ -1 +0,0 @@
-../common/020-lma-nfs-provisioner.sh

tools/deployment/developer/030-ldap.sh

@@ -1 +0,0 @@
-../common/030-ldap.sh

tools/deployment/developer/030-lma-nfs-provisioner.sh

@@ -0,0 +1 @@
+../common/030-lma-nfs-provisioner.sh

tools/deployment/developer/040-ldap.sh

@@ -0,0 +1 @@
+../common/040-ldap.sh

tools/deployment/developer/050-prometheus.sh

@@ -20,19 +20,9 @@ set -xe
 make prometheus
 
 #NOTE: Deploy command
-tee /tmp/prometheus.yaml << EOF
-storage:
-  storage_class: openstack-helm-lma-nfs
-network:
-  prometheus:
-    ingress:
-      public: false
-    node_port:
-      enabled: true
-EOF
 helm upgrade --install prometheus ./prometheus \
     --namespace=openstack \
-    --values=/tmp/prometheus.yaml
+    --set storage.storage_class=openstack-helm-lma-nfs
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/060-alertmanager.sh

@@ -20,22 +20,10 @@ set -xe
 make alertmanager
 
 #NOTE: Deploy command
-tee /tmp/prometheus-alertmanager.yaml << EOF
-pod:
-  replicas:
-    alertmanager: 1
-storage:
-  storage_class: openstack-helm-lma-nfs
-network:
-  alertmanager:
-    ingress:
-      public: false
-    node_port:
-      enabled: true
-EOF
 helm upgrade --install prometheus-alertmanager ./prometheus-alertmanager \
     --namespace=openstack \
-    --values=/tmp/prometheus-alertmanager.yaml
+    --set pod.replicas.alertmanager=1 \
+    --set storage.storage_class=openstack-helm-lma-nfs
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/060-kube-state-metrics.sh

@@ -1 +0,0 @@
-../common/060-kube-state-metrics.sh

tools/deployment/developer/070-kube-state-metrics.sh

@@ -0,0 +1 @@
+../common/070-kube-state-metrics.sh

tools/deployment/developer/070-node-exporter.sh

@@ -1 +0,0 @@
-../common/070-node-exporter.sh

tools/deployment/developer/080-node-exporter.sh

@@ -0,0 +1 @@
+../common/080-node-exporter.sh

tools/deployment/developer/080-openstack-exporter.sh

@@ -1 +0,0 @@
-../common/080-openstack-exporter.sh

tools/deployment/developer/090-openstack-exporter.sh

@@ -0,0 +1 @@
+../common/090-openstack-exporter.sh

tools/deployment/developer/100-grafana.sh

@@ -27,7 +27,6 @@ dependencies:
       jobs: null
       services: null
 manifests:
-  ingress: false
   job_db_init: false
   job_db_init_session: false
   job_db_session_sync: false
@@ -41,12 +40,6 @@ conf:
     session:
       provider: file
       provider_config: sessions
-network:
-  grafana:
-    ingress:
-      public: false
-    node_port:
-      enabled: true
 EOF
 helm upgrade --install grafana ./grafana \
     --namespace=openstack \

tools/deployment/developer/110-nagios.sh

@@ -21,9 +21,7 @@ make nagios
 
 #NOTE: Deploy command
 helm upgrade --install nagios ./nagios \
-    --namespace=openstack \
-    --set network.nagios.ingress.public=false \
-    --set network.nagios.node_port.enabled=true
+    --namespace=openstack
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/115-elasticsearch-ldap.sh

@@ -1 +0,0 @@
-../common/115-elasticsearch-ldap.sh

tools/deployment/developer/125-elasticsearch-ldap.sh

@@ -0,0 +1 @@
+../common/125-elasticsearch-ldap.sh

tools/deployment/developer/130-kibana.sh

@@ -1 +0,0 @@
-../common/130-kibana.sh

tools/deployment/developer/140-kibana.sh

@@ -0,0 +1 @@
+../common/140-kibana.sh

tools/deployment/multinode/020-ingress.sh

@@ -0,0 +1,55 @@
+#!/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
+
+#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 controllers
+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
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Display info
+helm status ingress-openstack

tools/deployment/multinode/020-lma-nfs-provisioner.sh

@@ -1 +0,0 @@
-../common/020-lma-nfs-provisioner.sh

tools/deployment/multinode/030-ldap.sh

@@ -1 +0,0 @@
-../common/030-ldap.sh

tools/deployment/multinode/030-lma-nfs-provisioner.sh

@@ -0,0 +1 @@
+../common/030-lma-nfs-provisioner.sh

tools/deployment/multinode/040-ldap.sh

@@ -0,0 +1 @@
+../common/040-ldap.sh

tools/deployment/multinode/060-kube-state-metrics.sh

@@ -1 +0,0 @@
-../common/060-kube-state-metrics.sh

tools/deployment/multinode/070-kube-state-metrics.sh

@@ -0,0 +1 @@
+../common/070-kube-state-metrics.sh

tools/deployment/multinode/070-node-exporter.sh

@@ -1 +0,0 @@
-../common/070-node-exporter.sh

tools/deployment/multinode/080-node-exporter.sh

@@ -0,0 +1 @@
+../common/080-node-exporter.sh

tools/deployment/multinode/080-openstack-exporter.sh

@@ -1 +0,0 @@
-../common/080-openstack-exporter.sh

tools/deployment/multinode/090-openstack-exporter.sh

@@ -0,0 +1 @@
+../common/090-openstack-exporter.sh

tools/deployment/multinode/110-nagios.sh

@@ -22,7 +22,6 @@ make nagios
 #NOTE: Deploy command
 helm upgrade --install nagios ./nagios \
     --namespace=openstack \
-    --set network.nagios.ingress.public=false \
     --set pod.replicas.nagios=3
 
 #NOTE: Wait for deploy

tools/deployment/multinode/115-elasticsearch-ldap.sh

@@ -1 +0,0 @@
-../common/115-elasticsearch-ldap.sh

tools/deployment/multinode/125-elasticsearch-ldap.sh

@@ -0,0 +1 @@
+../common/125-elasticsearch-ldap.sh

tools/deployment/multinode/130-kibana.sh

@@ -1 +0,0 @@
-../common/130-kibana.sh

tools/deployment/multinode/140-kibana.sh

@@ -0,0 +1 @@
+../common/140-kibana.sh