Merge "[STRIMZI] Correction for external Access via Ingress"

3 files changed, 85 insertions, 2 deletions

diff --git a/docs/sections/guides/infra_guides/oom_base_optional_addons.rst b/docs/sections/guides/infra_guides/oom_base_optional_addons.rst
index f795a8664a..b55ed0ef66 100644
--- a/docs/sections/guides/infra_guides/oom_base_optional_addons.rst
+++ b/docs/sections/guides/infra_guides/oom_base_optional_addons.rst
@@ -127,12 +127,20 @@ Install Istio Gateway
 
     > kubectl label namespace istio-ingress istio-injection=enabled
 
-- Install the Istio Gateway chart,replacing the
+- To expose additional ports besides HTTP/S (e.g. for external Kafka access)
+  create an override file (e.g. istio-ingress.yaml)
+
+    .. collapse:: istio-ingress.yaml
+
+      .. include:: ../../resources/yaml/istio-ingress.yaml
+         :code: yaml
+
+- Install the Istio Gateway chart using the override file, replacing the
   <recommended-istio-version> with the version defined in
   the :ref:`versions_table` table::
 
     > helm upgrade -i istio-ingress istio/gateway -n istio-ingress
-    --version <recommended-istio-version> --wait
+    --version <recommended-istio-version> -f ingress-istio.yaml --wait
 
 Kiali Installation
 ==================
diff --git a/docs/sections/resources/yaml/envoyfilter-case.yaml b/docs/sections/resources/yaml/envoyfilter-case.yaml
index c919319ecc..31e80374e2 100644
--- a/docs/sections/resources/yaml/envoyfilter-case.yaml
+++ b/docs/sections/resources/yaml/envoyfilter-case.yaml
@@ -37,4 +37,47 @@ spec:
               stateful_formatter:
                 name: preserve_case
                 typed_config:
+                  '@type': type.googleapis.com/envoy.extensions.http.header_formatters.preserve_case.v3.PreserveCaseFormatterConfig
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: EnvoyFilter
+metadata:
+  name: header-casing-outbound
+  namespace: istio-config
+  #annotations:
+  #  argocd.argoproj.io/hook: PostSync
+spec:
+  configPatches:
+  - applyTo: CLUSTER
+    match:
+      context: SIDECAR_OUTBOUND
+    patch:
+      operation: MERGE
+      value:
+        typed_extension_protocol_options:
+          envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+            '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+            use_downstream_protocol_config:
+              http_protocol_options:
+                header_key_format:
+                  stateful_formatter:
+                    name: preserve_case
+                    typed_config:
+                      '@type': type.googleapis.com/envoy.extensions.http.header_formatters.preserve_case.v3.PreserveCaseFormatterConfig
+  - applyTo: NETWORK_FILTER
+    match:
+      listener:
+        filterChain:
+          filter:
+            name: envoy.filters.network.http_connection_manager
+    patch:
+      operation: MERGE
+      value:
+        typed_config:
+          '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
+          http_protocol_options:
+            header_key_format:
+              stateful_formatter:
+                name: preserve_case
+                typed_config:
                   '@type': type.googleapis.com/envoy.extensions.http.header_formatters.preserve_case.v3.PreserveCaseFormatterConfig
\ No newline at end of file
diff --git a/docs/sections/resources/yaml/istio-ingress.yaml b/docs/sections/resources/yaml/istio-ingress.yaml
new file mode 100644
index 0000000000..5f000d306d
--- /dev/null
+++ b/docs/sections/resources/yaml/istio-ingress.yaml
@@ -0,0 +1,32 @@
+service:
+  # Type of service. Set to "None" to disable the service entirely
+  type: LoadBalancer
+  ports:
+  - name: status-port
+    port: 15021
+    protocol: TCP
+    targetPort: 15021
+  - name: http2
+    port: 80
+    protocol: TCP
+    targetPort: 80
+  - name: https
+    port: 443
+    protocol: TCP
+    targetPort: 443
+  - name: kafka-bootstrap
+    port: 9010
+    targetPort: 9010
+    protocol: TCP
+  - name: kafka-0
+    port: 9000
+    targetPort: 9000
+    protocol: TCP
+  - name: kafka-1
+    port: 9001
+    targetPort: 9001
+    protocol: TCP
+  - name: kafka-2
+    port: 9002
+    targetPort: 9002
+    protocol: TCP
\ No newline at end of file