Skip to content

Commit

Permalink
Merge pull request #115 from Telecominfraproject/dev-multi-kafka-topics
Browse files Browse the repository at this point in the history
Dev multi kafka topics
  • Loading branch information
Cahb authored Jan 20, 2025
2 parents 950c34b + 429d199 commit 5ecb7d1
Show file tree
Hide file tree
Showing 27 changed files with 7,045 additions and 407 deletions.
21 changes: 21 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ jsonschema = { version = "0.18.0" }
url = { version = "2.5.2" }
nix = { version = "0.29.0", features = ["net"] }
murmur2 = { version = "0.1.0" }
strum = { version = "0.26.3" }
strum_macros = { version = "0.26.3" }

[build-dependencies]
tonic-build = "0.11.0"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ RUN adduser cgw_runner && addgroup cgw_users_group
RUN usermod -a -G cgw_users_group cgw_runner

# CGW create log file under /var directory
# It is required to change direcory owner
# It is required to change directory owner
RUN chown cgw_runner:cgw_users_group "/var"

# Switch to non-root user
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN apt-get update -q -y && \
#RUN usermod -a -G cgw_users_group cgw_runner

# CGW create log file under /var directory
# It is required to change direcory owner
# It is required to change directory owner
#RUN chown cgw_runner:cgw_users_group "/var"

# Switch to non-root user
Expand Down
4 changes: 2 additions & 2 deletions helm/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# cgw

This Helm chart helps to deploy OpenLAN CGW (further on refered as __Gateway__) to the Kubernetes clusters. It is mainly used in [assembly chart](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/cgwchart) as Gateway requires other services as dependencies that are considered in that Helm chart. This chart is purposed to define deployment logic close to the application code itself and define default values that could be overriden during deployment.
This Helm chart helps to deploy OpenLAN CGW (further on referred as __Gateway__) to the Kubernetes clusters. It is mainly used in [assembly chart](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/cgwchart) as Gateway requires other services as dependencies that are considered in that Helm chart. This chart is purposed to define deployment logic close to the application code itself and define default values that could be overridden during deployment.


## TL;DR;
Expand Down Expand Up @@ -71,7 +71,7 @@ The following table lists the configurable parameters of the chart and their def
| public\_env\_variables | hash | Defines list of environment variables to be passed to the Gateway via ConfigMaps | |
| secret\_env\_variables | hash | Defines list of secret environment variables to be passed to the Gateway via secrets | |
| existingCertsSecret | string | Existing Kubernetes secret containing all required certificates and private keys for microservice operation. If set, certificates from `certs` key are ignored | `""` |
| certs | hash | Defines files (keys and certificates) that should be passed to the Gateway (PEM format is adviced to be used) (see `volumes.cgw` on where it is mounted). If `existingCertsSecret` is set, certificates passed this way will not be used. | |
| certs | hash | Defines files (keys and certificates) that should be passed to the Gateway (PEM format is advised to be used) (see `volumes.cgw` on where it is mounted). If `existingCertsSecret` is set, certificates passed this way will not be used. | |
| certsCAs | hash | Defines files with CAs that should be passed to the Gateway (see `volumes.cgw` on where it is mounted) | |


Expand Down
8 changes: 4 additions & 4 deletions run_cgw.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ DEFAULT_REDIS_TLS="no"

DEFAULT_METRICS_PORT=8080

CONTAINTER_CERTS_VOLUME="/etc/cgw/certs"
CONTAINTER_NB_INFRA_CERTS_VOLUME="/etc/cgw/nb_infra/certs"
CONTAINER_CERTS_VOLUME="/etc/cgw/certs"
CONTAINER_NB_INFRA_CERTS_VOLUME="/etc/cgw/nb_infra/certs"
DEFAULT_NB_INFRA_TLS="no"

DEFAULT_ALLOW_CERT_MISMATCH="yes"
Expand Down Expand Up @@ -160,8 +160,8 @@ docker run \
-p $CGW_GRPC_PUBLIC_PORT:$CGW_GRPC_PUBLIC_PORT \
-p $CGW_METRICS_PORT:$CGW_METRICS_PORT \
--cap-add=SYS_PTRACE --security-opt seccomp=unconfined \
-v $CGW_CERTS_PATH:$CONTAINTER_CERTS_VOLUME \
-v $CGW_NB_INFRA_CERTS_PATH:$CONTAINTER_NB_INFRA_CERTS_VOLUME \
-v $CGW_CERTS_PATH:$CONTAINER_CERTS_VOLUME \
-v $CGW_NB_INFRA_CERTS_PATH:$CONTAINER_NB_INFRA_CERTS_VOLUME \
-e CGW_LOG_LEVEL \
-e CGW_ID \
-e CGW_GROUPS_CAPACITY \
Expand Down
Loading

0 comments on commit 5ecb7d1

Please sign in to comment.