Page Comparison

...

1. Deploy Ingress ControllerOriginal procedure: https://docs.openstack.org/openstack-helm/latest/install/developer/kubernetes-and-common-setup.html#deploy-the-ingress-controller

   • Modify openstack-helm/tools/deployment/component/common/ingress.sh file as follows:

     • diff

     • --git

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

     • b/tools/deployment/component/common/ingress.sh
       index

     9ae03719

     • 9ae0371..

     884f93fc

     • 3229dcb 100755
       ---

     • a/tools/deployment/component/common/ingress.sh
       +++

     • b/tools/deployment/component/common/ingress.sh
       @@

     • -29,6

     • +29,23

     • @@

     • deployment:
       

     •  

     type

     •  type:

     • DaemonSet
       

     network

     •  network:
       

     •  

     host

     •  host_namespace:

     • true
       +endpoints:
       +

     ingress

     •  ingress:
       +

     •  

     port

     •  port:
       +

     •  

     •  

     http

     •  http:
       +

     •  

     •  

     •  

     default

     •  default:

     • 10080
       +

     •  

     •  

     https

     •  https:
       +

     •  

     •  

     •  

     default

     •  default:

     • 10443
       +

     •  

     •  

     healthz

     •  healthz:
       +

     •  

     •  

     •  

     default

     •  default:

     • 11254
       +

     •  

     •  

     status

     •  status:
       +

     •  

     •  

     •  

     default

     •  default:

     • 11246
       +

     •  

     •  

     stream

     •  stream:
       +

     •  

     •  

     •  

     default

     •  default:

     • 11247
       +

     •  

     •  

     profiler

     •  profiler:
       +

     •  

     •  

     •  

     default

     •  default:

     • 11245
       +

     •  

     •  

     server

     •  server:
       +

     •  

     •  

     •  

     default

     •  default:

     • 18181
       

     EOF
     
     touch

     •  EOF

        touch /tmp/ingress-component.yaml
       @@

     • -48,21

     • +65,21

     • @@

     • pod:
       

     EOF
     fi
     

     •  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

     •  #NOTE:

     • Deploy

     • namespace

     • ingress
       

     helm

     •  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

   • Execute ingress.sh.

     $ cd $HOME/openstack-helm/
     $ ./tools/deployment/component/common/ingress.sh

...