Kube-system ingress

Adds the global kube-system ingress controller and updates the
ucp ingress controller to include replica configuration to match
https://review.openstack.org/#/c/533271/
Change-Id: I6e7f4e067ed10ddfc3530893e4b143e50c13f601

manifests/basic_ucp/ArmadaManifest.yaml

@@ -14,4 +14,5 @@ data:
     - dns
     - kubernetes
     - kubernetes-rbac
+    - ingress-system
 ...

manifests/basic_ucp/armada-resources.yaml.sub

@@ -66,6 +66,18 @@ data:
     - kubernetes-controller-manager
     - kubernetes-scheduler
 ---
+schema: armada/ChartGroup/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ingress-system
+  layeringDefinition:
+    abstract: false
+    layer: site
+data:
+  description: Ingress for the site
+  chart_group:
+    - ingress-kube-system
+---
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
@@ -809,4 +821,42 @@ data:
     location: /etc/genesis/armada/assets/charts
     subpath: rbac
   dependencies: []
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ingress-kube-system
+  layeringDefinition:
+    abstract: false
+    layer: site
+data:
+  chart_name: ingress
+  release: ingress
+  namespace: kube-system
+  timeout: 300
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    conf:
+      services:
+        udp:
+          53: kube-system/kube-dns:53
+    deployment:
+      mode: cluster
+      type: DaemonSet
+    network:
+      host_namespace: true
+    pod:
+      replicas:
+        ingress: 2
+        error_page: 2
+  source:
+    type: git
+    location: https://github.com/openstack/openstack-helm
+    subpath: ingress
+    reference: master
+  dependencies:
+    - helm-toolkit
 ...

manifests/basic_ucp/armada.yaml.sub

@@ -615,6 +615,10 @@ data:
     labels:
       node_selector_key: ucp-control-plane
       node_selector_value: enabled
+    pod:
+      replicas:
+        ingress: 2
+        error_page: 2
   source:
     type: git
     location: https://github.com/openstack/openstack-helm