index 9ae0371..3229dcb 100755

--- a/tools/deployment/component/common/ingress.sh

+++ b/tools/deployment/component/common/ingress.sh

@@ -29,6 +29,23 @@ deployment:

   type: DaemonSet

 network:

   host_namespace: true

+endpoints:

+  ingress:

+    port:

+      http:

+        default: 10080

+      https:

+        default: 10443

+      healthz:

+        default: 11254

+      status:

+        default: 11246

+      stream:

+        default: 11247

+      profiler:

+        default: 11245

+      server:

+        default: 18181

 EOF

 touch /tmp/ingress-component.yaml

@@ -48,21 +65,21 @@ pod:

 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

+#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 \

+  --set deployment.cluster.class=nginx-openstack \

   ${OSH_EXTRA_HELM_ARGS} \

   ${OSH_EXTRA_HELM_ARGS_INGRESS} \

   ${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}

@@ -70,13 +87,13 @@ helm upgrade --install ingress-openstack ${HELM_CHART_ROOT_PATH}/ingress \

 #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

+#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

$ ./tools/deployment/component/common/ingress.sh