From ba13aab680884ce8f4655969c64dbaadfc84d83e Mon Sep 17 00:00:00 2001 From: AJ Date: Wed, 24 Apr 2024 11:58:29 -0400 Subject: [PATCH 1/2] fix: update remaining port mappings and format yaml --- http.filesystem.config.server/README.md | 19 ++++++++++--------- .../www-updated/zilla.yaml | 19 ++++++++++--------- http.filesystem.config.server/www/zilla.yaml | 19 ++++++++++--------- http.kafka.async/zilla.yaml | 12 ++++++------ http.kafka.cache/zilla.yaml | 12 ++++++------ http.kafka.crud/zilla.yaml | 12 ++++++------ http.kafka.karapace/zilla.yaml | 12 ++++++------ http.kafka.oneway/zilla.yaml | 12 ++++++------ http.kafka.sasl.scram/zilla.yaml | 12 ++++++------ http.kafka.sync/zilla.yaml | 12 ++++++------ http.redpanda.sasl.scram/zilla.yaml | 12 ++++++------ sse.kafka.fanout/zilla.yaml | 12 ++++++------ ws.echo/zilla.yaml | 12 ++++++------ ws.reflect/zilla.yaml | 12 ++++++------ 14 files changed, 96 insertions(+), 93 deletions(-) diff --git a/http.filesystem.config.server/README.md b/http.filesystem.config.server/README.md index 11aa5a4a..af08b4c5 100644 --- a/http.filesystem.config.server/README.md +++ b/http.filesystem.config.server/README.md @@ -92,15 +92,16 @@ bindings: kind: server options: host: 0.0.0.0 - port: 7114 - exit: north_http_server - tcp_server1: - type: tcp - kind: server - options: - host: 0.0.0.0 - port: 7143 - exit: north_tls_server + port: + - 7114 + - 7143 + routes: + - when: + - port: 7114 + exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server north_tls_server: type: tls kind: server diff --git a/http.filesystem.config.server/www-updated/zilla.yaml b/http.filesystem.config.server/www-updated/zilla.yaml index b8c43925..6bb62d18 100644 --- a/http.filesystem.config.server/www-updated/zilla.yaml +++ b/http.filesystem.config.server/www-updated/zilla.yaml @@ -14,15 +14,16 @@ bindings: kind: server options: host: 0.0.0.0 - port: 7114 - exit: north_http_server - tcp_server1: - type: tcp - kind: server - options: - host: 0.0.0.0 - port: 7143 - exit: north_tls_server + port: + - 7114 + - 7143 + routes: + - when: + - port: 7114 + exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server north_tls_server: type: tls kind: server diff --git a/http.filesystem.config.server/www/zilla.yaml b/http.filesystem.config.server/www/zilla.yaml index fe992c5e..7bf4eff4 100644 --- a/http.filesystem.config.server/www/zilla.yaml +++ b/http.filesystem.config.server/www/zilla.yaml @@ -14,15 +14,16 @@ bindings: kind: server options: host: 0.0.0.0 - port: 7114 - exit: north_http_server - tcp_server1: - type: tcp - kind: server - options: - host: 0.0.0.0 - port: 7143 - exit: north_tls_server + port: + - 7114 + - 7143 + routes: + - when: + - port: 7114 + exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server north_tls_server: type: tls kind: server diff --git a/http.kafka.async/zilla.yaml b/http.kafka.async/zilla.yaml index 5ab46eba..345b069f 100644 --- a/http.kafka.async/zilla.yaml +++ b/http.kafka.async/zilla.yaml @@ -18,12 +18,12 @@ bindings: - 7143 - 7114 routes: - - when: - - port: 7143 - exit: north_tls_server - - when: - - port: 7114 - exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server + - when: + - port: 7114 + exit: north_http_server north_tls_server: type: tls kind: server diff --git a/http.kafka.cache/zilla.yaml b/http.kafka.cache/zilla.yaml index d67ee0d6..8dd7b00d 100644 --- a/http.kafka.cache/zilla.yaml +++ b/http.kafka.cache/zilla.yaml @@ -18,12 +18,12 @@ bindings: - 7143 - 7114 routes: - - when: - - port: 7143 - exit: north_tls_server - - when: - - port: 7114 - exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server + - when: + - port: 7114 + exit: north_http_server north_tls_server: type: tls kind: server diff --git a/http.kafka.crud/zilla.yaml b/http.kafka.crud/zilla.yaml index 6167bfcd..a4b86cda 100644 --- a/http.kafka.crud/zilla.yaml +++ b/http.kafka.crud/zilla.yaml @@ -18,12 +18,12 @@ bindings: - 7143 - 7114 routes: - - when: - - port: 7143 - exit: north_tls_server - - when: - - port: 7114 - exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server + - when: + - port: 7114 + exit: north_http_server north_tls_server: type: tls kind: server diff --git a/http.kafka.karapace/zilla.yaml b/http.kafka.karapace/zilla.yaml index 40ada86c..640b767b 100644 --- a/http.kafka.karapace/zilla.yaml +++ b/http.kafka.karapace/zilla.yaml @@ -24,12 +24,12 @@ bindings: - 7143 - 7114 routes: - - when: - - port: 7143 - exit: north_tls_server - - when: - - port: 7114 - exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server + - when: + - port: 7114 + exit: north_http_server north_tls_server: type: tls kind: server diff --git a/http.kafka.oneway/zilla.yaml b/http.kafka.oneway/zilla.yaml index 3723a804..379fbd73 100644 --- a/http.kafka.oneway/zilla.yaml +++ b/http.kafka.oneway/zilla.yaml @@ -18,12 +18,12 @@ bindings: - 7143 - 7114 routes: - - when: - - port: 7143 - exit: north_tls_server - - when: - - port: 7114 - exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server + - when: + - port: 7114 + exit: north_http_server north_tls_server: type: tls kind: server diff --git a/http.kafka.sasl.scram/zilla.yaml b/http.kafka.sasl.scram/zilla.yaml index 9b24df72..e1991113 100644 --- a/http.kafka.sasl.scram/zilla.yaml +++ b/http.kafka.sasl.scram/zilla.yaml @@ -18,12 +18,12 @@ bindings: - 7143 - 7114 routes: - - when: - - port: 7143 - exit: north_tls_server - - when: - - port: 7114 - exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server + - when: + - port: 7114 + exit: north_http_server north_tls_server: type: tls kind: server diff --git a/http.kafka.sync/zilla.yaml b/http.kafka.sync/zilla.yaml index d3b8da28..39ae21b5 100644 --- a/http.kafka.sync/zilla.yaml +++ b/http.kafka.sync/zilla.yaml @@ -30,12 +30,12 @@ bindings: - 7143 - 7114 routes: - - when: - - port: 7143 - exit: north_tls_server - - when: - - port: 7114 - exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server + - when: + - port: 7114 + exit: north_http_server telemetry: metrics: - stream.* diff --git a/http.redpanda.sasl.scram/zilla.yaml b/http.redpanda.sasl.scram/zilla.yaml index 5f8c8eb9..a3371d7b 100644 --- a/http.redpanda.sasl.scram/zilla.yaml +++ b/http.redpanda.sasl.scram/zilla.yaml @@ -18,12 +18,12 @@ bindings: - 7143 - 7114 routes: - - when: - - port: 7143 - exit: north_tls_server - - when: - - port: 7114 - exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server + - when: + - port: 7114 + exit: north_http_server north_tls_server: type: tls kind: server diff --git a/sse.kafka.fanout/zilla.yaml b/sse.kafka.fanout/zilla.yaml index db0f5efe..e795898e 100644 --- a/sse.kafka.fanout/zilla.yaml +++ b/sse.kafka.fanout/zilla.yaml @@ -18,12 +18,12 @@ bindings: - 7143 - 7114 routes: - - when: - - port: 7143 - exit: north_tls_server - - when: - - port: 7114 - exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server + - when: + - port: 7114 + exit: north_http_server north_tls_server: type: tls kind: server diff --git a/ws.echo/zilla.yaml b/ws.echo/zilla.yaml index 8c863a9e..67ee4605 100644 --- a/ws.echo/zilla.yaml +++ b/ws.echo/zilla.yaml @@ -18,12 +18,12 @@ bindings: - 7143 - 7114 routes: - - when: - - port: 7143 - exit: north_tls_server - - when: - - port: 7114 - exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server + - when: + - port: 7114 + exit: north_http_server north_tls_server: type: tls kind: server diff --git a/ws.reflect/zilla.yaml b/ws.reflect/zilla.yaml index 727375cb..44c4588a 100644 --- a/ws.reflect/zilla.yaml +++ b/ws.reflect/zilla.yaml @@ -18,12 +18,12 @@ bindings: - 7143 - 7114 routes: - - when: - - port: 7143 - exit: north_tls_server - - when: - - port: 7114 - exit: north_http_server + - when: + - port: 7143 + exit: north_tls_server + - when: + - port: 7114 + exit: north_http_server north_tls_server: type: tls kind: server From 261d2e6bb230477c275a98c7f7e229c69692e864 Mon Sep 17 00:00:00 2001 From: AJ Date: Wed, 1 May 2024 10:57:19 -0400 Subject: [PATCH 2/2] use single tls binding with port routing --- mqtt.kafka.broker/zilla.yaml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/mqtt.kafka.broker/zilla.yaml b/mqtt.kafka.broker/zilla.yaml index 11bb6134..56e57829 100644 --- a/mqtt.kafka.broker/zilla.yaml +++ b/mqtt.kafka.broker/zilla.yaml @@ -16,28 +16,16 @@ bindings: - when: - port: 7114 exit: north_http_server - - when: - - port: 7143 - exit: north_wss_tls_server - when: - port: 7183 exit: north_mqtt_server - when: + - port: 7143 - port: 7883 - exit: north_mqtts_tls_server + exit: north_tls_server # TLS decrypting - north_mqtts_tls_server: - type: tls - kind: server - vault: my_servers - options: - keys: - - localhost - sni: - - localhost - exit: north_mqtt_server - north_wss_tls_server: + north_tls_server: type: tls kind: server vault: my_servers @@ -46,7 +34,13 @@ bindings: - localhost sni: - localhost - exit: north_http_server + routes: + - when: + - port: 7143 + exit: north_http_server + - when: + - port: 7883 + exit: north_mqtt_server # WebSocket server north_http_server: