From 387fe1e6a1874b5d6edb5da58efd6c336269c5c2 Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 21 Mar 2024 16:13:05 +0100
Subject: [PATCH] Update fb_magma_knf to fix issues in orc8r helm chart

Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 magma/fb_magma_knf/fb_magma_vnfd.yaml         |    2 +-
 .../helm-chart-v3s/orc8r/.helmignore          |   22 +
 .../helm-chart-v3s/orc8r/Chart.yaml           |   10 +
 .../helm-chart-v3s/orc8r/README.md            |  122 ++
 .../orc8r/charts/logging/Chart.yaml           |   11 +
 .../charts/logging/templates/_helpers.tpl     |   45 +
 .../templates/fluentd-daemon.configmap.yaml   |  302 +++
 .../logging/templates/fluentd.daemonset.yaml  |  125 ++
 .../orc8r/charts/logging/values.yaml          |   22 +
 .../orc8r/charts/mariadb/Chart.yaml           |   21 +
 .../orc8r/charts/mariadb/OWNERS               |   16 +
 .../orc8r/charts/mariadb/README.md            |  332 +++
 .../docker-entrypoint-initdb.d/README.md      |    3 +
 .../orc8r/charts/mariadb/templates/NOTES.txt  |   49 +
 .../charts/mariadb/templates/_helpers.tpl     |  289 +++
 .../templates/initialization-configmap.yaml   |   26 +
 .../mariadb/templates/master-configmap.yaml   |   15 +
 .../charts/mariadb/templates/master-pdb.yaml  |   24 +
 .../mariadb/templates/master-statefulset.yaml |  333 +++
 .../charts/mariadb/templates/master-svc.yaml  |   47 +
 .../orc8r/charts/mariadb/templates/role.yaml  |   18 +
 .../charts/mariadb/templates/rolebinding.yaml |   18 +
 .../charts/mariadb/templates/secrets.yaml     |   38 +
 .../mariadb/templates/serviceaccount.yaml     |   11 +
 .../mariadb/templates/servicemonitor.yaml     |   33 +
 .../mariadb/templates/slave-configmap.yaml    |   15 +
 .../charts/mariadb/templates/slave-pdb.yaml   |   26 +
 .../mariadb/templates/slave-statefulset.yaml  |  305 +++
 .../charts/mariadb/templates/slave-svc.yaml   |   48 +
 .../charts/mariadb/templates/test-runner.yaml |   52 +
 .../orc8r/charts/mariadb/templates/tests.yaml |   11 +
 .../charts/mariadb/values-production.yaml     |  562 +++++
 .../orc8r/charts/mariadb/values.schema.json   |  169 ++
 .../orc8r/charts/mariadb/values.yaml          |  564 +++++
 .../orc8r/charts/metrics/.helmignore          |   22 +
 .../orc8r/charts/metrics/Chart.yaml           |   11 +
 .../charts/metrics/templates/_helpers.tpl     |   45 +
 .../templates/alertmanager.deployment.yaml    |   71 +
 .../templates/alertmanager.service.yaml       |   45 +
 .../templates/config-manager.deployment.yaml  |   76 +
 .../templates/config-manager.service.yaml     |   45 +
 .../metrics/templates/grafana.deployment.yaml |   83 +
 .../metrics/templates/grafana.service.yaml    |   45 +
 .../prometheus-cache.deployment.yaml          |   62 +
 .../templates/prometheus-cache.service.yaml   |   44 +
 .../templates/prometheus.deployment.yaml      |  337 +++
 .../metrics/templates/prometheus.service.yaml |   44 +
 .../orc8r/charts/metrics/values.yaml          |  239 +++
 .../orc8r/charts/nms/Chart.yaml               |   11 +
 .../helm-chart-v3s/orc8r/charts/nms/README.md |  109 +
 .../nms/templates/configmap-nginx-etc.yaml    |   21 +
 .../templates/etc/_nginx_proxy_ssl.conf.tpl   |    9 +
 .../charts/nms/templates/helpers/labels.tpl   |   31 +
 .../nms/templates/helpers/resources.tpl       |   34 +
 .../charts/nms/templates/helpers/template.tpl |   16 +
 .../nms/templates/magmalte-deployment.yaml    |  177 ++
 .../nms/templates/magmalte-service.yaml       |   45 +
 .../nms/templates/nginx-proxy-deployment.yaml |   81 +
 .../nms/templates/nginx-proxy-service.yaml    |   45 +
 .../nms/templates/secrets-magmalte-mysql.yaml |   24 +
 .../nms/templates/serviceaccount-rbac.yml     |  105 +
 .../orc8r/charts/nms/values.yaml              |  110 +
 .../orc8r/charts/postgresql/Chart.yaml        |   22 +
 .../orc8r/charts/postgresql/OWNERS            |   18 +
 .../orc8r/charts/postgresql/README.md         |  566 ++++++
 .../charts/postgresql/ci/default-values.yaml  |    1 +
 .../ci/shmvolume-disabled-values.yaml         |    2 +
 .../orc8r/charts/postgresql/files/README.md   |    1 +
 .../charts/postgresql/files/conf.d/README.md  |    4 +
 .../docker-entrypoint-initdb.d/README.md      |    3 +
 .../charts/postgresql/templates/NOTES.txt     |   60 +
 .../charts/postgresql/templates/_helpers.tpl  |  420 ++++
 .../postgresql/templates/configmap.yaml       |   26 +
 .../templates/extended-config-configmap.yaml  |   21 +
 .../templates/initialization-configmap.yaml   |   24 +
 .../templates/metrics-configmap.yaml          |   13 +
 .../postgresql/templates/metrics-svc.yaml     |   26 +
 .../postgresql/templates/networkpolicy.yaml   |   38 +
 .../postgresql/templates/prometheusrule.yaml  |   23 +
 .../charts/postgresql/templates/secrets.yaml  |   23 +
 .../postgresql/templates/serviceaccount.yaml  |   11 +
 .../postgresql/templates/servicemonitor.yaml  |   33 +
 .../templates/statefulset-slaves.yaml         |  299 +++
 .../postgresql/templates/statefulset.yaml     |  458 +++++
 .../postgresql/templates/svc-headless.yaml    |   20 +
 .../charts/postgresql/templates/svc-read.yaml |   32 +
 .../charts/postgresql/templates/svc.yaml      |   38 +
 .../charts/postgresql/values-production.yaml  |  520 +++++
 .../charts/postgresql/values.schema.json      |  103 +
 .../orc8r/charts/postgresql/values.yaml       |  526 +++++
 .../orc8r/charts/secrets/.helmignore          |   22 +
 .../.secrets/certs/admin_operator.key.pem     |   27 +
 .../secrets/.secrets/certs/admin_operator.pem |   18 +
 .../secrets/.secrets/certs/admin_operator.pfx |  Bin 0 -> 2333 bytes
 .../secrets/.secrets/certs/bootstrapper.key   |   27 +
 .../secrets/.secrets/certs/certifier.key      |   27 +
 .../secrets/.secrets/certs/certifier.pem      |   20 +
 .../secrets/.secrets/certs/controller.crt     |   18 +
 .../secrets/.secrets/certs/controller.csr     |   15 +
 .../secrets/.secrets/certs/controller.key     |   27 +
 .../secrets/.secrets/certs/nms_controller.key |   27 +
 .../secrets/.secrets/certs/nms_controller.pem |   18 +
 .../charts/secrets/.secrets/certs/rootCA.key  |   27 +
 .../charts/secrets/.secrets/certs/rootCA.pem  |   20 +
 .../charts/secrets/.secrets/certs/rootCA.srl  |    1 +
 .../charts/secrets/.secrets/certs/vpn_ca.crt  |   18 +
 .../charts/secrets/.secrets/certs/vpn_ca.key  |   27 +
 .../.secrets/configs/orc8r/metricsd.yml       |    9 +
 .../orc8r/charts/secrets/Chart.yaml           |   11 +
 .../orc8r/charts/secrets/README.md            |   51 +
 .../charts/secrets/templates/_helpers.tpl     |   15 +
 .../secrets/templates/certs.secret.yaml       |   18 +
 .../templates/configs-orc8r.secret.yaml       |   20 +
 .../secrets/templates/envdir.secret.yaml      |   18 +
 .../secrets/templates/registry.secret.yaml    |   21 +
 .../orc8r/charts/secrets/values.yaml          |   24 +
 .../helm-chart-v3s/orc8r/fabfile.py           |   76 +
 .../helm-chart-v3s/orc8r/output/icepanel.yml  |  227 +++
 .../helm-chart-v3s/orc8r/output/orc8h.yaml    | 1809 +++++++++++++++++
 .../orc8r/templates/_helpers.tpl              |   22 +
 .../templates/bootstrap-legacy.service.yaml   |   42 +
 .../templates/clientcert-legacy.service.yaml  |   42 +
 .../orc8r/templates/cloudwatch-agent.yaml     |  166 ++
 .../templates/controller.deployment.yaml      |  133 ++
 .../orc8r/templates/controller.secret.yaml    |   25 +
 .../orc8r/templates/controller.service.yaml   |   37 +
 .../orc8r/templates/proxy.deployment.yaml     |   96 +
 .../orc8r/templates/proxy.service.yaml        |   55 +
 .../orc8r/tiller-rbac-config.yaml             |   22 +
 .../helm-chart-v3s/orc8r/values.yaml          |  184 ++
 130 files changed, 12465 insertions(+), 1 deletion(-)
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/.helmignore
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/Chart.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/README.md
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/Chart.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/templates/_helpers.tpl
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/templates/fluentd-daemon.configmap.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/templates/fluentd.daemonset.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/values.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/Chart.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/OWNERS
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/README.md
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/files/docker-entrypoint-initdb.d/README.md
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/NOTES.txt
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/_helpers.tpl
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/initialization-configmap.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-configmap.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-pdb.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-statefulset.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-svc.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/role.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/rolebinding.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/secrets.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/serviceaccount.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/servicemonitor.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-configmap.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-pdb.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-statefulset.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-svc.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/test-runner.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/tests.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/values-production.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/values.schema.json
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/values.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/.helmignore
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/Chart.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/_helpers.tpl
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/alertmanager.deployment.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/alertmanager.service.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/config-manager.deployment.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/config-manager.service.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/grafana.deployment.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/grafana.service.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus-cache.deployment.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus-cache.service.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus.deployment.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus.service.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/values.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/Chart.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/README.md
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/configmap-nginx-etc.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/etc/_nginx_proxy_ssl.conf.tpl
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/helpers/labels.tpl
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/helpers/resources.tpl
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/helpers/template.tpl
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/magmalte-deployment.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/magmalte-service.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/nginx-proxy-deployment.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/nginx-proxy-service.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/secrets-magmalte-mysql.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/serviceaccount-rbac.yml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/values.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/Chart.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/OWNERS
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/README.md
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/ci/default-values.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/ci/shmvolume-disabled-values.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/files/README.md
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/files/conf.d/README.md
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/files/docker-entrypoint-initdb.d/README.md
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/NOTES.txt
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/_helpers.tpl
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/configmap.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/extended-config-configmap.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/initialization-configmap.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/metrics-configmap.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/metrics-svc.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/networkpolicy.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/prometheusrule.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/secrets.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/serviceaccount.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/servicemonitor.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/statefulset-slaves.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/statefulset.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/svc-headless.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/svc-read.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/svc.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/values-production.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/values.schema.json
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/values.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.helmignore
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/admin_operator.key.pem
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/admin_operator.pem
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/admin_operator.pfx
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/bootstrapper.key
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/certifier.key
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/certifier.pem
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/controller.crt
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/controller.csr
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/controller.key
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/nms_controller.key
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/nms_controller.pem
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/rootCA.key
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/rootCA.pem
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/rootCA.srl
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/vpn_ca.crt
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/vpn_ca.key
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/configs/orc8r/metricsd.yml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/Chart.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/README.md
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/_helpers.tpl
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/certs.secret.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/configs-orc8r.secret.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/envdir.secret.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/registry.secret.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/values.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/fabfile.py
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/output/icepanel.yml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/output/orc8h.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/_helpers.tpl
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/bootstrap-legacy.service.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/clientcert-legacy.service.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/cloudwatch-agent.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/controller.deployment.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/controller.secret.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/controller.service.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/proxy.deployment.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/proxy.service.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/tiller-rbac-config.yaml
 create mode 100644 magma/fb_magma_knf/helm-chart-v3s/orc8r/values.yaml

diff --git a/magma/fb_magma_knf/fb_magma_vnfd.yaml b/magma/fb_magma_knf/fb_magma_vnfd.yaml
index 43de81b9..9fca99ca 100644
--- a/magma/fb_magma_knf/fb_magma_vnfd.yaml
+++ b/magma/fb_magma_knf/fb_magma_vnfd.yaml
@@ -11,7 +11,7 @@ vnfd:
     - id: mgmtnet
   kdu:
   - name: orc8r
-    helm-chart: magma/orc8r
+    helm-chart: orc8r
   mgmt-cp: mgmt-ext
   product-name: fb_magma_knf
   provider: ATOS
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/.helmignore b/magma/fb_magma_knf/helm-chart-v3s/orc8r/.helmignore
new file mode 100644
index 00000000..50af0317
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/Chart.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/Chart.yaml
new file mode 100644
index 00000000..c6b5d0a4
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/Chart.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for magma orchestrator
+keywords:
+- magma
+- or8cr
+name: orc8r
+sources:
+- https://github.com/facebookincubator/magma
+version: 0.1.3
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/README.md b/magma/fb_magma_knf/helm-chart-v3s/orc8r/README.md
new file mode 100644
index 00000000..d55659cb
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/README.md
@@ -0,0 +1,122 @@
+# Orchestrator Helm Deployment
+
+[![IcePanel](http://designer.icepanel.io/img/badges/view.svg)](http://staging.designer.icepanel.io?ref=https://raw.githubusercontent.com/felipevicens/fb-magma-helm-chart/master/orc8r/output/icepanel.yml)
+
+The contents of this README have been moved to the "Deploying Orchestrator"
+section of the docs: https://facebookincubator.github.io/magma.
+
+If you're running locally in Minikube, see the section below.
+
+## Configuration
+
+The following table list the configurable parameters of the orchestrator chart and their default values.
+
+| Parameter        | Description     | Default   |
+| ---              | ---             | ---       |
+| `imagePullSecrets` | Reference to one or more secrets to be used when pulling images. | `[]` |
+| `secrets.create` | Create orchestrator secrets. See charts/secrets subchart. | `false` |
+| `secret.certs` | Secret name containing orchestrator certs. | `orc8r-secrets-certs` |
+| `secret.configs` | Secret name containing orchestrator configs. | `orc8r-secrets-configs` |
+| `secret.envdir` | Secret name containing orchestrator envdir. | `orc8r-secrets-envdir` |
+| `proxy.service.annotations` | Annotations to be added to the proxy service. | `{}` |
+| `proxy.service.labels` | Proxy service labels. | `{}` |
+| `proxy.service.type` | Proxy service type. | `ClusterIP` |
+| `proxy.service.port.clientcert.port` | Proxy client certificate service external port. | `9443` |
+| `proxy.service.port.clientcert.targetPort` | Proxy client certificate service internal port. | `9443` |
+| `proxy.service.port.clientcert.nodePort` | Proxy client certificate service node port. | `nil` |
+| `proxy.service.port.open.port` | Proxy open service external port. | `9444` |
+| `proxy.service.port.open.targetPort` | Proxy open service internal port. | `9444` |
+| `proxy.service.port.open.nodePort` | Proxy open service node port. | `nil` |
+| `proxy.image.repository` | Repository for orchestrator proxy image. | `nil` |
+| `proxy.image.tag` | Tag for orchestrator proxy image. | `latest` |
+| `proxy.image.pullPolicy` | Pull policy for orchestrator proxy image. | `IfNotPresent` |
+| `proxy.spec.hostname` | Magma controller domain name. | `""` |
+| `proxy.replicas` | Number of instances to deploy for orchestrator proxy. | `1` |
+| `proxy.resources` | Define resources requests and limits for Pods. | `{}` |
+| `proxy.nodeSelector` | Define which Nodes the Pods are scheduled on. | `{}` |
+| `proxy.tolerations` | If specified, the pod's tolerations. | `[]` |
+| `proxy.affinity` | Assign the orchestrator proxy to run on specific nodes. | `{}` |
+| `controller.service.annotations` | Annotations to be added to the controller service. | `{}` |
+| `controller.service.labels` | Controller service labels. | `{}` |
+| `controller.service.type` | Controller service type. | `ClusterIP` |
+| `controller.service.port` | Controller web service external port. | `8080` |
+| `controller.service.targetPort` | Controller web service internal port. | `8080` |
+| `controller.service.portStart` | Controller service port range start. | `9079` |
+| `controller.service.portEnd` | Controller service inclusive port range end. | `9108` |
+| `controller.image.repository` | Repository for orchestrator controller image. | `nil` |
+| `controller.image.tag` | Tag for orchestrator controller image. | `latest` |
+| `controller.image.pullPolicy` | Pull policy for orchestrator controller image. | `IfNotPresent` |
+| `controller.spec.database.driver` | orc8r database name. | `mysql/postgres` |
+| `controller.spec.database.sql_dialect` | database dialect name. | `maria/psql` |
+| `controller.spec.database.db` | orc8r database name. | `magma` |
+| `controller.spec.database.host` | database host. | `postgresql` |
+| `controller.spec.database.port` | database port. | `5432` |
+| `controller.spec.database.user` | Database username. | `postgres` |
+| `controller.spec.database.pass` | Database password. | `postgres` |
+| `controller.replicas` | Number of instances to deploy for orchestrator controller. | `1` |
+| `controller.resources` | Define resources requests and limits for Pods. | `{}` |
+| `controller.nodeSelector` | Define which Nodes the Pods are scheduled on. | `{}` |
+| `controller.tolerations` | If specified, the pod's tolerations. | `[]` |
+| `controller.affinity` | Assign the orchestrator proxy to run on specific nodes. | `{}` |
+| `nms.magmalte.manifests.configmap` | Enable nms magmalte configmap. | `false` |
+| `nms.magmalte.manifests.secrets` | Enable nms magmalte secrets. | `false` |
+| `nms.magmalte.manifests.deployment` | Enable nms magmalte deployment. | `false` |
+| `nms.magmalte.manifests.service` | Enable nms magmalte service. | `false` |
+| `nms.magmalte.manifests.rbac` | Enable nms magmalte rbac. | `false` |
+| `nms.nginx.manifests.configmap` | Enable nms nginx configmap. | `false` |
+| `nms.nginx.manifests.secrets` | Enable nms nginx secrets. | `false` |
+| `nms.nginx.manifests.deployment` | Enable nms nginx deployment. | `false` |
+| `nms.nginx.manifests.service` | Enable nms nginx service. | `false` |
+| `nms.nginx.manifests.rbac` | Enable nms nginx rbac. | `false` |
+
+## Running in Minikube
+
+For the most part, you'll still follow the docs. Here's what you should do
+before doing that.
+
+- Start Minikube with 8192 MB of memory and 4 CPUs. This example uses Kuberenetes version 1.14.1 and uses [Minikube Hypervisor Driver](https://kubernetes.io/docs/tasks/tools/install-minikube/#install-a-hypervisor):
+```bash
+$ minikube start --memory=8192 --cpus=4 --kubernetes-version=v1.14.1 --mount --mount-string "<path-to-metrics-configs>:/configs"
+```
+
+- Install Postgres Helm chart:
+```bash
+$ helm install \
+    --name postgresql \
+    --namespace magma \
+    --set postgresqlPassword=postgres,postgresqlDatabase=magma,fullnameOverride=postgresql \
+    stable/postgresql
+```
+
+- Copy orchestrator secrets (this replaces the secret management steps for
+the deployment guide):
+```bash
+cd magma/orc8r/cloud/helm/orc8r
+mkdir -p charts/secrets/.secrets/certs
+# You need to add the following files to the certs directory:
+#   bootstrapper.key certifier.key certifier.pem vpn_ca.crt vpn_ca.key
+#   admin_operator.pem admin_operator.key.pem nms_nginx.pem nms_nginx.key.pem
+#   controller.crt controller.key rootCA.pem 
+# The controller.crt, controller.key and rootCA.pem are the certificate info
+# for your public domain name.
+# For local testing, you can do the following after running Orc8r using docker:
+cp -r ../../../../.cache/test_certs/* charts/secrets/.secrets/certs/.
+```
+
+- Add the admin in the datastore:
+```bash
+kubectl exec -it -n magma \
+    $(kubectl get pod -n magma -l app.kubernetes.io/component=controller -o jsonpath="{.items[0].metadata.name}") -- \
+    /var/opt/magma/bin/accessc add-existing -admin -cert /var/opt/magma/certs/admin_operator.pem admin_operator
+```
+
+- Port forward traffic to orchestrator proxy:
+```bash
+kubectl port-forward -n magma svc/orc8r-proxy 9443:9443
+
+# If using minikube, run:
+minikube service orc8r-proxy -n magma --https
+```
+
+- Orchestrator proxy should be reachable via https://localhost:9443 and
+requires magma client certificate to be installed on browser.
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/Chart.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/Chart.yaml
new file mode 100644
index 00000000..011cf5be
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/Chart.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for log aggregation infrastructure
+keywords:
+- magma
+- or8cr
+- logging
+name: logging
+sources:
+- https://github.com/facebookincubator/magma
+version: 0.1.5
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/templates/_helpers.tpl b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/templates/_helpers.tpl
new file mode 100644
index 00000000..05caf11b
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/templates/_helpers.tpl
@@ -0,0 +1,45 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "logging.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "logging.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "logging.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "logging.labels" -}}
+app.kubernetes.io/name: {{ include "logging.name" . }}
+helm.sh/chart: {{ include "logging.chart" . }}
+app.kubernetes.io/instance: orc8r
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/templates/fluentd-daemon.configmap.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/templates/fluentd-daemon.configmap.yaml
new file mode 100644
index 00000000..149f59d9
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/templates/fluentd-daemon.configmap.yaml
@@ -0,0 +1,302 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: orc8r-fluentd-es-configs
+  namespace: {{ .Release.Namespace }}
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
+data:
+  kubernetes.conf: |-
+    <match fluent.**>
+      @type null
+    </match>
+
+    <source>
+      @type tail
+      @id in_tail_container_logs
+      path /var/log/containers/*.log
+      pos_file /var/log/fluentd-containers.log.pos
+      tag kubernetes.*
+      read_from_head true
+      <parse>
+        @type "#{ENV['FLUENT_CONTAINER_TAIL_PARSER_TYPE'] || 'json'}"
+        time_format %Y-%m-%dT%H:%M:%S.%NZ
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_minion
+      path /var/log/salt/minion
+      pos_file /var/log/fluentd-salt.pos
+      tag salt
+      <parse>
+        @type regexp
+        expression /^(?<time>[^ ]* [^ ,]*)[^\[]*\[[^\]]*\]\[(?<severity>[^ \]]*) *\] (?<message>.*)$/
+        time_format %Y-%m-%d %H:%M:%S
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_startupscript
+      path /var/log/startupscript.log
+      pos_file /var/log/fluentd-startupscript.log.pos
+      tag startupscript
+      <parse>
+        @type syslog
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_docker
+      path /var/log/docker.log
+      pos_file /var/log/fluentd-docker.log.pos
+      tag docker
+      <parse>
+        @type regexp
+        expression /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_etcd
+      path /var/log/etcd.log
+      pos_file /var/log/fluentd-etcd.log.pos
+      tag etcd
+      <parse>
+        @type none
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_kubelet
+      multiline_flush_interval 5s
+      path /var/log/kubelet.log
+      pos_file /var/log/fluentd-kubelet.log.pos
+      tag kubelet
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_kube_proxy
+      multiline_flush_interval 5s
+      path /var/log/kube-proxy.log
+      pos_file /var/log/fluentd-kube-proxy.log.pos
+      tag kube-proxy
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_kube_apiserver
+      multiline_flush_interval 5s
+      path /var/log/kube-apiserver.log
+      pos_file /var/log/fluentd-kube-apiserver.log.pos
+      tag kube-apiserver
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_kube_controller_manager
+      multiline_flush_interval 5s
+      path /var/log/kube-controller-manager.log
+      pos_file /var/log/fluentd-kube-controller-manager.log.pos
+      tag kube-controller-manager
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_kube_scheduler
+      multiline_flush_interval 5s
+      path /var/log/kube-scheduler.log
+      pos_file /var/log/fluentd-kube-scheduler.log.pos
+      tag kube-scheduler
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_rescheduler
+      multiline_flush_interval 5s
+      path /var/log/rescheduler.log
+      pos_file /var/log/fluentd-rescheduler.log.pos
+      tag rescheduler
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_glbc
+      multiline_flush_interval 5s
+      path /var/log/glbc.log
+      pos_file /var/log/fluentd-glbc.log.pos
+      tag glbc
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_cluster_autoscaler
+      multiline_flush_interval 5s
+      path /var/log/cluster-autoscaler.log
+      pos_file /var/log/fluentd-cluster-autoscaler.log.pos
+      tag cluster-autoscaler
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+    # Example:
+    # 2017-02-09T00:15:57.992775796Z AUDIT: id="90c73c7c-97d6-4b65-9461-f94606ff825f" ip="104.132.1.72" method="GET" user="kubecfg" as="<self>" asgroups="<lookup>" namespace="default" uri="/api/v1/namespaces/default/pods"
+    # 2017-02-09T00:15:57.993528822Z AUDIT: id="90c73c7c-97d6-4b65-9461-f94606ff825f" response="200"
+    <source>
+      @type tail
+      @id in_tail_kube_apiserver_audit
+      multiline_flush_interval 5s
+      path /var/log/kubernetes/kube-apiserver-audit.log
+      pos_file /var/log/kube-apiserver-audit.log.pos
+      tag kube-apiserver-audit
+      <parse>
+        @type multiline
+        format_firstline /^\S+\s+AUDIT:/
+        # Fields must be explicitly captured by name to be parsed into the record.
+        # Fields may not always be present, and order may change, so this just looks
+        # for a list of key="\"quoted\" value" pairs separated by spaces.
+        # Unknown fields are ignored.
+        # Note: We can't separate query/response lines as format1/format2 because
+        #       they don't always come one after the other for a given query.
+        format1 /^(?<time>\S+) AUDIT:(?: (?:id="(?<id>(?:[^"\\]|\\.)*)"|ip="(?<ip>(?:[^"\\]|\\.)*)"|method="(?<method>(?:[^"\\]|\\.)*)"|user="(?<user>(?:[^"\\]|\\.)*)"|groups="(?<groups>(?:[^"\\]|\\.)*)"|as="(?<as>(?:[^"\\]|\\.)*)"|asgroups="(?<asgroups>(?:[^"\\]|\\.)*)"|namespace="(?<namespace>(?:[^"\\]|\\.)*)"|uri="(?<uri>(?:[^"\\]|\\.)*)"|response="(?<response>(?:[^"\\]|\\.)*)"|\w+="(?:[^"\\]|\\.)*"))*/
+        time_format %Y-%m-%dT%T.%L%Z
+      </parse>
+    </source>
+
+    <filter kubernetes.**orc8r-proxy**>
+      @type parser
+      key_name log
+
+      <parse>
+        @type multi_format
+
+        <pattern>
+          format regexp
+          expression /^(?<time>.*)@\|@(?<remote_addr>.*)@\|@(?<http_host>.*)@\|@(?<server_port>.*)@\|@(?<request>.*)@\|@(?<status>.*)@\|@(?<body_bytes_sent>.*)@\|@(?<request_time>.*)@\|@(?<alpn>.*)@\|@(?<tls_client_serial>.*)@\|@(?<tls_client_subject_name>.*)@\|@(?<tls_session_reused>.*)@\|@(?<tls_sni>.*)@\|@(?<tls_protocol>.*)@\|@(?<tls_cipher>.*)@\|@(?<backend_host>.*)@\|@(?<backend_port>.*)$/
+          time_format %iso8601
+        </pattern>
+
+        <pattern>
+          format none
+        </pattern>
+      </parse>
+    </filter>
+
+    <filter kubernetes.**>
+      @type kubernetes_metadata
+      @id filter_kube_metadata
+    </filter>
+
+  systemd.conf: |-
+    # Logs from systemd-journal for interesting services.
+    <source>
+      @type systemd
+      @id in_systemd_kubelet
+      matches [{ "_SYSTEMD_UNIT": "kubelet.service" }]
+      <storage>
+        @type local
+        persistent true
+        path /var/log/fluentd-journald-kubelet-cursor.json
+      </storage>
+      <entry>
+        fields_strip_underscores true
+      </entry>
+      read_from_head true
+      tag kubelet
+    </source>
+
+    # Logs from docker-systemd
+    <source>
+      @type systemd
+      @id in_systemd_docker
+      matches [{ "_SYSTEMD_UNIT": "docker.service" }]
+      <storage>
+        @type local
+        persistent true
+        path /var/log/fluentd-journald-docker-cursor.json
+      </storage>
+      <entry>
+        fields_strip_underscores true
+      </entry>
+      read_from_head true
+      tag docker.systemd
+    </source>
+
+    # Logs from systemd-journal for interesting services.
+    <source>
+      @type systemd
+      @id in_systemd_bootkube
+      matches [{ "_SYSTEMD_UNIT": "bootkube.service" }]
+      <storage>
+        @type local
+        persistent true
+        path /var/log/fluentd-journald-bootkube-cursor.json
+      </storage>
+      <entry>
+        fields_strip_underscores true
+      </entry>
+      read_from_head true
+      tag bootkube
+    </source>
+
+  output.conf: |-
+    <match **>
+      @type elasticsearch
+      @id out_es
+      @log_level info
+      include_tag_key true
+      host "#{ENV['FLUENT_ELASTICSEARCH_HOST']}"
+      port "#{ENV['FLUENT_ELASTICSEARCH_PORT']}"
+      scheme "#{ENV['FLUENT_ELASTICSEARCH_SCHEME'] || 'https'}"
+      ssl_verify "#{ENV['FLUENT_ELASTICSEARCH_SSL_VERIFY'] || 'false'}"
+      ssl_version "#{ENV['FLUENT_ELASTICSEARCH_SSL_VERSION'] || 'TLSv1'}"
+      reload_connections "#{ENV['FLUENT_ELASTICSEARCH_RELOAD_CONNECTIONS'] || 'false'}"
+      reconnect_on_error "#{ENV['FLUENT_ELASTICSEARCH_RECONNECT_ON_ERROR'] || 'true'}"
+      reload_on_failure "#{ENV['FLUENT_ELASTICSEARCH_RELOAD_ON_FAILURE'] || 'true'}"
+      log_es_400_reason "#{ENV['FLUENT_ELASTICSEARCH_LOG_ES_400_REASON'] || 'false'}"
+      logstash_prefix "#{ENV['FLUENT_ELASTICSEARCH_LOGSTASH_PREFIX'] || 'logstash'}"
+      logstash_format "#{ENV['FLUENT_ELASTICSEARCH_LOGSTASH_FORMAT'] || 'true'}"
+      index_name "#{ENV['FLUENT_ELASTICSEARCH_LOGSTASH_INDEX_NAME'] || 'logstash'}"
+      type_name "#{ENV['FLUENT_ELASTICSEARCH_LOGSTASH_TYPE_NAME'] || 'fluentd'}"
+      <buffer>
+        flush_thread_count "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_FLUSH_THREAD_COUNT'] || '8'}"
+        flush_interval "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_FLUSH_INTERVAL'] || '5s'}"
+        chunk_limit_size "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_CHUNK_LIMIT_SIZE'] || '2M'}"
+        queue_limit_length "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_QUEUE_LIMIT_LENGTH'] || '32'}"
+        retry_max_interval "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_RETRY_MAX_INTERVAL'] || '30'}"
+        retry_forever true
+      </buffer>
+    </match>
+
+  fluent.conf: |-
+    @include /fluentd/etc/kubernetes.conf
+    @include /fluentd/etc/systemd.conf
+    @include /fluentd/etc/output.conf
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/templates/fluentd.daemonset.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/templates/fluentd.daemonset.yaml
new file mode 100644
index 00000000..0db9e57d
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/templates/fluentd.daemonset.yaml
@@ -0,0 +1,125 @@
+{{/*
+Copyright (c) 2018-present, Facebook, Inc.
+All rights reserved.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree. An additional grant
+of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+
+{{/*
+Fluentd daemonset goes in {{ .Release.Namespace }} namespace to have multiple fluentd in the same cluster
+due to the system-node-critical priority class
+*/}}
+{{- if .Values.fluentd_daemon.create }}
+{{- $serviceName := "orc8r-fluentd-daemon" -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: fluentd-daemon
+  namespace: {{ .Release.Namespace }}
+  labels:
+    k8s-app: fluentd-daemon
+    addonmanager.kubernetes.io/mode: Reconcile
+---
+
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: fluentd-daemon
+  labels:
+    k8s-app: fluentd-daemon
+    addonmanager.kubernetes.io/mode: Reconcile
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - "namespaces"
+  - "pods"
+  verbs:
+  - "get"
+  - "watch"
+  - "list"
+---
+
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: fluentd-daemon
+  labels:
+    k8s-app: fluentd-daemon
+    addonmanager.kubernetes.io/mode: Reconcile
+subjects:
+- kind: ServiceAccount
+  name: fluentd-daemon
+  namespace: {{ .Release.Namespace }}
+  apiGroup: ""
+roleRef:
+  kind: ClusterRole
+  name: fluentd-daemon
+  apiGroup: ""
+---
+
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: {{ $serviceName }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/component: fluentd-daemon
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: fluentd-daemon
+  template:
+    metadata:
+      labels:
+        k8s-app: fluentd-daemon
+        app.kubernetes.io/component: fluentd-daemon
+    spec:
+      priorityClassName: system-node-critical
+      serviceAccountName: fluentd-daemon
+
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml . | trimSuffix "\n" | indent 8}}
+      {{- end }}
+
+      tolerations:
+        - key: node-role.kubernetes.io/master
+          effect: NoSchedule
+
+      containers:
+        - name: fluentd-daemon
+          image: {{ required "fluentd_daemon.image.repository must be provided" .Values.fluentd_daemon.image.repository }}:{{ .Values.fluentd_daemon.image.tag }}
+          env:
+            - name:  FLUENT_ELASTICSEARCH_HOST
+              value: {{ .Values.fluentd_daemon.env.elastic_host | quote }}
+            - name:  FLUENT_ELASTICSEARCH_PORT
+              value: {{ .Values.fluentd_daemon.env.elastic_port | quote }}
+            - name: FLUENT_ELASTICSEARCH_SCHEME
+              value: {{ .Values.fluentd_daemon.env.elastic_scheme | quote }}
+          resources:
+{{ toYaml .Values.fluentd_daemon.resources | indent 12 }}
+          volumeMounts:
+            - name: varlog
+              mountPath: /var/log
+            - name: varlibdockercontainers
+              mountPath: /var/lib/docker/containers
+              readOnly: true
+            - name: config-volume
+              mountPath: /fluentd/etc
+
+      terminationGracePeriodSeconds: 30
+
+      volumes:
+        - name: varlog
+          hostPath:
+            path: /var/log
+        - name: varlibdockercontainers
+          hostPath:
+            path: /var/lib/docker/containers
+        - name: config-volume
+          configMap:
+            name: orc8r-fluentd-es-configs
+{{- end}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/values.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/values.yaml
new file mode 100644
index 00000000..dcbd2ea8
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/logging/values.yaml
@@ -0,0 +1,22 @@
+imagePullSecrets: []
+
+fluentd_daemon:
+  create: false
+
+  image:
+    repository: fjvicens/orc8r_fluentd
+    tag: latest
+    pullPolicy: IfNotPresent
+
+  env:
+    elastic_host: "elasticsearch-logging"
+    elastic_port: "9200"
+    elastic_scheme: "http"
+
+  resources: {}
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/Chart.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/Chart.yaml
new file mode 100644
index 00000000..eb70d473
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/Chart.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+appVersion: 10.3.22
+description: Fast, reliable, scalable, and easy to use open-source relational database
+  system. MariaDB Server is intended for mission-critical, heavy-load production systems
+  as well as for embedding into mass-deployed software. Highly available MariaDB cluster.
+home: https://mariadb.org
+icon: https://bitnami.com/assets/stacks/mariadb/img/mariadb-stack-220x234.png
+keywords:
+- mariadb
+- mysql
+- database
+- sql
+- prometheus
+maintainers:
+- email: containers@bitnami.com
+  name: Bitnami
+name: mariadb
+sources:
+- https://github.com/bitnami/bitnami-docker-mariadb
+- https://github.com/prometheus/mysqld_exporter
+version: 7.3.12
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/OWNERS b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/OWNERS
new file mode 100644
index 00000000..f87e0107
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/OWNERS
@@ -0,0 +1,16 @@
+approvers:
+- prydonius
+- tompizmor
+- sameersbn
+- carrodher
+- javsalgar
+- juan131
+- miguelaeh
+reviewers:
+- prydonius
+- tompizmor
+- sameersbn
+- carrodher
+- javsalgar
+- juan131
+- miguelaeh
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/README.md b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/README.md
new file mode 100644
index 00000000..de2f1372
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/README.md
@@ -0,0 +1,332 @@
+# MariaDB
+
+[MariaDB](https://mariadb.org) is one of the most popular database servers in the world. It’s made by the original developers of MySQL and guaranteed to stay open source. Notable users include Wikipedia, Facebook and Google.
+
+MariaDB is developed as open source software and as a relational database it provides an SQL interface for accessing data. The latest versions of MariaDB also include GIS and JSON features.
+
+## TL;DR;
+
+```bash
+$ helm install my-release stable/mariadb
+```
+
+## Introduction
+
+This chart bootstraps a [MariaDB](https://github.com/bitnami/bitnami-docker-mariadb) replication cluster deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+
+Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. This chart has been tested to work with NGINX Ingress, cert-manager, fluentd and Prometheus on top of the [BKPR](https://kubeprod.io/).
+
+## Prerequisites
+
+- Kubernetes 1.12+
+- Helm 2.11+ or Helm 3.0-beta3+
+- PV provisioner support in the underlying infrastructure
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```bash
+$ helm install my-release stable/mariadb
+```
+
+The command deploys MariaDB on the Kubernetes cluster in the default configuration. The [Parameters](#parameters) section lists the parameters that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```bash
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Parameters
+
+The following table lists the configurable parameters of the MariaDB chart and their default values.
+
+| Parameter                                   | Description                                         | Default                                                           |
+|---------------------------------------------|-----------------------------------------------------|-------------------------------------------------------------------|
+| `global.imageRegistry`                      | Global Docker image registry                        | `nil`                                                             |
+| `global.imagePullSecrets`                   | Global Docker registry secret names as an array     | `[]` (does not add image pull secrets to deployed pods)           |
+| `global.storageClass`                       | Global storage class for dynamic provisioning       | `nil`                                                             |
+| `image.registry`                            | MariaDB image registry                              | `docker.io`                                                       |
+| `image.repository`                          | MariaDB Image name                                  | `bitnami/mariadb`                                                 |
+| `image.tag`                                 | MariaDB Image tag                                   | `{TAG_NAME}`                                                      |
+| `image.pullPolicy`                          | MariaDB image pull policy                           | `IfNotPresent`                                                    |
+| `image.pullSecrets`                         | Specify docker-registry secret names as an array    | `[]` (does not add image pull secrets to deployed pods)           |
+| `image.debug`                               | Specify if debug logs should be enabled             | `false`                                                           |
+| `nameOverride`                              | String to partially override mariadb.fullname template with a string (will prepend the release name) | `nil`            |
+| `fullnameOverride`                          | String to fully override mariadb.fullname template with a string                                     | `nil`            |
+| `volumePermissions.enabled`                 | Enable init container that changes volume permissions in the data directory (for cases where the default k8s `runAsUser` and `fsUser` values do not work) | `false`             |
+| `volumePermissions.image.registry`          | Init container volume-permissions image registry    | `docker.io`                                                       |
+| `volumePermissions.image.repository`        | Init container volume-permissions image name        | `bitnami/minideb`                                                 |
+| `volumePermissions.image.tag`               | Init container volume-permissions image tag         | `buster`                                                          |
+| `volumePermissions.image.pullPolicy`        | Init container volume-permissions image pull policy | `Always`                                                          |
+| `volumePermissions.resources`               | Init container resource requests/limit              | `nil`                                                             |
+| `service.type`                              | Kubernetes service type                             | `ClusterIP`                                                       |
+| `service.clusterIp.master`                  | Specific cluster IP for master when service type is cluster IP. Use None for headless service | `nil`                   |
+| `service.clusterIp.slave`                   | Specific cluster IP for slave when service type is cluster IP. Use None for headless service | `nil`                    |
+| `service.port`                              | MySQL service port                                  | `3306`                                                            |
+| `serviceAccount.create`                     | Specifies whether a ServiceAccount should be created | `false`                                                          |
+| `serviceAccount.name`                       | The name of the ServiceAccount to create            | Generated using the mariadb.fullname template                     |
+| `schedulerName`                             | Name of the k8s scheduler (other than default)      | `nil`                                                             |
+| `rbac.create`                               | Create and use RBAC resources                       | `false`                                                           |
+| `securityContext.enabled`                   | Enable security context                             | `true`                                                            |
+| `securityContext.fsGroup`                   | Group ID for the container                          | `1001`                                                            |
+| `securityContext.runAsUser`                 | User ID for the container                           | `1001`                                                            |
+| `existingSecret`                            | Use existing secret for password details (`rootUser.password`, `db.password`, `replication.password` will be ignored and picked up from this secret). The secret has to contain the keys `mariadb-root-password`, `mariadb-replication-password` and `mariadb-password`. | `nil`                        |
+| `rootUser.password`                         | Password for the `root` user. Ignored if existing secret is provided. | _random 10 character alphanumeric string_       |
+| `rootUser.forcePassword`                    | Force users to specify a password                   | `false`                                                           |
+| `rootUser.injectSecretsAsVolume`            | Mount admin user password as a file instead of using an environment variable | `false`                                  |
+| `db.name`                                   | Name for new database to create                     | `my_database`                                                     |
+| `db.user`                                   | Username of new user to create                      | `""`                                                              |
+| `db.password`                               | Password for the new user. Ignored if existing secret is provided.    | _random 10 character alphanumeric string if `db.user` is defined_ |
+| `db.forcePassword`                          | Force users to specify a password                   | `false`                                                           |
+| `db.injectSecretsAsVolume`                  | Mount user password as a file instead of using an environment variable | `false`                                        |
+| `replication.enabled`                       | MariaDB replication enabled                         | `true`                                                            |
+| `replication.user`                          | MariaDB replication user                            | `replicator`                                                      |
+| `replication.password`                      | MariaDB replication user password. Ignored if existing secret is provided. | _random 10 character alphanumeric string_  |
+| `replication.forcePassword`                 | Force users to specify a password                   | `false`                                                           |
+| `replication.injectSecretsAsVolume`         | Mount replication user password as a file instead of using an environment variable | `false`                            |
+| `initdbScripts`                             | Dictionary of initdb scripts                        | `nil`                                                             |
+| `initdbScriptsConfigMap`                    | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`) | `nil`                                             |
+| `master.annotations[].key`                  | key for the the annotation list item                |  `nil`                                                            |
+| `master.annotations[].value`                | value for the the annotation list item              |  `nil`                                                            |
+| `master.extraFlags`                         | MariaDB master additional command line flags        |  `nil`                                                            |
+| `master.affinity`                           | Master affinity (in addition to master.antiAffinity when set)  | `{}`                                                   |
+| `master.antiAffinity`                       | Master pod anti-affinity policy                     | `soft`                                                            |
+| `master.nodeSelector`                       | Master node labels for pod assignment               | `{}`                                                              |
+| `master.tolerations`                        | List of node taints to tolerate (master)            | `[]`                                                              |
+| `master.updateStrategy`                     | Master statefulset update strategy policy           | `RollingUpdate`                                                   |
+| `master.persistence.enabled`                | Enable persistence using PVC                        | `true`                                                            |
+| `master.persistence.existingClaim`          | Provide an existing `PersistentVolumeClaim`         | `nil`                                                             |
+| `master.persistence.subPath`                | Subdirectory of the volume to mount                 | `nil`                                                             |
+| `master.persistence.mountPath`              | Path to mount the volume at                         | `/bitnami/mariadb`                                                |
+| `master.persistence.annotations`            | Persistent Volume Claim annotations                 | `{}`                                                              |
+| `master.persistence.storageClass`           | Persistent Volume Storage Class                     | ``                                                                |
+| `master.persistence.accessModes`            | Persistent Volume Access Modes                      | `[ReadWriteOnce]`                                                 |
+| `master.persistence.size`                   | Persistent Volume Size                              | `8Gi`                                                             |
+| `master.extraInitContainers`                | Additional init containers as a string to be passed to the `tpl` function (master) |                                    |
+| `master.extraEnvVars`                       | Array containing extra env vars to configure MariaDB master replicas          | `nil`                                   |
+| `master.config`                             | Config file for the MariaDB Master server           | `_default values in the values.yaml file_`                        |
+| `master.resources`                          | CPU/Memory resource requests/limits for master node | `{}`                                                              |
+| `master.livenessProbe.enabled`              | Turn on and off liveness probe (master)             | `true`                                                            |
+| `master.livenessProbe.initialDelaySeconds`  | Delay before liveness probe is initiated (master)   | `120`                                                             |
+| `master.livenessProbe.periodSeconds`        | How often to perform the probe (master)             | `10`                                                              |
+| `master.livenessProbe.timeoutSeconds`       | When the probe times out (master)                   | `1`                                                               |
+| `master.livenessProbe.successThreshold`     | Minimum consecutive successes for the probe (master)| `1`                                                               |
+| `master.livenessProbe.failureThreshold`     | Minimum consecutive failures for the probe (master) | `3`                                                               |
+| `master.readinessProbe.enabled`             | Turn on and off readiness probe (master)            | `true`                                                            |
+| `master.readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated (master)  | `30`                                                              |
+| `master.readinessProbe.periodSeconds`       | How often to perform the probe (master)             | `10`                                                              |
+| `master.readinessProbe.timeoutSeconds`      | When the probe times out (master)                   | `1`                                                               |
+| `master.readinessProbe.successThreshold`    | Minimum consecutive successes for the probe (master)| `1`                                                               |
+| `master.readinessProbe.failureThreshold`    | Minimum consecutive failures for the probe (master) | `3`                                                               |
+| `master.podDisruptionBudget.enabled`        | If true, create a pod disruption budget for master pods. | `false`                                                      |
+| `master.podDisruptionBudget.minAvailable`   | Minimum number / percentage of pods that should remain scheduled | `1`                                                  |
+| `master.podDisruptionBudget.maxUnavailable` | Maximum number / percentage of pods that may be made unavailable | `nil`                                                |
+| `master.service.annotations`                | Master service annotations                          | `{}`                                                              |
+| `slave.replicas`                            | Desired number of slave replicas                    | `1`                                                               |
+| `slave.annotations[].key`                   | key for the the annotation list item                | `nil`                                                             |
+| `slave.annotations[].value`                 | value for the the annotation list item              | `nil`                                                             |
+| `slave.extraFlags`                          | MariaDB slave additional command line flags         | `nil`                                                             |
+| `slave.affinity`                            | Slave affinity (in addition to slave.antiAffinity when set) | `{}`                                                      |
+| `slave.antiAffinity`                        | Slave pod anti-affinity policy                      | `soft`                                                            |
+| `slave.nodeSelector`                        | Slave node labels for pod assignment                | `{}`                                                              |
+| `slave.tolerations`                         | List of node taints to tolerate for (slave)         | `[]`                                                              |
+| `slave.updateStrategy`                      | Slave statefulset update strategy policy            | `RollingUpdate`                                                   |
+| `slave.persistence.enabled`                 | Enable persistence using a `PersistentVolumeClaim`  | `true`                                                            |
+| `slave.persistence.annotations`             | Persistent Volume Claim annotations                 | `{}`                                                              |
+| `slave.persistence.storageClass`            | Persistent Volume Storage Class                     | ``                                                                |
+| `slave.persistence.accessModes`             | Persistent Volume Access Modes                      | `[ReadWriteOnce]`                                                 |
+| `slave.persistence.size`                    | Persistent Volume Size                              | `8Gi`                                                             |
+| `slave.extraInitContainers`                 | Additional init containers as a string to be passed to the `tpl` function (slave)  | `nil`                              |
+| `slave.extraEnvVars`                        | Array containing extra env vars to configure MariaDB slave replicas          | `nil`                                    |
+| `slave.config`                              | Config file for the MariaDB Slave replicas          | `_default values in the values.yaml file_`                        |
+| `slave.resources`                           | CPU/Memory resource requests/limits for slave node  | `{}`                                                              |
+| `slave.livenessProbe.enabled`               | Turn on and off liveness probe (slave)              | `true`                                                            |
+| `slave.livenessProbe.initialDelaySeconds`   | Delay before liveness probe is initiated (slave)    | `120`                                                             |
+| `slave.livenessProbe.periodSeconds`         | How often to perform the probe (slave)              | `10`                                                              |
+| `slave.livenessProbe.timeoutSeconds`        | When the probe times out (slave)                    | `1`                                                               |
+| `slave.livenessProbe.successThreshold`      | Minimum consecutive successes for the probe (slave) | `1`                                                               |
+| `slave.livenessProbe.failureThreshold`      | Minimum consecutive failures for the probe (slave)  | `3`                                                               |
+| `slave.readinessProbe.enabled`              | Turn on and off readiness probe (slave)             | `true`                                                            |
+| `slave.readinessProbe.initialDelaySeconds`  | Delay before readiness probe is initiated (slave)   | `45`                                                              |
+| `slave.readinessProbe.periodSeconds`        | How often to perform the probe (slave)              | `10`                                                              |
+| `slave.readinessProbe.timeoutSeconds`       | When the probe times out (slave)                    | `1`                                                               |
+| `slave.readinessProbe.successThreshold`     | Minimum consecutive successes for the probe (slave) | `1`                                                               |
+| `slave.readinessProbe.failureThreshold`     | Minimum consecutive failures for the probe (slave)  | `3`                                                               |
+| `slave.podDisruptionBudget.enabled`         | If true, create a pod disruption budget for slave pods. | `false`                                                       |
+| `slave.podDisruptionBudget.minAvailable`    | Minimum number / percentage of pods that should remain scheduled | `1`                                                  |
+| `slave.podDisruptionBudget.maxUnavailable`  | Maximum number / percentage of pods that may be made unavailable | `nil`                                                |
+| `slave.service.annotations`                 | Slave service annotations                           | `{}`                                                              |
+| `metrics.enabled`                           | Start a side-car prometheus exporter                | `false`                                                           |
+| `metrics.image.registry`                    | Exporter image registry                             | `docker.io`                                                       |
+| `metrics.image.repository`                  | Exporter image name                                 | `bitnami/mysqld-exporter`                                         |
+| `metrics.image.tag`                         | Exporter image tag                                  | `{TAG_NAME}`                                                      |
+| `metrics.image.pullPolicy`                  | Exporter image pull policy                          | `IfNotPresent`                                                    |
+| `metrics.resources`                         | Exporter resource requests/limit                    | `nil`                                                             |
+| `metrics.extraArgs.master`                  | Extra args to be passed to mysqld_exporter          | `[]`                                                              |
+| `metrics.extraArgs.slave`                   | Extra args to be passed to mysqld_exporter          | `[]`                                                              |
+| `metrics.livenessProbe.enabled`             | Turn on and off liveness probe (metrics)              | `true`                                                          |
+| `metrics.livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated (metrics)    | `120`                                                           |
+| `metrics.livenessProbe.periodSeconds`       | How often to perform the probe (metrics)              | `10`                                                            |
+| `metrics.livenessProbe.timeoutSeconds`      | When the probe times out (metrics)                    | `1`                                                             |
+| `metrics.livenessProbe.successThreshold`    | Minimum consecutive successes for the probe (metrics) | `1`                                                             |
+| `metrics.livenessProbe.failureThreshold`    | Minimum consecutive failures for the probe (metrics)  | `3`                                                             |
+| `metrics.readinessProbe.enabled`            | Turn on and off readiness probe (metrics)             | `true`                                                          |
+| `metrics.readinessProbe.initialDelaySeconds`| Delay before readiness probe is initiated (metrics)   | `30`                                                            |
+| `metrics.readinessProbe.periodSeconds`      | How often to perform the probe (metrics)              | `10`                                                            |
+| `metrics.readinessProbe.timeoutSeconds`     | When the probe times out (metrics)                    | `1`                                                             |
+| `metrics.readinessProbe.successThreshold`   | Minimum consecutive successes for the probe (metrics) | `1`                                                             |
+| `metrics.readinessProbe.failureThreshold`   | Minimum consecutive failures for the probe (metrics)  | `3`                                                             |
+| `metrics.serviceMonitor.enabled`            | if `true`, creates a Prometheus Operator ServiceMonitor (also requires `metrics.enabled` to be `true`)  | `false`       |
+| `metrics.serviceMonitor.namespace`          | Optional namespace which Prometheus is running in     | `nil`                                                           |
+| `metrics.serviceMonitor.interval`           | How frequently to scrape metrics (use by default, falling back to Prometheus' default)  | `nil`                         |
+| `metrics.serviceMonitor.selector`           | Default to kube-prometheus install (CoreOS recommended), but should be set according to Prometheus install   | `{ prometheus: kube-prometheus }` |
+| `tests.enabled`                             | Provide tests to check if connect and authentication is possible | `true`                                               |
+| `tests.resources`                           | Resource definition for the test-runner pod           | `nil`                                                           |
+| `tests.testFramework.image.registry`        | Test framework image registry (init container)        | `docker.io`                                                     |
+| `tests.testFramework.image.repository`      | Test framework image name                             | `dduportal/bats`                                                |
+| `tests.testFramework.image.tag`             | Test framework image tag                              | `0.4.0`                                                         |
+| `tests.testFramework.resources`             | Resource definition for the test framework            | `nil`                                                           |
+
+The above parameters map to the env variables defined in [bitnami/mariadb](http://github.com/bitnami/bitnami-docker-mariadb). For more information please refer to the [bitnami/mariadb](http://github.com/bitnami/bitnami-docker-mariadb) image documentation.
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```bash
+$ helm install my-release \
+  --set rootUser.password=secretpassword,db.user=app_database \
+    stable/mariadb
+```
+
+The above command sets the MariaDB `root` account password to `secretpassword`. Additionally it creates a database named `my_database`.
+
+Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
+
+```bash
+$ helm install my-release -f values.yaml stable/mariadb
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)
+
+## Configuration and installation details
+
+### [Rolling VS Immutable tags](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/)
+
+It is strongly recommended to use immutable tags in a production environment. This ensures your deployment does not change automatically if the same tag is updated with a different image.
+
+Bitnami will release a new chart updating its containers if a new version of the main container, significant changes, or critical vulnerabilities exist.
+
+### Production configuration
+
+This chart includes a `values-production.yaml` file where you can find some parameters oriented to production configuration in comparison to the regular `values.yaml`. You can use this file instead of the default one.
+
+- Force users to specify a password and mount secrets as volumes instead of using environment variables:
+
+```diff
+- rootUser.forcePassword: false
+- rootUser.injectSecretsAsVolume: false
++ rootUser.forcePassword: true
++ rootUser.injectSecretsAsVolume: true
+- db.forcePassword: false
+- db.injectSecretsAsVolume: false
++ db.forcePassword: true
++ db.injectSecretsAsVolume: true
+- replication.forcePassword: false
+- replication.injectSecretsAsVolume: false
++ replication.forcePassword: true
++ replication.injectSecretsAsVolume: true
+```
+
+- Desired number of slave replicas:
+
+```diff
+- slave.replicas: 1
++ slave.replicas: 2
+```
+
+- Start a side-car prometheus exporter:
+
+```diff
+- metrics.enabled: false
++ metrics.enabled: true
+```
+
+### Initialize a fresh instance
+
+The [Bitnami MariaDB](https://github.com/bitnami/bitnami-docker-mariadb) image allows you to use your custom scripts to initialize a fresh instance. In order to execute the scripts, they must be located inside the chart folder `files/docker-entrypoint-initdb.d` so they can be consumed as a ConfigMap.
+
+Alternatively, you can specify custom scripts using the `initdbScripts` parameter as dict.
+
+In addition to these options, you can also set an external ConfigMap with all the initialization scripts. This is done by setting the `initdbScriptsConfigMap` parameter. Note that this will override the two previous options.
+
+The allowed extensions are `.sh`, `.sql` and `.sql.gz`.
+
+### Extra Init Containers
+
+The feature allows for specifying a template string for a initContainer in the master/slave pod. Usecases include situations when you need some pre-run setup. For example, in IKS (IBM Cloud Kubernetes Service), non-root users do not have write permission on the volume mount path for NFS-powered file storage. So, you could use a initcontainer to `chown` the mount. See a example below, where we add an initContainer on the master pod that reports to an external resource that the db is going to starting.
+`values.yaml`
+```yaml
+master:
+  extraInitContainers: |
+    - name: initcontainer
+      image: bitnami/minideb:buster
+      command: ["/bin/sh", "-c"]
+      args:
+        - install_packages curl && curl http://api-service.local/db/starting;
+```
+
+## Persistence
+
+The [Bitnami MariaDB](https://github.com/bitnami/bitnami-docker-mariadb) image stores the MariaDB data and configurations at the `/bitnami/mariadb` path of the container.
+
+The chart mounts a [Persistent Volume](kubernetes.io/docs/user-guide/persistent-volumes/) volume at this location. The volume is created using dynamic volume provisioning, by default. An existing PersistentVolumeClaim can be defined.
+
+### Adjust permissions of persistent volume mountpoint
+
+As the image run as non-root by default, it is necessary to adjust the ownership of the persistent volume so that the container can write data into it.
+
+By default, the chart is configured to use Kubernetes Security Context to automatically change the ownership of the volume. However, this feature does not work in all Kubernetes distributions.
+As an alternative, this chart supports using an initContainer to change the ownership of the volume before mounting it in the final destination.
+
+You can enable this initContainer by setting `volumePermissions.enabled` to `true`.
+
+## Upgrading
+
+It's necessary to set the `rootUser.password` parameter when upgrading for readiness/liveness probes to work properly. When you install this chart for the first time, some notes will be displayed providing the credentials you must use under the 'Administrator credentials' section. Please note down the password and run the command below to upgrade your chart:
+
+```bash
+$ helm upgrade my-release stable/mariadb --set rootUser.password=[ROOT_PASSWORD]
+```
+
+| Note: you need to substitute the placeholder _[ROOT_PASSWORD]_ with the value obtained in the installation notes.
+
+### To 7.0.0
+
+Helm performs a lookup for the object based on its group (apps), version (v1), and kind (Deployment). Also known as its GroupVersionKind, or GVK. Changing the GVK is considered a compatibility breaker from Kubernetes' point of view, so you cannot "upgrade" those objects to the new GVK in-place. Earlier versions of Helm 3 did not perform the lookup correctly which has since been fixed to match the spec.
+
+In https://github.com/helm/charts/pull/17308 the `apiVersion` of the statefulset resources was updated to `apps/v1` in tune with the api's deprecated, resulting in compatibility breakage.
+
+This major version bump signifies this change.
+
+### To 6.0.0
+
+MariaDB version was updated from 10.1 to 10.3, there are no changes in the chart itself. According to the official documentation, upgrading from 10.1 should be painless. However, there are some things that have changed which could affect an upgrade:
+
+- [Incompatible changes upgrading from MariaDB 10.1 to MariaDB 10.2](https://mariadb.com/kb/en/library/upgrading-from-mariadb-101-to-mariadb-102//#incompatible-changes-between-101-and-102)
+- [Incompatible changes upgrading from MariaDB 10.2 to MariaDB 10.3](https://mariadb.com/kb/en/library/upgrading-from-mariadb-102-to-mariadb-103/#incompatible-changes-between-102-and-103)
+
+### To 5.0.0
+
+Backwards compatibility is not guaranteed unless you modify the labels used on the chart's deployments.
+Use the workaround below to upgrade from versions previous to 5.0.0. The following example assumes that the release name is mariadb:
+
+```console
+$ kubectl delete statefulset opencart-mariadb --cascade=false
+```
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/files/docker-entrypoint-initdb.d/README.md b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/files/docker-entrypoint-initdb.d/README.md
new file mode 100644
index 00000000..aaddde30
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/files/docker-entrypoint-initdb.d/README.md
@@ -0,0 +1,3 @@
+You can copy here your custom .sh, .sql or .sql.gz file so they are executed during the first boot of the image.
+
+More info in the [bitnami-docker-mariadb](https://github.com/bitnami/bitnami-docker-mariadb#initializing-a-new-instance) repository.
\ No newline at end of file
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/NOTES.txt b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/NOTES.txt
new file mode 100644
index 00000000..b69ecefc
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/NOTES.txt
@@ -0,0 +1,49 @@
+
+Please be patient while the chart is being deployed
+
+Tip:
+
+  Watch the deployment status using the command: kubectl get pods -w --namespace {{ .Release.Namespace }} -l release={{ .Release.Name }}
+
+Services:
+
+  echo Master: {{ template "mariadb.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }}
+{{- if .Values.replication.enabled }}
+  echo Slave:  {{ template "slave.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }}
+{{- end }}
+
+Administrator credentials:
+
+  Username: root
+  Password : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.secretName" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode)
+
+To connect to your database:
+
+  1. Run a pod that you can use as a client:
+
+      kubectl run {{ template "mariadb.fullname" . }}-client --rm --tty -i --restart='Never' --image  {{ template "mariadb.image" . }} --namespace {{ .Release.Namespace }} --command -- bash
+
+  2. To connect to master service (read/write):
+
+      mysql -h {{ template "mariadb.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local -uroot -p {{ .Values.db.name }}
+
+{{- if .Values.replication.enabled }}
+
+  3. To connect to slave service (read-only):
+
+      mysql -h {{ template "slave.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local -uroot -p {{ .Values.db.name }}
+{{- end }}
+
+To upgrade this helm chart:
+
+  1. Obtain the password as described on the 'Administrator credentials' section and set the 'rootUser.password' parameter as shown below:
+
+      ROOT_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.secretName" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode)
+      helm upgrade {{ .Release.Name }} stable/mariadb --set rootUser.password=$ROOT_PASSWORD
+
+{{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }}
+
+WARNING: Rolling tag detected ({{ .Values.image.repository }}:{{ .Values.image.tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment.
++info https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/
+
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/_helpers.tpl b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/_helpers.tpl
new file mode 100644
index 00000000..a24be738
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/_helpers.tpl
@@ -0,0 +1,289 @@
+{{/*
+Return the appropriate apiVersion for statefulset.
+*/}}
+{{- define "mariadb.statefulset.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "apps/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "mariadb.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "mariadb.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- printf .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "master.fullname" -}}
+{{- if .Values.replication.enabled -}}
+{{- printf "%s-%s" (include "mariadb.fullname" .) "master" | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- include "mariadb.fullname" . -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "slave.fullname" -}}
+{{- printf "%s-%s" (include "mariadb.fullname" .) "slave" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "mariadb.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Return the proper MariaDB image name
+*/}}
+{{- define "mariadb.image" -}}
+{{- $registryName := .Values.image.registry -}}
+{{- $repositoryName := .Values.image.repository -}}
+{{- $tag := .Values.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper metrics image name
+*/}}
+{{- define "mariadb.metrics.image" -}}
+{{- $registryName := .Values.metrics.image.registry -}}
+{{- $repositoryName := .Values.metrics.image.repository -}}
+{{- $tag := .Values.metrics.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{ template "mariadb.initdbScriptsCM" . }}
+{{/*
+Get the initialization scripts ConfigMap name.
+*/}}
+{{- define "mariadb.initdbScriptsCM" -}}
+{{- if .Values.initdbScriptsConfigMap -}}
+{{- printf "%s" .Values.initdbScriptsConfigMap -}}
+{{- else -}}
+{{- printf "%s-init-scripts" (include "master.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "mariadb.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "mariadb.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper Docker Image Registry Secret Names
+*/}}
+{{- define "mariadb.imagePullSecrets" -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
+Also, we can not use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+{{- if .Values.global.imagePullSecrets }}
+imagePullSecrets:
+{{- range .Values.global.imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.metrics.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.volumePermissions.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.metrics.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.volumePermissions.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper test image name
+*/}}
+{{- define "mariadb.tests.testFramework.image" -}}
+{{- $registryName := .Values.tests.testFramework.image.registry -}}
+{{- $repositoryName := .Values.tests.testFramework.image.repository -}}
+{{- $tag := .Values.tests.testFramework.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper image name (for the init container volume-permissions image)
+*/}}
+{{- define "mariadb.volumePermissions.image" -}}
+{{- $registryName := .Values.volumePermissions.image.registry -}}
+{{- $repositoryName := .Values.volumePermissions.image.repository -}}
+{{- $tag := .Values.volumePermissions.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return  the proper Storage Class for the master
+*/}}
+{{- define "mariadb.master.storageClass" -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
+*/}}
+{{- if .Values.global -}}
+    {{- if .Values.global.storageClass -}}
+        {{- if (eq "-" .Values.global.storageClass) -}}
+            {{- printf "storageClassName: \"\"" -}}
+        {{- else }}
+            {{- printf "storageClassName: %s" .Values.global.storageClass -}}
+        {{- end -}}
+    {{- else -}}
+        {{- if .Values.master.persistence.storageClass -}}
+              {{- if (eq "-" .Values.master.persistence.storageClass) -}}
+                  {{- printf "storageClassName: \"\"" -}}
+              {{- else }}
+                  {{- printf "storageClassName: %s" .Values.master.persistence.storageClass -}}
+              {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- else -}}
+    {{- if .Values.master.persistence.storageClass -}}
+        {{- if (eq "-" .Values.master.persistence.storageClass) -}}
+            {{- printf "storageClassName: \"\"" -}}
+        {{- else }}
+            {{- printf "storageClassName: %s" .Values.master.persistence.storageClass -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return  the proper Storage Class for the slave
+*/}}
+{{- define "mariadb.slave.storageClass" -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
+*/}}
+{{- if .Values.global -}}
+    {{- if .Values.global.storageClass -}}
+        {{- if (eq "-" .Values.global.storageClass) -}}
+            {{- printf "storageClassName: \"\"" -}}
+        {{- else }}
+            {{- printf "storageClassName: %s" .Values.global.storageClass -}}
+        {{- end -}}
+    {{- else -}}
+        {{- if .Values.slave.persistence.storageClass -}}
+              {{- if (eq "-" .Values.slave.persistence.storageClass) -}}
+                  {{- printf "storageClassName: \"\"" -}}
+              {{- else }}
+                  {{- printf "storageClassName: %s" .Values.slave.persistence.storageClass -}}
+              {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- else -}}
+    {{- if .Values.slave.persistence.storageClass -}}
+        {{- if (eq "-" .Values.slave.persistence.storageClass) -}}
+            {{- printf "storageClassName: \"\"" -}}
+        {{- else }}
+            {{- printf "storageClassName: %s" .Values.slave.persistence.storageClass -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the name of the Secret used to store the passwords
+*/}}
+{{- define "mariadb.secretName" -}}
+{{- if .Values.existingSecret -}}
+{{ .Values.existingSecret }}
+{{- else -}}
+{{ template "mariadb.fullname" . -}}
+{{- end -}}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/initialization-configmap.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/initialization-configmap.yaml
new file mode 100644
index 00000000..172e6ae0
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/initialization-configmap.yaml
@@ -0,0 +1,26 @@
+{{- if and (or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScripts) (not .Values.initdbScriptsConfigMap) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "master.fullname" . }}-init-scripts
+  labels:
+    app: "{{ template "mariadb.name" . }}"
+    chart: "{{ template "mariadb.chart" . }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+    component: "master"
+{{- if and (.Files.Glob "files/docker-entrypoint-initdb.d/*.sql.gz") (not .Values.initdbScriptsConfigMap) }}
+binaryData:
+{{- $root := . }}
+{{- range $path, $bytes := .Files.Glob "files/docker-entrypoint-initdb.d/*.sql.gz" }}
+  {{ base $path }}: {{ $root.Files.Get $path | b64enc | quote }}
+{{- end }}
+{{- end }}
+data:
+{{- if and (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql}") (not .Values.initdbScriptsConfigMap) }}
+{{ (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql}").AsConfig | indent 2 }}
+{{- end }}
+{{- with .Values.initdbScripts }}
+{{ toYaml . | indent 2 }}
+{{- end }}
+{{ end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-configmap.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-configmap.yaml
new file mode 100644
index 00000000..08bc10c2
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-configmap.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.master.config }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "master.fullname" . }}
+  labels:
+    app: "{{ template "mariadb.name" . }}"
+    component: "master"
+    chart: "{{ template "mariadb.chart" . }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+data:
+  my.cnf: |-
+{{ .Values.master.config | indent 4 }}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-pdb.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-pdb.yaml
new file mode 100644
index 00000000..b162ac0a
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-pdb.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.master.podDisruptionBudget.enabled }}
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "mariadb.fullname" . }}
+  labels:
+    app: "{{ template "mariadb.name" . }}"
+    component: "master"
+    chart: {{ template "mariadb.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+spec:
+{{- if .Values.master.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.master.podDisruptionBudget.minAvailable }}
+{{- end }}
+{{- if .Values.master.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.master.podDisruptionBudget.maxUnavailable }}
+{{- end }}
+  selector:
+    matchLabels:
+      app: "{{ template "mariadb.name" . }}"
+      component: "master"
+      release: {{ .Release.Name | quote }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-statefulset.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-statefulset.yaml
new file mode 100644
index 00000000..eefb6bbb
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-statefulset.yaml
@@ -0,0 +1,333 @@
+apiVersion: {{ template "mariadb.statefulset.apiVersion" . }}
+kind: StatefulSet
+metadata:
+  name: {{ template "master.fullname" . }}
+  labels:
+    app: {{ template "mariadb.name" . }}
+    chart: {{ template "mariadb.chart" . }}
+    release: orc8r
+    heritage: {{ .Release.Service }}
+    component: master
+spec:
+  selector:
+    matchLabels:
+      app: {{ template "mariadb.name" . }}
+      release: orc8r
+      component: master
+  serviceName: {{ template "master.fullname" . }}
+  replicas: 1
+  updateStrategy:
+    type: {{ .Values.master.updateStrategy.type }}
+    {{- if (eq "Recreate" .Values.master.updateStrategy.type) }}
+    rollingUpdate: null
+    {{- end }}
+  template:
+    metadata:
+      {{- with .Values.master.annotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        app: {{ template "mariadb.name" . }}
+        chart: {{ template "mariadb.chart" . }}
+        release: orc8r
+        component: master
+    spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: {{ .Values.schedulerName | quote }}
+      {{- end }}
+      serviceAccountName: {{ template "mariadb.serviceAccountName" . }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+        runAsUser: {{ .Values.securityContext.runAsUser }}
+      {{- end }}
+      {{- if eq .Values.master.antiAffinity "hard" }}
+      affinity:
+      {{- with .Values.master.affinity  }}
+{{ toYaml . | indent 8 }}
+      {{- end }}
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - topologyKey: "kubernetes.io/hostname"
+              labelSelector:
+                matchLabels:
+                  app: {{ template "mariadb.name" . }}
+                  release: orc8r
+      {{- else if eq .Values.master.antiAffinity "soft" }}
+      affinity:
+      {{- with .Values.master.affinity  }}
+{{ toYaml . | indent 8 }}
+      {{- end }}
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 1
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                labelSelector:
+                  matchLabels:
+                    app: {{ template "mariadb.name" . }}
+                    release: orc8r
+      {{- else}}
+      {{- with .Values.master.affinity }}
+      affinity: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.master.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.master.nodeSelector | nindent 8 }}
+      {{- end -}}
+      {{- with .Values.master.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
+{{- include "mariadb.imagePullSecrets" . | indent 6 }}
+      initContainers:
+        {{- if .Values.master.extraInitContainers }}
+{{ tpl .Values.master.extraInitContainers . | indent 8 }}
+        {{- end }}
+        {{- if and .Values.volumePermissions.enabled .Values.master.persistence.enabled }}
+        - name: volume-permissions
+          image: {{ template "mariadb.volumePermissions.image" . }}
+          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
+          command: ["chown", "-R", "{{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}", "{{ .Values.master.persistence.mountPath }}"]
+          securityContext:
+            runAsUser: 0
+          resources: {{ toYaml .Values.volumePermissions.resources | nindent 12 }}
+          volumeMounts:
+            - name: data
+              mountPath: {{ .Values.master.persistence.mountPath }}
+        {{- end }}
+      containers:
+        - name: "mariadb"
+          image: {{ template "mariadb.image" . }}
+          imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
+          env:
+            {{- if .Values.image.debug}}
+            - name: BITNAMI_DEBUG
+              value: "true"
+            {{- end }}
+            {{- if .Values.master.extraFlags }}
+            - name: MARIADB_EXTRA_FLAGS
+              value: "{{ .Values.master.extraFlags }}"
+            {{- end }}
+            {{- if .Values.rootUser.injectSecretsAsVolume }}
+            - name: MARIADB_ROOT_PASSWORD_FILE
+              value: "/opt/bitnami/mariadb/secrets/mariadb-root-password"
+            {{- else }}
+            - name: MARIADB_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "mariadb.secretName" . }}
+                  key: mariadb-root-password
+            {{- end }}
+            {{- if not (empty .Values.db.user) }}
+            - name: MARIADB_USER
+              value: "{{ .Values.db.user }}"
+            {{- if .Values.db.injectSecretsAsVolume }}
+            - name: MARIADB_PASSWORD_FILE
+              value: "/opt/bitnami/mariadb/secrets/mariadb-password"
+            {{- else }}
+            - name: MARIADB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "mariadb.secretName" . }}
+                  key: mariadb-password
+            {{- end }}
+            {{- end }}
+            - name: MARIADB_DATABASE
+              value: "{{ .Values.db.name }}"
+            {{- if .Values.replication.enabled }}
+            - name: MARIADB_REPLICATION_MODE
+              value: "master"
+            - name: MARIADB_REPLICATION_USER
+              value: "{{ .Values.replication.user }}"
+            {{- if .Values.replication.injectSecretsAsVolume }}
+            - name: MARIADB_REPLICATION_PASSWORD_FILE
+              value: "/opt/bitnami/mariadb/secrets/mariadb-replication-password"
+            {{- else }}
+            - name: MARIADB_REPLICATION_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "mariadb.secretName" . }}
+                  key: mariadb-replication-password
+            {{- end }}
+            {{- end }}
+            {{- if .Values.master.extraEnvVars }}
+            {{- tpl (toYaml .Values.master.extraEnvVars) $ | nindent 12 }}
+            {{- end }}
+          ports:
+            - name: mysql
+              containerPort: 3306
+          {{- if .Values.master.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command:
+                - sh
+                - -c
+                - |
+                  password_aux="${MARIADB_ROOT_PASSWORD:-}"
+                  if [ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]; then
+                      password_aux=$(cat $MARIADB_ROOT_PASSWORD_FILE)
+                  fi
+                  mysqladmin status -uroot -p$password_aux
+            initialDelaySeconds: {{ .Values.master.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.master.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.master.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.master.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.master.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.master.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command:
+                - sh
+                - -c
+                - |
+                  password_aux="${MARIADB_ROOT_PASSWORD:-}"
+                  if [ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]; then
+                      password_aux=$(cat $MARIADB_ROOT_PASSWORD_FILE)
+                  fi
+                  mysqladmin status -uroot -p$password_aux
+            initialDelaySeconds: {{ .Values.master.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.master.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.master.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.master.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.master.readinessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.master.resources }}
+          resources: {{ toYaml .Values.master.resources | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: data
+              mountPath: {{ .Values.master.persistence.mountPath }}
+              {{- if .Values.master.persistence.subPath }}
+              subPath: {{ .Values.master.persistence.subPath }}
+              {{- end }}
+            {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
+            - name: custom-init-scripts
+              mountPath: /docker-entrypoint-initdb.d
+            {{- end }}
+            {{- if .Values.master.config }}
+            - name: config
+              mountPath: /opt/bitnami/mariadb/conf/my.cnf
+              subPath: my.cnf
+            {{- end }}
+            {{- if or .Values.rootUser.injectSecretsAsVolume .Values.db.injectSecretsAsVolume .Values.replication.injectSecretsAsVolume }}
+            - name: mariadb-credentials
+              mountPath: /opt/bitnami/mariadb/secrets/
+            {{- end }}
+        {{- if .Values.metrics.enabled }}
+        - name: metrics
+          image: {{ template "mariadb.metrics.image" . }}
+          imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
+          env:
+            {{- if .Values.rootUser.injectSecretsAsVolume }}
+            - name: MARIADB_ROOT_PASSWORD_FILE
+              value: "/opt/bitnami/mysqld-exporter/secrets/mariadb-root-password"
+            {{- else }}
+            - name: MARIADB_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "mariadb.secretName" . }}
+                  key: mariadb-root-password
+            {{- end }}
+          command:
+            - sh
+            - -c
+            - |
+              password_aux="${MARIADB_ROOT_PASSWORD:-}"
+              if [ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]; then
+                  password_aux=$(cat $MARIADB_ROOT_PASSWORD_FILE)
+              fi
+              DATA_SOURCE_NAME="root:${password_aux}@(localhost:3306)/" /bin/mysqld_exporter
+              {{- range .Values.metrics.extraArgs.master }}
+              {{ . }}
+              {{- end }}
+          ports:
+            - name: metrics
+              containerPort: 9104
+          {{- if .Values.metrics.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /metrics
+              port: metrics
+            initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.metrics.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: /metrics
+              port: metrics
+            initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.metrics.resources }}
+          resources: {{ toYaml .Values.metrics.resources | nindent 12 }}
+          {{- end }}
+          {{- if .Values.rootUser.injectSecretsAsVolume }}
+          volumeMounts:
+            - name: mariadb-credentials
+              mountPath: /opt/bitnami/mysqld-exporter/secrets/
+          {{- end }}
+        {{- end }}
+      volumes:
+        {{- if .Values.master.config }}
+        - name: config
+          configMap:
+            name: {{ template "master.fullname" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
+        - name: custom-init-scripts
+          configMap:
+            name: {{ template "mariadb.initdbScriptsCM" . }}
+        {{- end }}
+        {{- if or .Values.rootUser.injectSecretsAsVolume .Values.db.injectSecretsAsVolume .Values.replication.injectSecretsAsVolume }}
+        - name: mariadb-credentials
+          secret:
+            secretName: {{ template "mariadb.fullname" . }}
+            items:
+              {{- if .Values.rootUser.injectSecretsAsVolume }}
+              - key: mariadb-root-password
+                path: mariadb-root-password
+              {{- end }}
+              {{- if .Values.db.injectSecretsAsVolume }}
+              - key: mariadb-password
+                path: mariadb-password
+              {{- end }}
+              {{- if and .Values.replication.enabled .Values.replication.injectSecretsAsVolume }}
+              - key: mariadb-replication-password
+                path: mariadb-replication-password
+              {{- end }}
+        {{- end }}
+{{- if and .Values.master.persistence.enabled .Values.master.persistence.existingClaim }}
+        - name: data
+          persistentVolumeClaim:
+            claimName: {{ .Values.master.persistence.existingClaim }}
+{{- else if not .Values.master.persistence.enabled }}
+        - name: data
+          emptyDir: {}
+{{- else if and .Values.master.persistence.enabled (not .Values.master.persistence.existingClaim) }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+        labels:
+          app: "{{ template "mariadb.name" . }}"
+          component: "master"
+          release: {{ .Release.Name | quote }}
+          heritage: {{ .Release.Service | quote }}
+      spec:
+        accessModes:
+        {{- range .Values.master.persistence.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.master.persistence.size | quote }}
+        {{ include "mariadb.master.storageClass" . }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-svc.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-svc.yaml
new file mode 100644
index 00000000..5a3006c4
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/master-svc.yaml
@@ -0,0 +1,47 @@
+apiVersion: v1
+kind: Service
+metadata:
+#  name: {{ template "mariadb.fullname" . }}
+  name: mariadb
+  labels:
+    app: "{{ template "mariadb.name" . }}"
+    component: "master"
+    chart: "{{ template "mariadb.chart" . }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+{{- if or .Values.metrics.enabled .Values.master.service.annotations }}
+  annotations:
+{{- if .Values.metrics.enabled }}
+{{ toYaml .Values.metrics.annotations | indent 4 }}
+{{- end }}
+{{- if .Values.master.service.annotations }}
+{{ toYaml .Values.master.service.annotations | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  {{- if eq .Values.service.type "ClusterIP" }}
+  {{- if .Values.service.clusterIp }}
+  clusterIP: {{ .Values.service.clusterIp.master }}
+  {{- end }}
+  {{- end }}
+  ports:
+  - name: mysql
+    port: {{ .Values.service.port }}
+    targetPort: mysql
+{{- if eq .Values.service.type "NodePort" }}
+{{- if .Values.service.nodePort }}
+{{- if .Values.service.nodePort.master }}
+    nodePort: {{ .Values.service.nodePort.master }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- if .Values.metrics.enabled }}
+  - name: metrics
+    port: 9104
+    targetPort: metrics
+{{- end }}
+  selector:
+    app: "{{ template "mariadb.name" . }}"
+    component: "master"
+    release: "orc8r"
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/role.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/role.yaml
new file mode 100644
index 00000000..b54eeac9
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/role.yaml
@@ -0,0 +1,18 @@
+{{- if and .Values.serviceAccount.create  .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ template "master.fullname" . }}
+  labels:
+    app: "{{ template "mariadb.name" . }}"
+    chart: "{{ template "mariadb.chart" . }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+rules:
+- apiGroups:
+    - ""
+  resources:
+    - endpoints
+  verbs:
+    - get
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/rolebinding.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/rolebinding.yaml
new file mode 100644
index 00000000..c6669cf0
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/rolebinding.yaml
@@ -0,0 +1,18 @@
+{{- if and .Values.serviceAccount.create .Values.rbac.create }}
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ template "master.fullname" . }}
+  labels:
+    app: "{{ template "mariadb.name" . }}"
+    chart: "{{ template "mariadb.chart" . }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+subjects:
+- kind: ServiceAccount
+  name: {{ template "mariadb.serviceAccountName" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ template "master.fullname" . }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/secrets.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/secrets.yaml
new file mode 100644
index 00000000..7d81e909
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/secrets.yaml
@@ -0,0 +1,38 @@
+{{- if (not .Values.existingSecret) -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "mariadb.fullname" . }}
+  labels:
+    app: "{{ template "mariadb.name" . }}"
+    chart: "{{ template "mariadb.chart" . }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+type: Opaque
+data:
+  {{- if not (empty .Values.rootUser.password) }}
+  mariadb-root-password: "{{ .Values.rootUser.password | b64enc }}"
+  {{- else if (not .Values.rootUser.forcePassword) }}
+  mariadb-root-password: "{{ randAlphaNum 10 | b64enc }}"
+  {{ else }}
+  mariadb-root-password: {{ required "A MariaDB Root Password is required!" .Values.rootUser.password }}
+  {{- end }}
+  {{- if not (empty .Values.db.user) }}
+  {{- if not (empty .Values.db.password) }}
+  mariadb-password: "{{ .Values.db.password | b64enc }}"
+  {{- else if (not .Values.db.forcePassword) }}
+  mariadb-password: "{{ randAlphaNum 10 | b64enc }}"
+  {{- else }}
+  mariadb-password: {{ required "A MariaDB Database Password is required!" .Values.db.password }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.replication.enabled }}
+  {{- if not (empty .Values.replication.password) }}
+  mariadb-replication-password: "{{ .Values.replication.password | b64enc }}"
+  {{- else if (not .Values.replication.forcePassword) }}
+  mariadb-replication-password: "{{ randAlphaNum 10 | b64enc }}"
+  {{- else }}
+  mariadb-replication-password: {{ required "A MariaDB Replication Password is required!" .Values.replication.password }}
+  {{- end }}
+  {{- end }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/serviceaccount.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/serviceaccount.yaml
new file mode 100644
index 00000000..2d27739e
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/serviceaccount.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ template "mariadb.serviceAccountName" . }}
+  labels:
+    app: "{{ template "mariadb.name" . }}"
+    chart: "{{ template "mariadb.chart" . }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/servicemonitor.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/servicemonitor.yaml
new file mode 100644
index 00000000..6a10ba3c
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/servicemonitor.yaml
@@ -0,0 +1,33 @@
+{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "mariadb.fullname" . }}
+  {{- if .Values.metrics.serviceMonitor.namespace }}
+  namespace: {{ .Release.Namespace }}
+  {{- end }}
+  labels:
+    app: "{{ template "mariadb.name" . }}"
+    chart: {{ template "mariadb.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}  
+    {{- range $key, $value := .Values.metrics.serviceMonitor.selector }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      app: {{ template "mariadb.name" . }}
+      release: {{ .Release.Name | quote }}
+  endpoints:
+  - port: metrics
+    {{- if .Values.metrics.serviceMonitor.interval }}
+    interval: {{ .Values.metrics.serviceMonitor.interval }}
+    {{- end }}
+    {{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
+    {{- end }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-configmap.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-configmap.yaml
new file mode 100644
index 00000000..074568c6
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-configmap.yaml
@@ -0,0 +1,15 @@
+{{- if and .Values.replication.enabled .Values.slave.config }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "slave.fullname" . }}
+  labels:
+    app: "{{ template "mariadb.name" . }}"
+    component: "slave"
+    chart: "{{ template "mariadb.chart" . }}"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+data:
+  my.cnf: |-
+{{ .Values.slave.config | indent 4 }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-pdb.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-pdb.yaml
new file mode 100644
index 00000000..de36a08c
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-pdb.yaml
@@ -0,0 +1,26 @@
+{{- if .Values.replication.enabled }}
+{{- if .Values.slave.podDisruptionBudget.enabled }}
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "mariadb.fullname" . }}
+  labels:
+    app: "{{ template "mariadb.name" . }}"
+    component: "slave"
+    chart: {{ template "mariadb.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+spec:
+{{- if .Values.slave.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.slave.podDisruptionBudget.minAvailable }}
+{{- end }}
+{{- if .Values.slave.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.slave.podDisruptionBudget.maxUnavailable }}
+{{- end }}
+  selector:
+    matchLabels:
+      app: "{{ template "mariadb.name" . }}"
+      component: "slave"
+      release: {{ .Release.Name | quote }}
+{{- end }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-statefulset.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-statefulset.yaml
new file mode 100644
index 00000000..95fc72d3
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-statefulset.yaml
@@ -0,0 +1,305 @@
+{{- if .Values.replication.enabled }}
+apiVersion: {{ template "mariadb.statefulset.apiVersion" . }}
+kind: StatefulSet
+metadata:
+  name: {{ template "slave.fullname" . }}
+  labels:
+    app: {{ template "mariadb.name" . }}
+    chart: {{ template "mariadb.chart" . }}
+    release: orc8r
+    heritage: {{ .Release.Service }}
+    component: slave
+spec:
+  selector:
+    matchLabels:
+      app: {{ template "mariadb.name" . }}
+      release: orc8r
+      component: slave
+  serviceName: {{ template "slave.fullname" . }}
+  replicas: {{ .Values.slave.replicas }}
+  updateStrategy:
+    type: {{ .Values.slave.updateStrategy.type }}
+    {{- if (eq "Recreate" .Values.slave.updateStrategy.type) }}
+    rollingUpdate: null
+    {{- end }}
+  template:
+    metadata:
+      {{- if .Values.slave.annotations }}
+      annotations:
+        {{- range $key, $value := .Values.slave.annotations }}
+        {{ $key }}: {{ $value }}
+        {{- end }}
+      {{- end }}
+      labels:
+        app: {{ template "mariadb.name" . }}
+        chart: {{ template "mariadb.chart" . }}
+        release: orc8r
+        component: slave
+    spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: {{ .Values.schedulerName | quote }}
+      {{- end }}
+      serviceAccountName: {{ template "mariadb.serviceAccountName" . }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+        runAsUser: {{ .Values.securityContext.runAsUser }}
+      {{- end }}
+      {{- if eq .Values.slave.antiAffinity "hard" }}
+      affinity:
+      {{- with .Values.slave.affinity  }}
+{{ toYaml . | indent 8 }}
+      {{- end }}
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - topologyKey: "kubernetes.io/hostname"
+              labelSelector:
+                matchLabels:
+                  app: {{ template "mariadb.name" . }}
+                  release: orc8r
+      {{- else if eq .Values.slave.antiAffinity "soft" }}
+      affinity:
+      {{- with .Values.slave.affinity  }}
+{{ toYaml . | indent 8 }}
+      {{- end }}
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 1
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                labelSelector:
+                  matchLabels:
+                    app: {{ template "mariadb.name" . }}
+                    release: orc8r
+      {{- else}}
+      {{- with .Values.slave.affinity }}
+      affinity: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.slave.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.slave.nodeSelector | nindent 8 }}
+      {{- end -}}
+      {{- with .Values.slave.tolerations }}
+      tolerations: {{ toYaml . | nindent 8 }}
+      {{- end }}
+{{- include "mariadb.imagePullSecrets" . | indent 6 }}
+      initContainers:
+        {{- if .Values.master.extraInitContainers }}
+{{ tpl .Values.master.extraInitContainers . | indent 6}}
+        {{- end }}
+        {{- if and .Values.volumePermissions.enabled .Values.slave.persistence.enabled }}
+        - name: volume-permissions
+          image: {{ template "mariadb.volumePermissions.image" . }}
+          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
+          command: ["chown", "-R", "{{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}", "/bitnami/mariadb"]
+          securityContext:
+            runAsUser: 0
+          resources: {{ toYaml .Values.volumePermissions.resources | nindent 12 }}
+          volumeMounts:
+            - name: data
+              mountPath: /bitnami/mariadb
+        {{- end }}
+      containers:
+        - name: "mariadb"
+          image: {{ template "mariadb.image" . }}
+          imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
+          env:
+            {{- if .Values.image.debug}}
+            - name: BITNAMI_DEBUG
+              value: "true"
+            {{- end }}
+            {{- if .Values.slave.extraFlags }}
+            - name: MARIADB_EXTRA_FLAGS
+              value: "{{ .Values.slave.extraFlags }}"
+            {{- end }}
+            - name: MARIADB_REPLICATION_MODE
+              value: "slave"
+            - name: MARIADB_MASTER_HOST
+              value: {{ template "mariadb.fullname" . }}
+            - name: MARIADB_MASTER_PORT_NUMBER
+              value: "{{ .Values.service.port }}"
+            - name: MARIADB_MASTER_ROOT_USER
+              value: "root"
+            {{- if .Values.rootUser.injectSecretsAsVolume }}
+            - name: MARIADB_MASTER_ROOT_PASSWORD_FILE
+              value: "/opt/bitnami/mariadb/secrets/mariadb-root-password"
+            {{- else }}
+            - name: MARIADB_MASTER_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "mariadb.secretName" . }}
+                  key: mariadb-root-password
+            {{- end }}
+            - name: MARIADB_REPLICATION_USER
+              value: "{{ .Values.replication.user }}"
+            {{- if .Values.replication.injectSecretsAsVolume }}
+            - name: MARIADB_REPLICATION_PASSWORD_FILE
+              value: "/opt/bitnami/mariadb/secrets/mariadb-replication-password"
+            {{- else }}
+            - name: MARIADB_REPLICATION_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "mariadb.secretName" . }}
+                  key: mariadb-replication-password
+            {{- end }}
+            {{- if .Values.slave.extraEnvVars }}
+            {{- tpl (toYaml .Values.slave.extraEnvVars) $ | nindent 12 }}
+            {{- end }}
+          ports:
+            - name: mysql
+              containerPort: 3306
+          {{- if .Values.slave.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command:
+                - sh
+                - -c
+                - |
+                  password_aux="${MARIADB_MASTER_ROOT_PASSWORD:-}"
+                  if [ -f "${MARIADB_MASTER_ROOT_PASSWORD_FILE:-}" ]; then
+                      password_aux=$(cat $MARIADB_MASTER_ROOT_PASSWORD_FILE)
+                  fi
+                  mysqladmin status -uroot -p$password_aux
+            initialDelaySeconds: {{ .Values.slave.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.slave.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.slave.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.slave.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.slave.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.slave.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command:
+                - sh
+                - -c
+                - |
+                  password_aux="${MARIADB_MASTER_ROOT_PASSWORD:-}"
+                  if [ -f "${MARIADB_MASTER_ROOT_PASSWORD_FILE:-}" ]; then
+                      password_aux=$(cat $MARIADB_MASTER_ROOT_PASSWORD_FILE)
+                  fi
+                  mysqladmin status -uroot -p$password_aux
+            initialDelaySeconds: {{ .Values.slave.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.slave.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.slave.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.slave.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.slave.readinessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.slave.resources }}
+          resources: {{ toYaml .Values.slave.resources | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: data
+              mountPath: /bitnami/mariadb
+            {{- if .Values.slave.config }}
+            - name: config
+              mountPath: /opt/bitnami/mariadb/conf/my.cnf
+              subPath: my.cnf
+            {{- end }}
+            {{- if or .Values.rootUser.injectSecretsAsVolume .Values.replication.injectSecretsAsVolume }}
+            - name: mariadb-credentials
+              mountPath: /opt/bitnami/mariadb/secrets/
+            {{- end }}
+        {{- if .Values.metrics.enabled }}
+        - name: metrics
+          image: {{ template "mariadb.metrics.image" . }}
+          imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
+          env:
+            {{- if .Values.rootUser.injectSecretsAsVolume }}
+            - name: MARIADB_ROOT_PASSWORD_FILE
+              value: "/opt/bitnami/mysqld-exporter/secrets/mariadb-root-password"
+            {{- else }}
+            - name: MARIADB_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "mariadb.secretName" . }}
+                  key: mariadb-root-password
+            {{- end }}
+          command:
+            - sh
+            - -c
+            - |
+              password_aux="${MARIADB_ROOT_PASSWORD:-}"
+              if [ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]; then
+                  password_aux=$(cat $MARIADB_ROOT_PASSWORD_FILE)
+              fi
+              DATA_SOURCE_NAME="root:${password_aux}@(localhost:3306)/" /bin/mysqld_exporter
+              {{- range .Values.metrics.extraArgs.slave }}
+              {{ . }}
+              {{- end }}
+          ports:
+            - name: metrics
+              containerPort: 9104
+          {{- if .Values.metrics.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /metrics
+              port: metrics
+            initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.metrics.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: /metrics
+              port: metrics
+            initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.metrics.resources }}
+          resources: {{ toYaml .Values.metrics.resources | nindent 12 }}
+          {{- end }}
+          {{- if .Values.rootUser.injectSecretsAsVolume }}
+          volumeMounts:
+            - name: mariadb-credentials
+              mountPath: /opt/bitnami/mysqld-exporter/secrets/
+          {{- end }}
+        {{- end }}
+      volumes:
+        {{- if .Values.slave.config }}
+        - name: config
+          configMap:
+            name: {{ template "slave.fullname" . }}
+        {{- end }}
+        {{- if or .Values.rootUser.injectSecretsAsVolume .Values.replication.injectSecretsAsVolume }}
+        - name: mariadb-credentials
+          secret:
+            secretName: {{ template "mariadb.fullname" . }}
+            items:
+              {{- if .Values.rootUser.injectSecretsAsVolume }}
+              - key: mariadb-root-password
+                path: mariadb-root-password
+              {{- end }}
+              {{- if .Values.replication.injectSecretsAsVolume }}
+              - key: mariadb-replication-password
+                path: mariadb-replication-password
+              {{- end }}
+        {{- end }}
+{{- if not .Values.slave.persistence.enabled }}
+        - name: "data"
+          emptyDir: {}
+{{- else }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+        labels:
+          app: "{{ template "mariadb.name" . }}"
+          component: "slave"
+          release: {{ .Release.Name | quote }}
+          heritage: {{ .Release.Service | quote }}
+      spec:
+        accessModes:
+        {{- range .Values.slave.persistence.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.slave.persistence.size | quote }}
+        {{ include "mariadb.slave.storageClass" . }}
+{{- end }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-svc.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-svc.yaml
new file mode 100644
index 00000000..bef40437
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/slave-svc.yaml
@@ -0,0 +1,48 @@
+{{- if .Values.replication.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "slave.fullname" . }}
+  labels:
+    app: "{{ template "mariadb.name" . }}"
+    chart: "{{ template "mariadb.chart" . }}"
+    component: "slave"
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+{{- if or .Values.metrics.enabled .Values.slave.service.annotations }}
+  annotations:
+{{- if .Values.metrics.enabled }}
+{{ toYaml .Values.metrics.annotations | indent 4 }}
+{{- end }}
+{{- if .Values.slave.service.annotations }}
+{{ toYaml .Values.slave.service.annotations | indent 4 }}
+{{- end }}
+{{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  {{- if eq .Values.service.type "ClusterIP" }}
+  {{- if .Values.service.clusterIp }}
+  clusterIP: {{ .Values.service.clusterIp.slave }}
+  {{- end }}
+  {{- end }}
+  ports:
+  - name: mysql
+    port: {{ .Values.service.port }}
+    targetPort: mysql
+{{- if (eq .Values.service.type "NodePort") }}
+{{- if .Values.service.nodePort }}
+{{- if .Values.service.nodePort.slave }}
+    nodePort: {{ .Values.service.nodePort.slave }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- if .Values.metrics.enabled }}
+  - name: metrics
+    port: 9104
+    targetPort: metrics
+{{- end }}
+  selector:
+    app: "{{ template "mariadb.name" . }}"
+    component: "slave"
+    release: "orc8r"
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/test-runner.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/test-runner.yaml
new file mode 100644
index 00000000..11700fff
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/test-runner.yaml
@@ -0,0 +1,52 @@
+{{- if .Values.tests.enabled }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ template "mariadb.fullname" . }}-test-{{ randAlphaNum 5 | lower }}"
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  initContainers:
+    - name: "test-framework"
+      image: {{ template "mariadb.tests.testFramework.image" . }}
+      command:
+        - "bash"
+        - "-c"
+        - |
+          set -ex
+          # copy bats to tools dir
+          cp -R /usr/local/libexec/ /tools/bats/
+      {{- if .Values.tests.testFramework.resources }}
+      resources: {{ toYaml .Values.tests.testFramework.resources | nindent 8 }}
+      {{- end }}
+      volumeMounts:
+      - mountPath: /tools
+        name: tools
+  containers:
+    - name: mariadb-test
+      image: {{ template "mariadb.image" . }}
+      imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
+      command: ["/tools/bats/bats", "-t", "/tests/run.sh"]
+      env:
+        - name: MARIADB_ROOT_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ template "mariadb.secretName" . }}
+              key: mariadb-root-password
+      {{- if .Values.tests.resources }}
+      resources: {{ toYaml .Values.tests.resources | nindent 8 }}
+      {{- end }}
+      volumeMounts:
+      - mountPath: /tests
+        name: tests
+        readOnly: true
+      - mountPath: /tools
+        name: tools
+  volumes:
+  - name: tests
+    configMap:
+      name: {{ template "mariadb.fullname" . }}-tests
+  - name: tools
+    emptyDir: {}
+  restartPolicy: Never
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/tests.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/tests.yaml
new file mode 100644
index 00000000..924f99ce
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/templates/tests.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.tests.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "mariadb.fullname" . }}-tests
+data:
+  run.sh: |-
+    @test "Testing MariaDB is accessible" {
+      mysql -h {{ template "mariadb.fullname" . }} -uroot -p$MARIADB_ROOT_PASSWORD -e 'show databases;'
+    }
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/values-production.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/values-production.yaml
new file mode 100644
index 00000000..47293f49
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/values-production.yaml
@@ -0,0 +1,562 @@
+## Global Docker image parameters
+## Please, note that this will override the image parameters, including dependencies, configured to use the global value
+## Current available global Docker image parameters: imageRegistry and imagePullSecrets
+##
+# global:
+#   imageRegistry: myRegistryName
+#   imagePullSecrets:
+#     - myRegistryKeySecretName
+#   storageClass: myStorageClass
+
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName:
+
+## Bitnami MariaDB image
+## ref: https://hub.docker.com/r/bitnami/mariadb/tags/
+##
+image:
+  registry: docker.io
+  repository: bitnami/mariadb
+  tag: 10.3.22-debian-10-r27
+  ## Specify a imagePullPolicy
+  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+  ##
+  pullPolicy: IfNotPresent
+  ## Optionally specify an array of imagePullSecrets.
+  ## Secrets must be manually created in the namespace.
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  ##
+  # pullSecrets:
+  #   - myRegistryKeySecretName
+
+  ## Set to true if you would like to see extra information on logs
+  ## It turns BASH and NAMI debugging in minideb
+  ## ref:  https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging
+  debug: false
+
+## String to partially override mariadb.fullname template (will maintain the release name)
+##
+# nameOverride:
+
+## String to fully override mariadb.fullname template
+##
+# fullnameOverride:
+
+## Init containers parameters:
+## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
+##
+volumePermissions:
+  enabled: false
+  image:
+    registry: docker.io
+    repository: bitnami/minideb
+    tag: buster
+    pullPolicy: Always
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  resources: {}
+
+service:
+  ## Kubernetes service type, ClusterIP and NodePort are supported at present
+  type: ClusterIP
+  # clusterIp:
+  #   master: xx.xx.xx.xx
+  #   slave: xx.xx.xx.xx
+  port: 3306
+  ## Specify the nodePort value for the LoadBalancer and NodePort service types.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+  ##
+  # nodePort:
+  #   master: 30001
+  #   slave: 30002
+
+## Pods Service Account
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
+serviceAccount:
+  ## Specifies whether a ServiceAccount should be created
+  ##
+  create: false
+  ## The name of the ServiceAccount to use.
+  ## If not set and create is true, a name is generated using the mariadb.fullname template
+  # name:
+
+## Role Based Access
+## Ref: https://kubernetes.io/docs/admin/authorization/rbac/
+##
+rbac:
+  create: false
+
+## Pod Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+##
+securityContext:
+  enabled: true
+  fsGroup: 1001
+  runAsUser: 1001
+
+## Use existing secret (ignores root, db and replication passwords)
+##
+# existingSecret:
+
+## MariaDB admin credentials
+##
+rootUser:
+  ## MariaDB admin password
+  ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-the-root-password-on-first-run
+  ##
+  password: ""
+  ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly.
+  ## If it is not force, a random password will be generated.
+  ##
+  forcePassword: true
+  ## Mount admin password as a file instead of using an environment variable
+  ##
+  injectSecretsAsVolume: true
+
+## Custom user/db credentials
+##
+db:
+  ## MariaDB username and password
+  ## ref: https://github.com/bitnami/bitnami-docker-mariadb#creating-a-database-user-on-first-run
+  ##
+  user: ""
+  password: ""
+  ## Database to create
+  ## ref: https://github.com/bitnami/bitnami-docker-mariadb#creating-a-database-on-first-run
+  ##
+  name: my_database
+  ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly.
+  ## If it is not force, a random password will be generated.
+  ##
+  forcePassword: true
+  ## Mount user password as a file instead of using an environment variable
+  ##
+  injectSecretsAsVolume: true
+
+## Replication configuration
+##
+replication:
+  ## Enable replication. This enables the creation of replicas of MariaDB. If false, only a
+  ## master deployment would be created
+  ##
+  enabled: true
+  ## MariaDB replication user
+  ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-up-a-replication-cluster
+  ##
+  user: replicator
+  ## MariaDB replication user password
+  ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-up-a-replication-cluster
+  ##
+  password: ""
+  ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly.
+  ## If it is not force, a random password will be generated.
+  ##
+  forcePassword: true
+  ## Mount replication user password as a file instead of using an environment variable
+  ##
+  injectSecretsAsVolume: true
+
+## initdb scripts
+## Specify dictionary of scripts to be run at first boot
+## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory
+##
+# initdbScripts:
+#   my_init_script.sh: |
+#      #!/bin/sh
+#      echo "Do something."
+#
+## ConfigMap with scripts to be run at first boot
+## Note: This will override initdbScripts
+# initdbScriptsConfigMap:
+
+master:
+  ## Mariadb Master additional pod annotations
+  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+  # annotations:
+  #   key: value
+  #   another-key: another-value
+
+  ## MariaDB additional command line flags
+  ## Can be used to specify command line flags, for example:
+  ##
+  ## extraFlags: "--max-connect-errors=1000 --max_connections=155"
+
+  ## Affinity for pod assignment
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ##
+  affinity: {}
+
+  ## Kept for backwards compatibility. You can now disable it by removing it.
+  ## if you wish to set it through master.affinity.podAntiAffinity instead.
+  ##
+  antiAffinity: soft
+
+  ## Node labels for pod assignment
+  ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  ##
+  nodeSelector: {}
+
+  ## Tolerations for pod assignment
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  ##
+  tolerations: []
+
+  ## updateStrategy for MariaDB Master StatefulSet
+  ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
+  updateStrategy:
+    type: RollingUpdate
+
+  ## Enable persistence using Persistent Volume Claims
+  ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
+  ##
+  persistence:
+    ## If true, use a Persistent Volume Claim, If false, use emptyDir
+    ##
+    enabled: true
+    # Enable persistence using an existing PVC
+    # existingClaim:
+    # Subdirectory of the volume to mount
+    # subPath:
+    mountPath: /bitnami/mariadb
+    ## Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    ##
+    # storageClass: "-"
+    ## Persistent Volume Claim annotations
+    ##
+    annotations: {}
+    ## Persistent Volume Access Mode
+    ##
+    accessModes:
+    - ReadWriteOnce
+    ## Persistent Volume size
+    ##
+    size: 8Gi
+
+  extraInitContainers: |
+  # - name: do-something
+  #   image: busybox
+  #   command: ['do', 'something']
+
+  ## An array to add extra environment variables
+  ## For example:
+  ## extraEnvVars:
+  ##  - name: TZ
+  ##    value: "Europe/Paris"
+  ##
+  # extraEnvVars:
+
+  ## Configure MySQL with a custom my.cnf file
+  ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file
+  ##
+  config: |-
+    [mysqld]
+    skip-name-resolve
+    explicit_defaults_for_timestamp
+    basedir=/opt/bitnami/mariadb
+    plugin_dir=/opt/bitnami/mariadb/plugin
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    tmpdir=/opt/bitnami/mariadb/tmp
+    max_allowed_packet=16M
+    bind-address=0.0.0.0
+    pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
+    log-error=/opt/bitnami/mariadb/logs/mysqld.log
+    character-set-server=UTF8
+    collation-server=utf8_general_ci
+
+    [client]
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    default-character-set=UTF8
+    plugin_dir=/opt/bitnami/mariadb/plugin
+
+    [manager]
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
+
+  ## Configure master resource requests and limits
+  ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+  ##
+  resources: {}
+  livenessProbe:
+    enabled: true
+    ##
+    ## Initializing the database could take some time
+    initialDelaySeconds: 120
+    ##
+    ## Default Kubernetes values
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+  readinessProbe:
+    enabled: true
+    initialDelaySeconds: 30
+    ##
+    ## Default Kubernetes values
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
+
+  ## Allow customization of the service resource
+  ##
+  service:
+    ## Add custom annotations to the service
+    ##
+    annotations: {}
+
+slave:
+  replicas: 2
+
+  ## Mariadb Slave additional pod annotations
+  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+  # annotations:
+  #   key: value
+  #   another-key: another-value
+
+  ## MariaDB additional command line flags
+  ## Can be used to specify command line flags, for example:
+  ##
+  ## extraFlags: --max-connect-errors=1000 --max_connections=155"
+
+  ## Affinity for pod assignment
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ##
+  affinity: {}
+
+  ## Kept for backwards compatibility. You can now disable it by removing it.
+  ## if you wish to set it through slave.affinity.podAntiAffinity instead.
+  ##
+  antiAffinity: soft
+
+  ## Node labels for pod assignment
+  ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  ##
+  nodeSelector: {}
+
+  ## Tolerations for pod assignment
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  ##
+  tolerations: []
+
+  ## updateStrategy for MariaDB Slave StatefulSet
+  ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
+  updateStrategy:
+    type: RollingUpdate
+
+  persistence:
+    ## If true, use a Persistent Volume Claim, If false, use emptyDir
+    ##
+    enabled: true
+    # storageClass: "-"
+    annotations:
+    accessModes:
+    - ReadWriteOnce
+    ## Persistent Volume size
+    ##
+    size: 8Gi
+
+  extraInitContainers: |
+  # - name: do-something
+  #   image: busybox
+  #   command: ['do', 'something']
+
+  ## An array to add extra environment variables
+  ## For example:
+  ## extraEnvVars:
+  ##  - name: TZ
+  ##    value: "Europe/Paris"
+  ##
+  # extraEnvVars:
+
+  ## Configure MySQL slave with a custom my.cnf file
+  ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file
+  ##
+  config: |-
+    [mysqld]
+    skip-name-resolve
+    explicit_defaults_for_timestamp
+    basedir=/opt/bitnami/mariadb
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    tmpdir=/opt/bitnami/mariadb/tmp
+    max_allowed_packet=16M
+    bind-address=0.0.0.0
+    pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
+    log-error=/opt/bitnami/mariadb/logs/mysqld.log
+    character-set-server=UTF8
+    collation-server=utf8_general_ci
+
+    [client]
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    default-character-set=UTF8
+
+    [manager]
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
+
+  ##
+  ## Configure slave resource requests and limits
+  ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+  ##
+  resources: {}
+  livenessProbe:
+    enabled: true
+    ##
+    ## Initializing the database could take some time
+    initialDelaySeconds: 120
+    ##
+    ## Default Kubernetes values
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+  readinessProbe:
+    enabled: true
+    initialDelaySeconds: 45
+    ##
+    ## Default Kubernetes values
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
+
+  ## Allow customization of the service resource
+  ##
+  service:
+    ## Add custom annotations to the service
+    ##
+    annotations: {}
+
+metrics:
+  enabled: true
+  image:
+    registry: docker.io
+    repository: bitnami/mysqld-exporter
+    tag: 0.12.1-debian-10-r27
+    pullPolicy: IfNotPresent
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  resources: {}
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port: "9104"
+
+  ## Extra args to be passed to mysqld_exporter
+  ## ref: https://github.com/prometheus/mysqld_exporter/
+  ##
+  extraArgs:
+    master: []
+    slave: []
+      # - --collect.auto_increment.columns
+      # - --collect.binlog_size
+      # - --collect.engine_innodb_status
+      # - --collect.engine_tokudb_status
+      # - --collect.global_status
+      # - --collect.global_variables
+      # - --collect.info_schema.clientstats
+      # - --collect.info_schema.innodb_metrics
+      # - --collect.info_schema.innodb_tablespaces
+      # - --collect.info_schema.innodb_cmp
+      # - --collect.info_schema.innodb_cmpmem
+      # - --collect.info_schema.processlist
+      # - --collect.info_schema.processlist.min_time
+      # - --collect.info_schema.query_response_time
+      # - --collect.info_schema.tables
+      # - --collect.info_schema.tables.databases
+      # - --collect.info_schema.tablestats
+      # - --collect.info_schema.userstats
+      # - --collect.perf_schema.eventsstatements
+      # - --collect.perf_schema.eventsstatements.digest_text_limit
+      # - --collect.perf_schema.eventsstatements.limit
+      # - --collect.perf_schema.eventsstatements.timelimit
+      # - --collect.perf_schema.eventswaits
+      # - --collect.perf_schema.file_events
+      # - --collect.perf_schema.file_instances
+      # - --collect.perf_schema.indexiowaits
+      # - --collect.perf_schema.tableiowaits
+      # - --collect.perf_schema.tablelocks
+      # - --collect.perf_schema.replication_group_member_stats
+      # - --collect.slave_status
+      # - --collect.slave_hosts
+      # - --collect.heartbeat
+      # - --collect.heartbeat.database
+      # - --collect.heartbeat.table
+
+  livenessProbe:
+    enabled: true
+    ##
+    ## Initializing the database could take some time
+    initialDelaySeconds: 120
+    ##
+    ## Default Kubernetes values
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+  readinessProbe:
+    enabled: true
+    initialDelaySeconds: 30
+    ##
+    ## Default Kubernetes values
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+
+  # Enable this if you're using https://github.com/coreos/prometheus-operator
+  serviceMonitor:
+    enabled: false
+    ## Specify a namespace if needed
+    # namespace: monitoring
+    # fallback to the prometheus default unless specified
+    # interval: 10s
+    # scrapeTimeout: 10s
+    ## Defaults to what's used if you follow CoreOS [Prometheus Install Instructions](https://github.com/helm/charts/tree/master/stable/prometheus-operator#tldr)
+    ## [Prometheus Selector Label](https://github.com/helm/charts/tree/master/stable/prometheus-operator#prometheus-operator-1)
+    ## [Kube Prometheus Selector Label](https://github.com/helm/charts/tree/master/stable/prometheus-operator#exporters)
+    selector:
+      prometheus: kube-prometheus
+
+## Bats Framework (= Bash Automated Testing System) is needed to test if MariaDB is accessible
+## See test-runner.yaml and tests.yaml for details.
+## To run the tests after the deployment, enter "helm test <release-name>".
+tests:
+  enabled: true
+  # resources: {}
+  testFramework:
+    image:
+      registry: docker.io
+      repository: dduportal/bats
+      tag: 0.4.0
+    # resources: {}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/values.schema.json b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/values.schema.json
new file mode 100644
index 00000000..ad28ce83
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/values.schema.json
@@ -0,0 +1,169 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "type": "object",
+  "properties": {
+    "rootUser": {
+      "type": "object",
+      "properties": {
+        "password": {
+          "type": "string",
+          "title": "MariaDB admin password",
+          "form": true,
+          "description": "Defaults to a random 10-character alphanumeric string if not set",
+          "hidden": {
+            "condition": false,
+            "value": "usePassword"
+          }
+        }
+      }
+    },
+    "db": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "title": "MariaDB custom database",
+          "description": "Name of the custom database to be created during the 1st initialization of MariaDB",
+          "form": true
+        },
+        "user": {
+          "type": "string",
+          "title": "MariaDB custom user",
+          "description": "Name of the custom user to be created during the 1st initialization of MariaDB. This user only has permissions on the MariaDB custom database",
+          "form": true
+        },
+        "password": {
+          "type": "string",
+          "title": "Password for MariaDB custom user",
+          "form": true,
+          "description": "Defaults to a random 10-character alphanumeric string if not set",
+          "hidden": {
+            "condition": false,
+            "value": "usePassword"
+          }
+        }
+      }
+    },
+    "replication": {
+      "type": "object",
+      "title": "Replication configuration",
+      "form": true,
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "form": true,
+          "title": "Enable replication configuration"
+        }
+      }
+    },
+    "master": {
+      "type": "object",
+      "title": "Master replicas settings",
+      "form": true,
+      "properties": {
+        "persistence": {
+          "type": "object",
+          "title": "Persistence for master replicas",
+          "form": true,
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "form": true,
+              "title": "Enable persistence",
+              "description": "Enable persistence using Persistent Volume Claims"
+            },
+            "size": {
+              "type": "string",
+              "title": "Persistent Volume Size",
+              "form": true,
+              "render": "slider",
+              "sliderMin": 1,
+              "sliderMax": 100,
+              "sliderUnit": "Gi",
+              "hidden": {
+                "condition": false,
+                "value": "persistence.enabled"
+              }
+            }
+          }
+        }
+      }
+    },
+    "slave": {
+      "type": "object",
+      "title": "Slave replicas settings",
+      "form": true,
+      "hidden": {
+        "condition": false,
+        "value": "replication.enabled"
+      },
+      "properties": {
+        "persistence": {
+          "type": "object",
+          "title": "Persistence for slave replicas",
+          "form": true,
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "form": true,
+              "title": "Enable persistence",
+              "description": "Enable persistence using Persistent Volume Claims"
+            },
+            "size": {
+              "type": "string",
+              "title": "Persistent Volume Size",
+              "form": true,
+              "render": "slider",
+              "sliderMin": 1,
+              "sliderMax": 100,
+              "sliderUnit": "Gi",
+              "hidden": {
+                "condition": false,
+                "value": "persistence.enabled"
+              }
+            }
+          }
+        }
+      }
+    },
+    "volumePermissions": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "form": true,
+          "title": "Enable Init Containers",
+          "description": "Use an init container to set required folder permissions on the data volume before mounting it in the final destination"
+        }
+      }
+    },
+    "metrics": {
+      "type": "object",
+      "form": true,
+      "title": "Prometheus metrics details",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "title": "Create Prometheus metrics exporter",
+          "description": "Create a side-car container to expose Prometheus metrics",
+          "form": true
+        },
+        "serviceMonitor": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean",
+              "title": "Create Prometheus Operator ServiceMonitor",
+              "description": "Create a ServiceMonitor to track metrics using Prometheus Operator",
+              "form": true,
+              "hidden": {
+                "condition": false,
+                "value": "metrics.enabled"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/values.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/values.yaml
new file mode 100644
index 00000000..35bb330a
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/mariadb/values.yaml
@@ -0,0 +1,564 @@
+## Global Docker image parameters
+## Please, note that this will override the image parameters, including dependencies, configured to use the global value
+## Current available global Docker image parameters: imageRegistry and imagePullSecrets
+##
+# global:
+#   imageRegistry: myRegistryName
+#   imagePullSecrets:
+#     - myRegistryKeySecretName
+#   storageClass: myStorageClass
+
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName:
+
+## Bitnami MariaDB image
+## ref: https://hub.docker.com/r/bitnami/mariadb/tags/
+##
+image:
+  registry: docker.io
+  repository: bitnami/mariadb
+  tag: 10.3.22-debian-10-r27
+  ## Specify a imagePullPolicy
+  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+  ##
+  pullPolicy: IfNotPresent
+  ## Optionally specify an array of imagePullSecrets.
+  ## Secrets must be manually created in the namespace.
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  ##
+  # pullSecrets:
+  #   - myRegistryKeySecretName
+
+  ## Set to true if you would like to see extra information on logs
+  ## It turns BASH and NAMI debugging in minideb
+  ## ref:  https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging
+  debug: false
+
+## String to partially override mariadb.fullname template (will maintain the release name)
+##
+# nameOverride:
+
+## String to fully override mariadb.fullname template
+##
+# fullnameOverride:
+
+## Init containers parameters:
+## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
+##
+volumePermissions:
+  enabled: false
+  image:
+    registry: docker.io
+    repository: bitnami/minideb
+    tag: buster
+    pullPolicy: Always
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  resources: {}
+
+service:
+  ## Kubernetes service type, ClusterIP and NodePort are supported at present
+  type: ClusterIP
+  # clusterIp:
+  #   master: xx.xx.xx.xx
+  #   slave: xx.xx.xx.xx
+  port: 3306
+  ## Specify the nodePort value for the LoadBalancer and NodePort service types.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+  ##
+  # nodePort:
+  #   master: 30001
+  #   slave: 30002
+
+## Pods Service Account
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
+serviceAccount:
+  ## Specifies whether a ServiceAccount should be created
+  ##
+  create: false
+  ## The name of the ServiceAccount to use.
+  ## If not set and create is true, a name is generated using the mariadb.fullname template
+  # name:
+
+## Role Based Access
+## Ref: https://kubernetes.io/docs/admin/authorization/rbac/
+##
+rbac:
+  create: false
+
+## Pod Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+##
+securityContext:
+  enabled: true
+  fsGroup: 1001
+  runAsUser: 1001
+
+## Use existing secret (ignores root, db and replication passwords)
+##
+# existingSecret:
+
+## MariaDB admin credentials
+##
+rootUser:
+  ## MariaDB admin password
+  ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-the-root-password-on-first-run
+  ##
+  password: ""
+  ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly.
+  ## If it is not force, a random password will be generated.
+  ##
+  forcePassword: false
+  ## Mount admin password as a file instead of using an environment variable
+  ##
+  injectSecretsAsVolume: false
+
+## Custom user/db credentials
+##
+db:
+  ## MariaDB username and password
+  ## ref: https://github.com/bitnami/bitnami-docker-mariadb#creating-a-database-user-on-first-run
+  ##
+  user: "magma"
+  password: "password"
+  ## Database to create
+  ## ref: https://github.com/bitnami/bitnami-docker-mariadb#creating-a-database-on-first-run
+  ##
+  name: magma
+  ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly.
+  ## If it is not force, a random password will be generated.
+  ##
+  forcePassword: false
+  ## Mount user password as a file instead of using an environment variable
+  ##
+  injectSecretsAsVolume: false
+
+## Replication configuration
+##
+replication:
+  ## Enable replication. This enables the creation of replicas of MariaDB. If false, only a
+  ## master deployment would be created
+  ##
+  enabled: false
+  ## MariaDB replication user
+  ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-up-a-replication-cluster
+  ##
+  user: replicator
+  ## MariaDB replication user password
+  ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-up-a-replication-cluster
+  ##
+  password: ""
+  ## Option to force users to specify a password. That is required for 'helm upgrade' to work properly.
+  ## If it is not force, a random password will be generated.
+  ##
+  forcePassword: false
+  ## Mount replication user password as a file instead of using an environment variable
+  ##
+  injectSecretsAsVolume: false
+
+## initdb scripts
+## Specify dictionary of scripts to be run at first boot
+## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory
+##
+# initdbScripts:
+#   my_init_script.sh: |
+#      #!/bin/sh
+#      echo "Do something."
+#
+## ConfigMap with scripts to be run at first boot
+## Note: This will override initdbScripts
+# initdbScriptsConfigMap:
+
+master:
+  ## Mariadb Master additional pod annotations
+  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+  # annotations:
+  #   key: value
+  #   another-key: another-value
+
+  ## MariaDB additional command line flags
+  ## Can be used to specify command line flags, for example:
+  ##
+  ## extraFlags: "--max-connect-errors=1000 --max_connections=155"
+
+  ## Affinity for pod assignment
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ##
+  affinity: {}
+
+  ## Kept for backwards compatibility. You can now disable it by removing it.
+  ## if you wish to set it through master.affinity.podAntiAffinity instead.
+  ##
+  antiAffinity: soft
+
+  ## Node labels for pod assignment
+  ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  ##
+  nodeSelector: {}
+
+  ## Tolerations for pod assignment
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  ##
+  tolerations: []
+
+  ## updateStrategy for MariaDB Master StatefulSet
+  ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
+  updateStrategy:
+    type: RollingUpdate
+
+  ## Enable persistence using Persistent Volume Claims
+  ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
+  ##
+  persistence:
+    ## If true, use a Persistent Volume Claim, If false, use emptyDir
+    ##
+    enabled: false
+    # Enable persistence using an existing PVC
+    # existingClaim:
+    # Subdirectory of the volume to mount
+    # subPath:
+    mountPath: /bitnami/mariadb
+    ## Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    ##
+    # storageClass: "-"
+    ## Persistent Volume Claim annotations
+    ##
+    annotations: {}
+    ## Persistent Volume Access Mode
+    ##
+    accessModes:
+    - ReadWriteOnce
+    ## Persistent Volume size
+    ##
+    size: 8Gi
+
+  extraInitContainers: |
+  # - name: do-something
+  #   image: busybox
+  #   command: ['do', 'something']
+
+  ## An array to add extra environment variables
+  ## For example:
+  ## extraEnvVars:
+  ##  - name: TZ
+  ##    value: "Europe/Paris"
+  ##
+  # extraEnvVars:
+
+  ## Configure MySQL with a custom my.cnf file
+  ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file
+  ##
+  config: |-
+    [mysqld]
+    skip-name-resolve
+    explicit_defaults_for_timestamp
+    basedir=/opt/bitnami/mariadb
+    plugin_dir=/opt/bitnami/mariadb/plugin
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    tmpdir=/opt/bitnami/mariadb/tmp
+    max_allowed_packet=16M
+    bind-address=0.0.0.0
+    pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
+    log-error=/opt/bitnami/mariadb/logs/mysqld.log
+    character-set-server=UTF8
+    collation-server=utf8_general_ci
+
+    [client]
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    default-character-set=UTF8
+    plugin_dir=/opt/bitnami/mariadb/plugin
+
+    [manager]
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
+
+  ## Configure master resource requests and limits
+  ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+  ##
+  resources: {}
+  livenessProbe:
+    enabled: true
+    ##
+    ## Initializing the database could take some time
+    initialDelaySeconds: 120
+    ##
+    ## Default Kubernetes values
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+  readinessProbe:
+    enabled: true
+    initialDelaySeconds: 30
+    ##
+    ## Default Kubernetes values
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
+
+  ## Allow customization of the service resource
+  ##
+  service:
+    ## Add custom annotations to the service
+    ##
+    annotations: {}
+      # external-dns.alpha.kubernetes.io/hostname: db.example.com
+
+slave:
+  replicas: 1
+
+  ## Mariadb Slave additional pod annotations
+  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+  # annotations:
+  #   key: value
+  #   another-key: another-value
+
+  ## MariaDB additional command line flags
+  ## Can be used to specify command line flags, for example:
+  ##
+  ## extraFlags: "--max-connect-errors=1000 --max_connections=155"
+
+  ## Affinity for pod assignment
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ##
+  affinity: {}
+
+  ## Kept for backwards compatibility. You can now disable it by removing it.
+  ## if you wish to set it through slave.affinity.podAntiAffinity instead.
+  ##
+  antiAffinity: soft
+
+  ## Node labels for pod assignment
+  ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  ##
+  nodeSelector: {}
+
+  ## Tolerations for pod assignment
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  ##
+  tolerations: []
+
+  ## updateStrategy for MariaDB Slave StatefulSet
+  ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
+  updateStrategy:
+    type: RollingUpdate
+
+  persistence:
+    ## If true, use a Persistent Volume Claim, If false, use emptyDir
+    ##
+    enabled: false
+    # storageClass: "-"
+    annotations:
+    accessModes:
+    - ReadWriteOnce
+    ## Persistent Volume size
+    ##
+    size: 8Gi
+
+  extraInitContainers: |
+  # - name: do-something
+  #   image: busybox
+  #   command: ['do', 'something']
+
+  ## An array to add extra environment variables
+  ## For example:
+  ## extraEnvVars:
+  ##  - name: TZ
+  ##    value: "Europe/Paris"
+  ##
+  # extraEnvVars:
+
+  ## Configure MySQL slave with a custom my.cnf file
+  ## ref: https://mysql.com/kb/en/mysql/configuring-mysql-with-mycnf/#example-of-configuration-file
+  ##
+  config: |-
+    [mysqld]
+    skip-name-resolve
+    explicit_defaults_for_timestamp
+    basedir=/opt/bitnami/mariadb
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    tmpdir=/opt/bitnami/mariadb/tmp
+    max_allowed_packet=16M
+    bind-address=0.0.0.0
+    pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
+    log-error=/opt/bitnami/mariadb/logs/mysqld.log
+    character-set-server=UTF8
+    collation-server=utf8_general_ci
+
+    [client]
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    default-character-set=UTF8
+
+    [manager]
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
+
+  ##
+  ## Configure slave resource requests and limits
+  ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+  ##
+  resources: {}
+  livenessProbe:
+    enabled: true
+    ##
+    ## Initializing the database could take some time
+    initialDelaySeconds: 120
+    ##
+    ## Default Kubernetes values
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+  readinessProbe:
+    enabled: true
+    initialDelaySeconds: 45
+    ##
+    ## Default Kubernetes values
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
+
+  ## Allow customization of the service resource
+  ##
+  service:
+    ## Add custom annotations to the service
+    ##
+    annotations: {}
+      # external-dns.alpha.kubernetes.io/hostname: rodb.example.com
+
+metrics:
+  enabled: false
+  image:
+    registry: docker.io
+    repository: bitnami/mysqld-exporter
+    tag: 0.12.1-debian-10-r27
+    pullPolicy: IfNotPresent
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  resources: {}
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port: "9104"
+
+  ## Extra args to be passed to mysqld_exporter
+  ## ref: https://github.com/prometheus/mysqld_exporter/
+  ##
+  extraArgs:
+    master: []
+    slave: []
+      # - --collect.auto_increment.columns
+      # - --collect.binlog_size
+      # - --collect.engine_innodb_status
+      # - --collect.engine_tokudb_status
+      # - --collect.global_status
+      # - --collect.global_variables
+      # - --collect.info_schema.clientstats
+      # - --collect.info_schema.innodb_metrics
+      # - --collect.info_schema.innodb_tablespaces
+      # - --collect.info_schema.innodb_cmp
+      # - --collect.info_schema.innodb_cmpmem
+      # - --collect.info_schema.processlist
+      # - --collect.info_schema.processlist.min_time
+      # - --collect.info_schema.query_response_time
+      # - --collect.info_schema.tables
+      # - --collect.info_schema.tables.databases
+      # - --collect.info_schema.tablestats
+      # - --collect.info_schema.userstats
+      # - --collect.perf_schema.eventsstatements
+      # - --collect.perf_schema.eventsstatements.digest_text_limit
+      # - --collect.perf_schema.eventsstatements.limit
+      # - --collect.perf_schema.eventsstatements.timelimit
+      # - --collect.perf_schema.eventswaits
+      # - --collect.perf_schema.file_events
+      # - --collect.perf_schema.file_instances
+      # - --collect.perf_schema.indexiowaits
+      # - --collect.perf_schema.tableiowaits
+      # - --collect.perf_schema.tablelocks
+      # - --collect.perf_schema.replication_group_member_stats
+      # - --collect.slave_status
+      # - --collect.slave_hosts
+      # - --collect.heartbeat
+      # - --collect.heartbeat.database
+      # - --collect.heartbeat.table
+
+  livenessProbe:
+    enabled: true
+    ##
+    ## Initializing the database could take some time
+    initialDelaySeconds: 120
+    ##
+    ## Default Kubernetes values
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+  readinessProbe:
+    enabled: true
+    initialDelaySeconds: 30
+    ##
+    ## Default Kubernetes values
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+
+  # Enable this if you're using https://github.com/coreos/prometheus-operator
+  serviceMonitor:
+    enabled: false
+    ## Specify a namespace if needed
+    # namespace: monitoring
+    # fallback to the prometheus default unless specified
+    # interval: 10s
+    # scrapeTimeout: 10s
+    ## Defaults to what's used if you follow CoreOS [Prometheus Install Instructions](https://github.com/helm/charts/tree/master/stable/prometheus-operator#tldr)
+    ## [Prometheus Selector Label](https://github.com/helm/charts/tree/master/stable/prometheus-operator#prometheus-operator-1)
+    ## [Kube Prometheus Selector Label](https://github.com/helm/charts/tree/master/stable/prometheus-operator#exporters)
+    selector:
+      prometheus: kube-prometheus
+
+## Bats Framework (= Bash Automated Testing System) is needed to test if MariaDB is accessible
+## See test-runner.yaml and tests.yaml for details.
+## To run the tests after the deployment, enter "helm test <release-name>".
+tests:
+  enabled: true
+  # resources: {}
+  testFramework:
+    image:
+      registry: docker.io
+      repository: dduportal/bats
+      tag: 0.4.0
+    # resources: {}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/.helmignore b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/.helmignore
new file mode 100644
index 00000000..50af0317
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/Chart.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/Chart.yaml
new file mode 100644
index 00000000..d5f1dc62
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/Chart.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for magma metrics
+keywords:
+- magma
+- or8cr
+- metrics
+name: metrics
+sources:
+- https://github.com/facebookincubator/magma
+version: 0.1.1
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/_helpers.tpl b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/_helpers.tpl
new file mode 100644
index 00000000..12afa6fc
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/_helpers.tpl
@@ -0,0 +1,45 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "metrics.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "metrics.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "metrics.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "metrics.labels" -}}
+app.kubernetes.io/name: {{ include "metrics.name" . }}
+helm.sh/chart: {{ include "metrics.chart" . }}
+app.kubernetes.io/instance: orc8r
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/alertmanager.deployment.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/alertmanager.deployment.yaml
new file mode 100644
index 00000000..b86ecc4b
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/alertmanager.deployment.yaml
@@ -0,0 +1,71 @@
+{{/*
+Copyright (c) 2018-present, Facebook, Inc.
+All rights reserved.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree. An additional grant
+of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+{{- if .Values.alertmanager.create }}
+{{- $serviceName := "orc8r-alertmanager" -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $serviceName }}
+  labels:
+    app.kubernetes.io/component: alertmanager
+{{ include "metrics.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.prometheus.replicas }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: alertmanager
+{{ include "selector-labels" . | indent 6 }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: alertmanager
+{{ include "selector-labels" . | indent 8 }}
+    spec:
+      {{- with .Values.alertmanager.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.alertmanager.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.alertmanager.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml . | trimSuffix "\n" | indent 8 }}
+      {{- end }}
+
+      volumes:
+        - name: "prometheus-config"
+{{ toYaml .Values.metrics.volumes.prometheusConfig.volumeSpec | indent 10 }}
+        - name: "prometheus-data"
+{{ toYaml .Values.metrics.volumes.prometheusData.volumeSpec | indent 10 }}
+
+      containers:
+        - name: "alertmanager"
+          image: {{ required "alertmanager.image.repository must be provided" .Values.alertmanager.image.repository }}:{{ .Values.alertmanager.image.tag }}
+          imagePullPolicy: {{ .Values.alertmanager.image.pullPolicy }}
+          volumeMounts:
+            - name: "prometheus-config"
+              mountPath: /etc/alertmanager
+              readOnly: true
+          ports:
+            - containerPort: 9093
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 9093
+            initialDelaySeconds: 10
+            periodSeconds: 30
+          resources:
+{{ toYaml .Values.alertmanager.resources | indent 12 }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/alertmanager.service.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/alertmanager.service.yaml
new file mode 100644
index 00000000..9dcf7ec9
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/alertmanager.service.yaml
@@ -0,0 +1,45 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+{{- if .Values.alertmanager.create }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: orc8r-alertmanager
+  #name: orc8r-alertmanager
+  labels:
+    app.kubernetes.io/component: alertmanager
+{{ include "metrics.labels" . | indent 4 }}
+    {{- with .Values.alertmanager.service.labels }}
+{{ toYaml . | indent 4}}
+    {{- end}}
+  {{- with .Values.alertmanager.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4}}
+  {{- end }}
+spec:
+  selector:
+    app.kubernetes.io/component: alertmanager
+{{ include "selector-labels" . | indent 4 }}
+  type: {{ .Values.alertmanager.service.type }}
+  ports:
+{{- range $port := .Values.alertmanager.service.ports }}
+     - name: {{ $port.name }}
+       port: {{ $port.port }}
+       targetPort: {{ $port.targetPort }}
+{{- end }}
+{{- if eq .Values.alertmanager.service.type "LoadBalancer" }}
+  {{- if .Values.alertmanager.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.alertmanager.service.loadBalancerIP }}
+  {{- end -}}
+  {{- if .Values.alertmanager.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range .Values.alertmanager.service.loadBalancerSourceRanges }}
+  - {{ . }}
+  {{- end }}
+  {{- end -}}
+{{- end -}}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/config-manager.deployment.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/config-manager.deployment.yaml
new file mode 100644
index 00000000..b7a9cb4b
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/config-manager.deployment.yaml
@@ -0,0 +1,76 @@
+{{/*
+Copyright (c) 2018-present, Facebook, Inc.
+All rights reserved.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree. An additional grant
+of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+{{- if .Values.configmanager.create }}
+{{- $serviceName := "orc8r-configmanager" -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $serviceName }}
+  labels:
+    app.kubernetes.io/component: configmanager
+{{ include "metrics.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.configmanager.replicas }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: configmanager
+{{ include "selector-labels" . | indent 6 }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: configmanager
+{{ include "selector-labels" . | indent 8 }}
+    spec:
+      {{- with .Values.configmanager.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.configmanager.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.configmanager.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml . | trimSuffix "\n" | indent 8 }}
+      {{- end }}
+
+      volumes:
+        - name: "prometheus-config"
+{{ toYaml .Values.metrics.volumes.prometheusConfig.volumeSpec | indent 10 }}
+
+      containers:
+        - name: "config-manager"
+          image: {{ required "configmanager.image.repository must be provided" .Values.configmanager.image.repository }}:{{ .Values.configmanager.image.tag }}
+          imagePullPolicy: {{ .Values.configmanager.image.pullPolicy }}
+          ports:
+            - containerPort: 9100
+            - containerPort: 9101
+          volumeMounts:
+            - name: "prometheus-config"
+              mountPath: /etc/configs
+          env:
+            - name: PROM_ALERTCONFIG_PORT
+              value: {{ .Values.configmanager.environment.promAlertconfigPort | quote }}
+            - name: RULES_DIR
+              value: {{ .Values.configmanager.environment.rulesDir | quote }}
+            - name: PROMETHEUS_URL
+              value: {{ .Values.configmanager.environment.prometheusURL | quote }}
+            - name: ALERTMANAGER_CONFIG_PORT
+              value: {{ .Values.configmanager.environment.alertmanagerConfigPort | quote }}
+            - name: ALERTMANAGER_CONF_PATH
+              value: {{ .Values.configmanager.environment.alertmanagerConfPath | quote }}
+            - name: ALERTMANAGER_URL
+              value: {{ .Values.configmanager.environment.alertmanagerURL | quote }}
+          resources:
+{{ toYaml .Values.configmanager.resources | indent 12 }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/config-manager.service.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/config-manager.service.yaml
new file mode 100644
index 00000000..6f42f37f
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/config-manager.service.yaml
@@ -0,0 +1,45 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+{{- if .Values.configmanager.create }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: orc8r-configmanager
+  #name: orc8r-configmanager
+  labels:
+    app.kubernetes.io/component: configmanager
+{{ include "metrics.labels" . | indent 4 }}
+    {{- with .Values.configmanager.service.labels }}
+{{ toYaml . | indent 4}}
+    {{- end}}
+  {{- with .Values.configmanager.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4}}
+  {{- end }}
+spec:
+  selector:
+    app.kubernetes.io/component: configmanager
+{{ include "selector-labels" . | indent 4 }}
+  type: {{ .Values.configmanager.service.type }}
+  ports:
+{{- range $port := .Values.configmanager.service.ports }}
+     - name: {{ $port.name }}
+       port: {{ $port.port }}
+       targetPort: {{ $port.targetPort }}
+{{- end }}
+{{- if eq .Values.configmanager.service.type "LoadBalancer" }}
+  {{- if .Values.configmanager.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.configmanager.service.loadBalancerIP }}
+  {{- end -}}
+  {{- if .Values.configmanager.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range .Values.configmanager.service.loadBalancerSourceRanges }}
+  - {{ . }}
+  {{- end }}
+  {{- end -}}
+{{- end -}}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/grafana.deployment.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/grafana.deployment.yaml
new file mode 100644
index 00000000..b4cb6a3c
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/grafana.deployment.yaml
@@ -0,0 +1,83 @@
+{{/*
+Copyright (c) 2018-present, Facebook, Inc.
+All rights reserved.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree. An additional grant
+of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+{{- if .Values.grafana.create }}
+{{- $serviceName := "orc8r-grafana" -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $serviceName }}
+  labels:
+    app.kubernetes.io/component: grafana
+{{ include "metrics.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.grafana.replicas }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: grafana
+{{ include "selector-labels" . | indent 6 }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: grafana
+{{ include "selector-labels" . | indent 8 }}
+    spec:
+      {{- with .Values.grafana.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.grafana.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.grafana.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml . | trimSuffix "\n" | indent 8 }}
+      {{- end }}
+
+      volumes:
+        - name: "grafana-data"
+{{ toYaml .Values.grafana.volumes.grafanaData.volumeSpec | indent 10 }}
+
+      initContainers:
+        - name: volume-mount
+          image: busybox
+          command: ["sh", "-c", "chmod -R 777 /grafanaData"]
+          volumeMounts:
+            - name: grafana-data
+              mountPath: /grafanaData
+
+      containers:
+        - name: "grafana"
+          image: {{ required "grafana.image.respository must be provided" .Values.grafana.image.repository }}:{{ .Values.grafana.image.tag }}
+          imagePullPolicy: {{ .Values.grafana.image.pullPolicy }}
+          ports:
+            - containerPort: 3000
+          env:
+            - name: PROMETHEUS_HOST
+              value: {{ .Values.grafana.environment.prometheusHost | quote }}
+            - name: PROMETHEUS_PORT
+              value: {{ .Values.grafana.environment.prometheusPort | quote }}
+
+          volumeMounts:
+            - name: "grafana-data"
+              mountPath: /var/lib/grafana
+
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 3000
+            initialDelaySeconds: 10
+            periodSeconds: 30
+          resources:
+{{ toYaml .Values.grafana.resources | indent 12 }}
+{{- end}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/grafana.service.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/grafana.service.yaml
new file mode 100644
index 00000000..2cf34894
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/grafana.service.yaml
@@ -0,0 +1,45 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+{{- if .Values.grafana.create }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: orc8r-grafana
+  #name: orc8r-grafana
+  labels:
+    app.kubernetes.io/component: grafana
+{{ include "metrics.labels" . | indent 4 }}
+    {{- with .Values.grafana.service.labels }}
+{{ toYaml . | indent 4}}
+    {{- end}}
+  {{- with .Values.grafana.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4}}
+  {{- end }}
+spec:
+  selector:
+    app.kubernetes.io/component: grafana
+{{ include "selector-labels" . | indent 4 }}
+  type: {{ .Values.grafana.service.type }}
+  ports:
+{{- range $port := .Values.grafana.service.ports }}
+     - name: {{ $port.name }}
+       port: {{ $port.port }}
+       targetPort: {{ $port.targetPort }}
+{{- end }}
+{{- if eq .Values.grafana.service.type "LoadBalancer" }}
+  {{- if .Values.grafana.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.grafana.service.loadBalancerIP }}
+  {{- end -}}
+  {{- if .Values.grafana.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range .Values.grafana.service.loadBalancerSourceRanges }}
+  - {{ . }}
+  {{- end }}
+  {{- end -}}
+{{- end -}}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus-cache.deployment.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus-cache.deployment.yaml
new file mode 100644
index 00000000..16a08c04
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus-cache.deployment.yaml
@@ -0,0 +1,62 @@
+{{/*
+Copyright (c) 2018-present, Facebook, Inc.
+All rights reserved.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree. An additional grant
+of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+{{- if .Values.prometheusCache.create }}
+{{- $serviceName := "orc8r-prometheus-cache" -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $serviceName }}
+  labels:
+    app.kubernetes.io/component: prometheus-cache
+{{ include "metrics.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.prometheusCache.replicas }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: prometheus-cache
+{{ include "selector-labels" . | indent 6 }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: prometheus-cache
+{{ include "selector-labels" . | indent 8 }}
+    spec:
+      {{- with .Values.prometheusCache.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.prometheusCache.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.prometheusCache.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml . | trimSuffix "\n" | indent 8 }}
+      {{- end }}
+
+      containers:
+        - name: "prometheus-cache"
+          image: {{ required "prometheusCache.image.repository must be provided" .Values.prometheusCache.image.repository }}:{{ .Values.prometheusCache.image.tag }}
+          imagePullPolicy: {{ .Values.prometheusCache.image.pullPolicy }}
+          ports:
+            - containerPort: 9091
+          args: ["-limit={{ .Values.prometheusCache.limit }}"]
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 9091
+            initialDelaySeconds: 10
+            periodSeconds: 30
+          resources:
+{{ toYaml .Values.prometheusCache.resources | indent 12 }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus-cache.service.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus-cache.service.yaml
new file mode 100644
index 00000000..6c8109d8
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus-cache.service.yaml
@@ -0,0 +1,44 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+{{- if .Values.prometheusCache.create }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: orc8r-prometheus-cache
+  labels:
+    app.kubernetes.io/component: prometheus-cache
+{{ include "metrics.labels" . | indent 4 }}
+    {{- with .Values.prometheusCache.service.labels }}
+{{ toYaml . | indent 4}}
+    {{- end}}
+  {{- with .Values.prometheusCache.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4}}
+  {{- end }}
+spec:
+  selector:
+    app.kubernetes.io/component: prometheus-cache
+{{ include "selector-labels" . | indent 4 }}
+  type: {{ .Values.prometheusCache.service.type }}
+  ports:
+{{- range $port := .Values.prometheusCache.service.ports }}
+     - name: {{ $port.name }}
+       port: {{ $port.port }}
+       targetPort: {{ $port.targetPort }}
+{{- end }}
+{{- if eq .Values.prometheusCache.service.type "LoadBalancer" }}
+  {{- if .Values.prometheusCache.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.prometheusCache.service.loadBalancerIP }}
+  {{- end -}}
+  {{- if .Values.prometheusCache.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range .Values.prometheusCache.service.loadBalancerSourceRanges }}
+  - {{ . }}
+  {{- end }}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus.deployment.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus.deployment.yaml
new file mode 100644
index 00000000..5f77e501
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus.deployment.yaml
@@ -0,0 +1,337 @@
+{{/*
+Copyright (c) 2018-present, Facebook, Inc.
+All rights reserved.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree. An additional grant
+of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+{{- if .Values.prometheus.create }}
+{{- $serviceName := "orc8r-prometheus" -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $serviceName }}
+  labels:
+    app.kubernetes.io/component: prometheus
+{{ include "metrics.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.prometheus.replicas }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: prometheus
+{{ include "selector-labels" . | indent 6 }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: prometheus
+{{ include "selector-labels" . | indent 8 }}
+    spec:
+      {{- with .Values.prometheus.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.prometheus.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.prometheus.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml . | trimSuffix "\n" | indent 8 }}
+      {{- end }}
+
+      volumes:
+        - name: "prometheus-config"
+{{ toYaml .Values.metrics.volumes.prometheusConfig.volumeSpec | indent 10 }}
+        - name: "prometheus-data"
+{{ toYaml .Values.metrics.volumes.prometheusData.volumeSpec | indent 10 }}
+        - name: "prometheus-config-file"
+          configMap:
+            name: prometheus-config-file
+        {{ if .Values.prometheus.includeOrc8rAlerts }}
+        - name: "orc8r-alert-rules"
+          configMap:
+            name: orc8r-alert-rules
+        {{- end}}
+
+  {{ if .Values.prometheus.useMinikube }}
+      initContainers:
+        - name: volume-mount
+          image: busybox
+          command: ["sh", "-c", "chmod -R 777 /prometheusData /etc/configs"]
+          volumeMounts:
+          - name: prometheus-data
+            mountPath: /prometheusData
+          - name: prometheus-config
+            mountPath: /etc/configs
+  {{ end }}
+
+      containers:
+        - name: "prometheus"
+          image: {{ required "prometheus.image.repository must be provided" .Values.prometheus.image.repository }}:{{ .Values.prometheus.image.tag }}
+          imagePullPolicy: {{ .Values.prometheus.image.pullPolicy }}
+          volumeMounts:
+            - name: "prometheus-config"
+              mountPath: /etc/prometheus
+              readOnly: true
+            - name: "prometheus-data"
+              mountPath: /data
+            - name: "prometheus-config-file"
+              mountPath: /prometheus
+            {{ if .Values.prometheus.includeOrc8rAlerts }}
+            - name: "orc8r-alert-rules"
+              mountPath: /etc/orc8r_alerts
+            {{- end}}
+          ports:
+            - containerPort: 9090
+          args: ['--config.file=/prometheus/prometheus.yml',
+                 '--storage.tsdb.retention.time={{ .Values.prometheus.retention.time }}',
+                 '--storage.tsdb.path=/data',
+                 '--web.enable-lifecycle']
+          livenessProbe:
+            httpGet:
+              path: /graph
+              port: 9090
+            initialDelaySeconds: 10
+            periodSeconds: 30
+          resources:
+{{ toYaml .Values.prometheus.resources | indent 12 }}
+
+# ---
+# apiVersion: v1
+# kind: PersistentVolumeClaim
+# metadata:
+#   name: prometheus-pvc
+# spec:
+#   accessModes:
+#   - ReadWriteOnce
+#   resources:
+#     requests:
+#       storage: 1Gi
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: prometheus-config-file
+data:
+  prometheus.yml: |
+    global:
+      scrape_interval:     15s # By default, scrape targets every 15 seconds.
+      evaluation_interval: 15s # By default, scrape targets every 15 seconds.
+      external_labels:
+        monitor: 'master'
+
+    scrape_configs:
+      - job_name: 'prometheus'
+        static_configs:
+          - targets: ['localhost:9090']
+
+      - job_name: "magma_pushgateway"
+        honor_labels: true
+        metric_relabel_configs:
+          - regex: 'job'
+            action: labeldrop
+          - regex: 'instance'
+            action: labeldrop
+        static_configs:
+          - targets: ['{{ .Values.prometheus.prometheusCacheHostname }}:9091']
+
+    rule_files:
+      - '/etc/prometheus/alert_rules/*_rules.yml'
+    {{ if .Values.prometheus.includeOrc8rAlerts }}
+      - '/etc/orc8r_alerts/*_rules.yml'
+    {{- end }}
+
+    alerting:
+      alertmanagers:
+        - scheme: http
+          static_configs:
+            - targets: ['{{ .Values.prometheus.alertmanagerHostname }}:9093']
+
+{{ if .Values.prometheus.includeOrc8rAlerts }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: orc8r-alert-rules
+data:
+  cloud_alert_rules.yml: |
+    groups:
+    - name: cloud
+      rules:
+
+    # Disk Usage
+      - alert: disk usage on cloud instance exceeds threshold
+        expr: disk_used / disk_total > 0.88
+        for: 5m
+        labels:
+          severity: critical
+          magma_alert_type: cloud
+          networkID: orc8r
+        annotations:
+          description: "Disk usage on cloud instance exceeds threshold. See ods chart for detail."
+          recovery: "No recovery steps configured currently"
+
+    # Rest 5xx Alerts
+      - alert: REST API 5xx responses
+        expr: rate(response_status{code=~"5.*"}[1m]) > 0
+        for: 5m
+        labels:
+          severity: major
+          magma_alert_type: cloud
+          networkID: orc8r
+        annotations:
+          description: "Obsidian recorded a 5XX response."
+          recovery: "No recovery steps configured currently"
+
+    # Failed Cloud Service
+      - alert: Failed Cloud Service
+        expr: get_metrics_status{serviceName!="METRICSD"} < 1
+        for: 7m
+        labels:
+          severity: critical
+          magma_alert_type: cloud
+          networkID: orc8r
+        annotations:
+          description: "Cloud service {{`{{ $labels.ServiceName }}`}} down."
+          recovery: "No recovery steps configured currently"
+
+    # Alert for metrics down to inhibit other service alerts
+      - alert: Failed Metrics Service
+        expr: get_metrics_status{serviceName="METRICSD"} < 1
+        for: 5m
+        labels:
+          severity: critical
+          magma_alert_type: cloud
+          networkID: orc8r
+        annotations:
+          description: "Cloud service {{`{{ $labels.ServiceName }}`}} down."
+          recovery: "No recovery steps configured currently"
+
+
+  gateway_alert_rules.yml: |
+    groups:
+      - name: gateways
+        rules:
+
+        - alert: Gateway Memory Usage
+          expr: avg_over_time(virtual_memory_percent[5m]) > 90
+          for: 5m
+          labels:
+            severity: major
+            magma_alert_type: gateway
+            networkID: orc8r
+            originatingNetwork: "{{`{{ $labels.networkID }}`}}"
+          annotations:
+            description: "Gateway {{`{{ $labels.gatewayID }}`}} memory usage is too high at 90% for over 5 minutes on network {{`{{ $labels.networkID }}`}}."
+            recovery: "No recovery steps configured currently."
+
+        - alert: Multiple gateways are failing to check in
+          expr: sum(gateway_checkin_status) / count(gateway_checkin_status) <= 0.5
+          for: 7m
+          labels:
+            severity: major
+            magma_alert_type: gateway
+            networkID: orc8r
+            originatingNetwork: "{{`{{ $labels.networkID }}`}}"
+          annotations:
+            description: "At least 50% of gateways have not checked in the last 7 minutes!"
+            recovery: >
+              This many checkins failing likely means that there is a major crash
+              in gateway code or there is a certificate/nginx issue. First see if
+              you can ssh into any of the boxes and check syslog to see if it's
+              able to contact the cloud.
+
+        - alert: Metrics missing
+          expr: sum(process_cpu_seconds_total{job!="prometheus"}) by (networkID, gatewayID) unless sum(gateway_checkin_status) by (networkID, gatewayID)
+          for: 5m
+          labels:
+            severity: minor
+            magma_alert_type: gateway
+            networkID: orc8r
+            originatingNetwork: "{{`{{ $labels.networkID }}`}}"
+          annotations:
+            description: "Gateway {{`{{ $labels.gatewayID }}`}} hasn't sent metrics for at least 5 minutes on network {{`{{ $labels.networkID }}`}}."
+            recovery: "No recovery steps configured currently."
+
+        - alert: Gateway service down
+          expr: process_uptime_seconds > 120 and service_metrics_collected < 1
+          for: 7m
+          labels:
+            severity: major
+            magma_alert_type: gateway
+            networkID: orc8r
+            originatingNetwork: "{{`{{ $labels.networkID }}`}}"
+          annotations:
+            description: "{{`{{ $labels.service }}`}} has been down on gateway {{`{{ $labels.gatewayID }}`}} for at least 7 minutes."
+            recovery: "SSH into gateway and inspect service. Manually restart if necessary."
+
+        - alert: Unattended Upgrades active
+          expr: unattended_upgrade_status > 0
+          for: 5m
+          labels:
+            severity: critical
+            magma_alert_type: gateway
+            networkID: orc8r
+            originatingNetwork: "{{`{{ $labels.networkID }}`}}"
+          annotations:
+            description: "Unattended upgrades can update kernel in gateway {{`{{ $labels.gatewayID }}`}} on network {{`{{ $labels.networkID }}`}}"
+            recovery: >
+              If Unattended Upgrades package is active this means the gateway might
+              automatically upgrade the kernel to an unsupported version. The best
+              remedy is to SSH into the gateway and remove unattended upgrades
+              package using the command
+              `sudo apt-get purge --auto-remove unattended-upgrades`. We should
+              also check how this package was downloaded in
+              /var/log/apt/history.log.
+
+        - alert: Unexpected service restart
+          expr: rate(unexpected_service_restarts[1m]) > 0.1
+          for: 15m
+          labels:
+            severity: major
+            magma_alert_type: gateway
+            networkID: orc8r
+          annotations:
+            description: "Unexpected service restart in gateway {{`{{ $labels.gatewayID }}`}} on network {{`{{ $labels.networkID }}`}}"
+            recovery: "Check /var/log/syslog in the gateway for the root cause."
+
+  metrics_alert_rules.yml: |
+    groups:
+      - name: metrics
+        rules:
+        - alert: Target down
+          expr: up == 0
+          labels:
+            severity: major
+            network_id: internal
+            magma_alert_type: metrics
+            networkID: orc8r
+          annotations:
+            summary: "Instance {{`{{ $labels.instance }}`}} - target is down"
+
+        - alert: Prometheus Cache utilization high
+          expr: cache_size / cache_limit > 0.7
+          labels:
+            severity: major
+            network_id: internal
+            magma_alert_type: metrics
+            networkID: orc8r
+          annotations:
+            description: "Prometheus cache is running out of space"
+
+  {{ if .Values.prometheus.customAlerts }}
+  custom_alert_rules.yml: |
+    groups:
+      - name: custom
+        rules:
+{{ toYaml .Values.prometheus.customAlerts | indent 8 }}
+  {{- end}}
+
+{{- end}}
+{{- end}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus.service.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus.service.yaml
new file mode 100644
index 00000000..b6018a3d
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/templates/prometheus.service.yaml
@@ -0,0 +1,44 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+{{- if .Values.prometheus.create }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: orc8r-prometheus
+  labels:
+    app.kubernetes.io/component: prometheus
+{{ include "metrics.labels" . | indent 4 }}
+    {{- with .Values.prometheus.service.labels }}
+{{ toYaml . | indent 4}}
+    {{- end}}
+  {{- with .Values.prometheus.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4}}
+  {{- end }}
+spec:
+  selector:
+    app.kubernetes.io/component: prometheus
+{{ include "selector-labels" . | indent 4 }}
+  type: {{ .Values.prometheus.service.type }}
+  ports:
+{{- range $port := .Values.prometheus.service.ports }}
+     - name: {{ $port.name }}
+       port: {{ $port.port }}
+       targetPort: {{ $port.targetPort }}
+{{- end }}
+{{- if eq .Values.prometheus.service.type "LoadBalancer" }}
+  {{- if .Values.prometheus.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.prometheus.service.loadBalancerIP }}
+  {{- end -}}
+  {{- if .Values.prometheus.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range .Values.prometheus.service.loadBalancerSourceRanges }}
+  - {{ . }}
+  {{- end }}
+  {{- end -}}
+{{- end -}}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/values.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/values.yaml
new file mode 100644
index 00000000..ed07a90f
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/metrics/values.yaml
@@ -0,0 +1,239 @@
+# Default values for metrics.
+imagePullSecrets: []
+
+metrics:
+  # Default volume configurations for metrics data - shared across prometheus,
+  # alertmanager, and configmanager pods
+  volumes:
+    prometheusData:
+      volumeSpec:
+        emptyDir: {}
+#        persistentVolumeClaim:
+#          claimName: prometheus-pvc
+#        hostPath:
+#          path: /prometheusData
+#          type: DirectoryOrCreate
+    prometheusConfig:
+      volumeSpec:
+        emptyDir: {}
+#        hostPath:
+#          path: /configs/prometheus
+#          type: DirectoryOrCreate
+
+prometheus:
+  # Enable/Disable chart
+  create: true
+
+  # Preconfigure alerts for orchestrator in prometheus
+  includeOrc8rAlerts: false
+
+  prometheusCacheHostname: "orc8r-prometheus-cache"
+  alertmanagerHostname: "orc8r-alertmanager"
+
+  replicas: 1
+
+  # Set to 1 if using a minikube setup
+  useMinikube:
+
+  # Retention configurations for prometheus
+  retention:
+    time: 30d
+
+  service:
+    annotations: {}
+    labels: {}
+    type: ClusterIP
+    ports:
+      - name: prometheus
+        port: 9090
+        targetPort: 9090
+
+  image:
+    repository: docker.io/prom/prometheus
+    tag: v2.12.0
+    pullPolicy: IfNotPresent
+
+  resources: {}
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+
+  customAlerts: []
+
+alertmanager:
+  # Enable/Disable chart
+  create: false
+
+  replicas: 1
+
+  service:
+    annotations: {}
+    labels: {}
+    type: ClusterIP
+    ports:
+      - name: alertmanager
+        port: 9093
+        targetPort: 9093
+
+  image:
+    repository: docker.io/prom/alertmanager
+    tag: v0.18.0
+    pullPolicy: IfNotPresent
+
+  resources: {}
+  nodeSelector: {}
+  tolerations: []
+  # Pod affinity must be used to ensure that this pod runs on same node as prometheus
+  affinity:
+    podAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        - labelSelector:
+            matchExpressions:
+              - key: app.kubernetes.io/component
+                operator: In
+                values:
+                  - prometheus
+          topologyKey: "kubernetes.io/hostname"
+
+configmanager:
+  # Enable/Disable chart
+  create: true
+
+  replicas: 1
+
+  service:
+    annotations: {}
+    labels: {}
+    type: ClusterIP
+    ports:
+      - name: prom-configmanager
+        port: 9100
+        targetPort: 9100
+      - name: alertmanager-config
+        port: 9101
+        targetPort: 9101
+
+  environment:
+    promAlertconfigPort: "9100"
+    rulesDir: "/etc/configs/alert_rules"
+    prometheusURL: "orc8r-prometheus:9090"
+    alertmanagerConfigPort: "9101"
+    alertmanagerConfPath: "/etc/configs/alertmanager.yml"
+    alertmanagerURL: "orc8r-alertmanager:9093"
+
+  image:
+    repository: fjvicens/orc8r_config-manager
+    tag: latest
+    pullPolicy: IfNotPresent
+
+  resources: {}
+  nodeSelector: {}
+  tolerations: []
+  # Pod affinity must be used to ensure that this pod runs on same node as prometheus
+  affinity:
+    podAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        - labelSelector:
+            matchExpressions:
+              - key: app.kubernetes.io/component
+                operator: In
+                values:
+                  - prometheus
+          topologyKey: "kubernetes.io/hostname"
+
+prometheusCache:
+  # Enable/Disable chart
+  create: true
+  # Service configuration.
+  service:
+    annotations: {}
+    labels: {}
+    type: ClusterIP
+    ports:
+      - name: orc8r-prometheus-cache
+        port: 9091
+        targetPort: 9091
+
+  image:
+    repository: fjvicens/orc8r_prometheus-cache
+    tag: latest
+    pullPolicy: IfNotPresent
+
+  # Maximum number of datapoints in the cache at one time. Unlimited if <= 0.
+  limit: 0
+
+  # Number of metrics replicas desired
+  replicas: 1
+
+  # Resource limits & requests
+  resources: {}
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+  # Define which Nodes the Pods are scheduled on.
+  # ref: https://kubernetes.io/docs/user-guide/node-selection/
+  nodeSelector: {}
+
+  # Tolerations for use with node taints
+  # ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
+
+  # Assign prometheusCache to run on specific nodes
+  # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  affinity: {}
+
+grafana:
+  # Enable/Disable chart
+  create: true
+  # Service configuration.
+  service:
+    annotations: {}
+    labels: {}
+    type: ClusterIP
+    ports:
+      - name: grafana
+        port: 3000
+        targetPort: 3000
+
+  environment:
+    prometheusHost: "orc8r-prometheus"
+    prometheusPort: "9090"
+
+  volumes:
+    # Default volume configurations for grafana data.
+    grafanaData:
+      volumeSpec:
+        emptyDir: {}
+
+  image:
+    repository: fjvicens/orc8r_grafana
+    tag: latest
+    pullPolicy: IfNotPresent
+
+  # Number of metrics replicas desired
+  replicas: 1
+
+  # Resource limits & requests
+  resources: {}
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+  # Define which Nodes the Pods are scheduled on.
+  # ref: https://kubernetes.io/docs/user-guide/node-selection/
+  nodeSelector: {}
+
+  # Tolerations for use with node taints
+  # ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
+
+  # Assign grafana to run on specific nodes
+  # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  affinity: {}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/Chart.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/Chart.yaml
new file mode 100644
index 00000000..4b48640a
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/Chart.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+description: Magma NMS
+home: https://github.com/facebookincubator/magma
+keywords:
+- magma
+- nms
+- orc8r
+name: nms
+sources:
+- https://github.com/facebookincubator/magma
+version: 0.1.0
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/README.md b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/README.md
new file mode 100644
index 00000000..360c33d6
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/README.md
@@ -0,0 +1,109 @@
+## NMS
+
+Install NMS which includes nginx and magmalte subcomponents.
+
+## Install charts
+
+```
+$ helm upgrade --install nms ./nms --namespace=magma
+```
+
+## Overview
+
+This chart installs the magma NMS. The NMS is the UI for managing, configuring, and monitoring networks.
+
+## Prerequisites
+
+1. we will first need the orc8r to be setup
+
+2. API and Nginx certs present under secrets named `orc8r-secrets-certs`
+
+3. MySql Database created for NMS
+
+4. magmalte image ( build using Docker file https://github.com/facebookincubator/magma/blob/master/nms/fbcnms-projects/magmalte/Dockerfile )
+
+
+
+## Configuration
+
+The following table list the configurable parameters of the NMS chart and their default values.
+
+| Parameter        | Description     | Default   |
+| ---              | ---             | ---       |
+| magmalte:        |
+| `manifests.secrets` | Enable Magmalte secrets to store mysql info. | `true` |
+| `manifests.deployment` | Enable Magmalte deployment | `true` |
+| `manifests.service` | Enable Magmalte services. | `true` |
+| `env.api_host` | orc8r proxy endpoint. | `[]` |
+| `env.host` | Host to bind | `[]` |
+| `env.port` | Magmalte service port bind. | `{}` |
+| `env.mapbox_access_token` | Mapbox Access token. | `` |
+| `env.mysql_host` | MySQL host IP/Name. | `` |
+| `env.mysql_db` | NMS Database name. | `` |
+| `env.mysql_user` | NMS Database user. | `` |
+| `env.mysql_pass` | NMS Database password. | `` |
+| `labels.node_selector_key` | Target Node selector label Key. | `` |
+| `labels.node_selector_value` | Target Node selector label value. | `` |
+| `image.repository` | Repository for NMS Magmalte image. | `nil` |
+| `image.tag` | Tag for NMS Magmalte image. | `latest` |
+| `image.pullPolicy` | Pull policy for NMS Magmalte image. | `IfNotPresent` |
+| `service.type` | Service type for magmalte | `ClusterIP` |
+| `service.http.port` | Service port number for magmalte | `8081` |
+| `service.http.targetport` | Service targetport number for magmalte | `8081` |
+| `service.http.nodePort` | Service nodePort number | `""` |
+| Nginx:       |
+| `manifests.configmap` | Enable Nginx configmap to store config files. | `true` |
+| `manifests.deployment` | Enable Nginx deployment | `true` |
+| `manifests.service` | Enable Nginx services. | `true` |
+| `labels.node_selector_key` | Target Node selector label Key. | `` |
+| `labels.node_selector_value` | Target Node selector label value. | `` |
+| `image.repository` | Repository for NMS Nginx image. | `nil` |
+| `image.tag` | Tag for NMS Nginx image. | `latest` |
+| `image.pullPolicy` | Pull policy for NMS Nginx image. | `IfNotPresent` |
+| `service.type` | Service type for Nginx | `ClusterIP` |
+| `service.http.port` | Service port number for Nginx | `443` |
+| `service.http.targetport` | Service targetport number for Nginx | `443` |
+| `service.http.nodePort` | Service nodePort number | `""` |
+| Global: |
+| `pod.replicas.nginx.server` | Number of instances to deploy for Nginx server. | `1` |
+| `pod.replicas.magmalte.server` | Number of instances to deploy for Magmalte server. | `1` |
+| `pod.resources.enabled` | Enable resources requests and limits for Pods. | `False` |
+| `pod.resources.nginx.requests` | Define resources requests and limits for Nginx Pods. | `{}` |
+| `pod.resources.magmalte.requests` | Define resources requests and limits for Magmalte Pods. | `{}` |
+| `proxy.nodeSelector` | Define which Nodes the Pods are scheduled on. | `{}` |
+| `proxy.tolerations` | If specified, the pod's tolerations. | `[]` |
+| `proxy.affinity` | Assign the orchestrator proxy to run on specific nodes. | `{}` |
+
+```
+- Install NMS chart:
+```bash
+$ cat values.yaml
+magmalte:
+  env:
+    mapbox_access_token: ""
+    mysql_host: mariadb.magma.svc.cluster.local
+    mysql_db: magma
+    mysql_user: magma
+    mysql_pass: password
+
+  image:
+    repository: docker.io/magmalte
+
+$ helm upgrade --install nms ./nms --namespace=magma
+
+```
+- Create Admin user:
+```bash
+kubectl exec -it -n magma $(kubectl get pod -n magma  \
+-l app.kubernetes.io/component=magmalte -o jsonpath="{.items[0].metadata.name}") \
+-- yarn run setAdminPassword admin@magma.test password1234
+```
+
+- NMS Dashboard should be reachable via https://<nginx_svc>
+
+Get nginx_svc with following command 
+
+```bash
+kubectl get svc -n magma -l app.kubernetes.io/component=nginx,app.kubernetes.io/instance=nms \ 
+-o jsonpath="{.items[0].spec.clusterIP}"
+```
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/configmap-nginx-etc.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/configmap-nginx-etc.yaml
new file mode 100644
index 00000000..9dfe6727
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/configmap-nginx-etc.yaml
@@ -0,0 +1,21 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+{{- if .Values.nginx.manifests.configmap }}
+{{- $envAll := . }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nginx-proxy-etc
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ tuple $envAll "nms" "nginx" | include "nms.labels" | indent 4 }}
+data:
+  nginx_proxy_ssl.conf: |
+{{ tuple "etc/_nginx_proxy_ssl.conf.tpl" . | include "nms.template" | indent 4 }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/etc/_nginx_proxy_ssl.conf.tpl b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/etc/_nginx_proxy_ssl.conf.tpl
new file mode 100644
index 00000000..d7c01459
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/etc/_nginx_proxy_ssl.conf.tpl
@@ -0,0 +1,9 @@
+server {
+  listen 443;
+  ssl on;
+  ssl_certificate /etc/nginx/conf.d/nms_nginx.pem;
+  ssl_certificate_key /etc/nginx/conf.d/nms_nginx.key.pem;
+  location / {
+     proxy_pass http://magmalte:8081;
+  }
+}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/helpers/labels.tpl b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/helpers/labels.tpl
new file mode 100644
index 00000000..56e13644
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/helpers/labels.tpl
@@ -0,0 +1,31 @@
+{{/*
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+
+{{- define "nms.labels" -}}
+{{- $envAll := index . 0 -}}
+{{- $application := index . 1 -}}
+{{- $component := index . 2 -}}
+release_group: {{ $envAll.Values.release_group | default $envAll.Release.Name }}
+app.kubernetes.io/name: {{ $application }}
+app.kubernetes.io/component: {{ $component }}
+app.kubernetes.io/instance: {{ $envAll.Release.Name }}
+app.kubernetes.io/managed-by: helm
+app.kubernetes.io/part-of: magma
+{{- end -}}
+
+{{/* Generate selector labels */}}
+{{- define "nms.selector-labels" -}}
+{{- $envAll := index . 0 -}}
+{{- $application := index . 1 -}}
+{{- $component := index . 2 -}}
+release_group: {{ $envAll.Values.release_group | default $envAll.Release.Name }}
+app.kubernetes.io/name: {{ $application }}
+app.kubernetes.io/component: {{ $component }}
+app.kubernetes.io/instance: {{ $envAll.Release.Name }}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/helpers/resources.tpl b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/helpers/resources.tpl
new file mode 100644
index 00000000..06b8476a
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/helpers/resources.tpl
@@ -0,0 +1,34 @@
+{{/*
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+
+{{- define "nms.kubernetes_resources" -}}
+{{- $envAll := index . 0 -}}
+{{- $component := index . 1 -}}
+{{- if $envAll.Values.pod.resources.enabled -}}
+resources:
+  {{- if or $component.limits.cpu $component.limits.memory }}
+  limits:
+    {{- if $component.limits.cpu }}
+    cpu: {{ $component.limits.cpu | quote }}
+    {{- end }}
+    {{- if $component.limits.memory }}
+    memory: {{ $component.limits.memory | quote }}
+    {{- end }}
+  {{- end }}
+  {{- if or $component.requests.cpu $component.requests.memory }}
+  requests:
+    {{- if $component.requests.cpu }}
+    cpu: {{ $component.requests.cpu | quote }}
+    {{- end }}
+    {{- if $component.requests.memory }}
+    memory: {{ $component.requests.memory | quote }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/helpers/template.tpl b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/helpers/template.tpl
new file mode 100644
index 00000000..d499abee
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/helpers/template.tpl
@@ -0,0 +1,16 @@
+{{/*
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+
+{{- define "nms.template" -}}
+{{- $name := index . 0 -}}
+{{- $context := index . 1 -}}
+{{- $last := base $context.Template.Name }}
+{{- $filepath := $context.Template.Name | replace $last $name -}}
+{{ include $filepath $context }}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/magmalte-deployment.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/magmalte-deployment.yaml
new file mode 100644
index 00000000..8d38e736
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/magmalte-deployment.yaml
@@ -0,0 +1,177 @@
+{{/*
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+
+{{- if .Values.magmalte.manifests.deployment }}
+{{- $envAll := . }}
+
+{{- $saNamespace := $envAll.Release.Namespace }}
+{{- $serviceAccountName := printf "%s" .Release.Name }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nms-magmalte
+  labels:
+{{ tuple $envAll "nms" "magmalte" | include "nms.labels" | indent 4 }}
+spec:
+  replicas: {{ .Values.pod.replicas.magmalte.server }}
+  selector:
+    matchLabels:
+{{ tuple $envAll "nms" "magmalte" | include "nms.selector-labels" | indent 6 }}
+  template:
+    metadata:
+      labels:
+{{ tuple $envAll "nms" "magmalte" | include "nms.selector-labels" | indent 8 }}
+    spec:
+      {{- if .Values.magmalte.manifests.rbac }}
+      serviceAccountName: {{ $serviceAccountName }}
+      {{- end }}
+      {{- with .Values.magmalte.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.magmalte.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      #nodeSelector:
+      #  {{ .Values.magmalte.labels.node_selector_key }}: {{ .Values.magmalte.labels.node_selector_value | quote }}
+      terminationGracePeriodSeconds: 60
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml . | trimSuffix "\n" | indent 8 }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.magmalte.image.repository }}:{{ .Values.magmalte.image.tag }}"
+          lifecycle:
+            postStart:
+              exec:
+                command: ["/bin/sh", "-c", "screen -dmS config '/bin/sleep 120; yarn setAdminPassword osm@etsi.org magma'"]
+          imagePullPolicy: {{ .Values.magmalte.image.pullPolicy }}
+{{ tuple $envAll $envAll.Values.pod.resources.magmalte | include "nms.kubernetes_resources" | indent 10 }}
+          args:
+            - yarn
+            - run
+            - start:dev
+          env:
+            - name: API_CERT_FILENAME
+              value: /usr/src/fbcnms-projects/magmalte/certs/admin_operator.pem
+            - name: API_PRIVATE_KEY_FILENAME
+              value: /usr/src/fbcnms-projects/magmalte/certs/admin_operator.key.pem
+            - name: API_HOST
+              value: {{ .Values.magmalte.env.api_host | quote }}
+            - name: HOST
+              value: {{ .Values.magmalte.env.host | quote }}
+            - name: PORT
+              value: {{ .Values.magmalte.env.port | quote }}
+            - name: MAPBOX_ACCESS_TOKEN
+              value: {{ .Values.magmalte.env.mapbox_access_token | quote }}
+            - name: MYSQL_DB
+              value: {{ .Values.magmalte.env.mysql_db | quote }}
+            - name: MYSQL_HOST
+              value: {{ .Values.magmalte.env.mysql_host | quote }}
+            - name: MYSQL_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: magmalte-mysql-secrets
+                  key: MYSQL_PASS
+            - name: MYSQL_USER
+              valueFrom:
+                secretKeyRef:
+                  name: magmalte-mysql-secrets
+                  key: MYSQL_USER
+          livenessProbe:
+            exec:
+              command:
+              - curl 
+              - http://localhost:8081/healthz
+            initialDelaySeconds: 60
+          ports:
+            - containerPort: 8081
+          volumeMounts:
+            - name: orc8r-secrets-certs
+              mountPath: /usr/src/fbcnms-projects/magmalte/certs/admin_operator.pem
+              subPath: admin_operator.pem
+            - name: orc8r-secrets-certs
+              mountPath: /usr/src/fbcnms-projects/magmalte/certs/admin_operator.key.pem
+              subPath: admin_operator.key.pem
+      volumes:
+        - name: orc8r-secrets-certs
+          secret:
+            secretName: orc8r-secrets-certs
+            defaultMode: 0444
+
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: orc8r-magmalte
+spec:
+  template:
+    spec:
+      restartPolicy: OnFailure
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.magmalte.image.repository }}:{{ .Values.magmalte.image.tag }}"
+          imagePullPolicy: {{ .Values.magmalte.image.pullPolicy }}
+{{ tuple $envAll $envAll.Values.pod.resources.magmalte | include "nms.kubernetes_resources" | indent 10 }}
+          args:
+            - yarn
+            - setAdminPassword 
+            - admin@magma.test 
+            - password1234
+          env:
+            - name: API_CERT_FILENAME
+              value: /usr/src/fbcnms-projects/magmalte/certs/admin_operator.pem
+            - name: API_PRIVATE_KEY_FILENAME
+              value: /usr/src/fbcnms-projects/magmalte/certs/admin_operator.key.pem
+            - name: API_HOST
+              value: {{ .Values.magmalte.env.api_host | quote }}
+            - name: HOST
+              value: {{ .Values.magmalte.env.host | quote }}
+            - name: PORT
+              value: {{ .Values.magmalte.env.port | quote }}
+            - name: MAPBOX_ACCESS_TOKEN
+              value: {{ .Values.magmalte.env.mapbox_access_token | quote }}
+            - name: MYSQL_DB
+              value: {{ .Values.magmalte.env.mysql_db | quote }}
+            - name: MYSQL_HOST
+              value: {{ .Values.magmalte.env.mysql_host | quote }}
+            - name: MYSQL_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: magmalte-mysql-secrets
+                  key: MYSQL_PASS
+            - name: MYSQL_USER
+              valueFrom:
+                secretKeyRef:
+                  name: magmalte-mysql-secrets
+                  key: MYSQL_USER
+          livenessProbe:
+            exec:
+              command:
+              - curl 
+              - http://localhost:8081/healthz
+            initialDelaySeconds: 60
+          ports:
+            - containerPort: 8081
+          volumeMounts:
+            - name: orc8r-secrets-certs
+              mountPath: /usr/src/fbcnms-projects/magmalte/certs/admin_operator.pem
+              subPath: admin_operator.pem
+            - name: orc8r-secrets-certs
+              mountPath: /usr/src/fbcnms-projects/magmalte/certs/admin_operator.key.pem
+              subPath: admin_operator.key.pem
+      volumes:
+        - name: orc8r-secrets-certs
+          secret:
+            secretName: orc8r-secrets-certs
+            defaultMode: 0444
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/magmalte-service.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/magmalte-service.yaml
new file mode 100644
index 00000000..18ff0b80
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/magmalte-service.yaml
@@ -0,0 +1,45 @@
+{{/*
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+
+{{- if .Values.magmalte.manifests.service }}
+{{- $envAll := . }}
+{{ $serviceType := .Values.magmalte.service.type }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: magmalte
+  labels:
+{{ tuple $envAll "nms" "magmalte" | include "nms.labels" | indent 4 }}
+spec:
+  selector:
+{{ tuple $envAll "nms" "magmalte" | include "nms.selector-labels" | indent 4 }}
+  type: "{{ .Values.magmalte.service.type }}"
+  ports:
+  - name: http
+    port: {{ .Values.magmalte.service.http.port }}
+    targetPort: {{ .Values.magmalte.service.http.targetPort }}
+    protocol: TCP
+    {{- if eq $serviceType "NodePort" }}
+    {{- if .Values.magmalte.service.http.nodePort }}
+    nodePort: {{ .Values.magmalte.service.http.nodePort }}
+    {{- end -}}
+    {{- end -}}
+{{- if eq $serviceType "LoadBalancer" }}
+  {{- if .Values.magmalte.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.magmalte.service.loadBalancerIP }}
+  {{- end -}}
+  {{- if .Values.magmalte.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range .Values.magmalte.service.loadBalancerSourceRanges }}
+  - {{ . }}
+  {{- end }}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/nginx-proxy-deployment.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/nginx-proxy-deployment.yaml
new file mode 100644
index 00000000..b446bd8c
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/nginx-proxy-deployment.yaml
@@ -0,0 +1,81 @@
+{{/*
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+
+{{- if .Values.nginx.manifests.deployment }}
+{{- $envAll := . }}
+
+{{- $saNamespace := $envAll.Release.Namespace }}
+{{- $serviceAccountName := printf "%s" .Release.Name }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nms-nginx-proxy
+  labels:
+{{ tuple $envAll "nms" "nginx" | include "nms.labels" | indent 4 }}
+spec:
+  replicas: {{ .Values.pod.replicas.nginx.server }}
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+{{ tuple $envAll "nms" "nginx" | include "nms.selector-labels" | indent 6 }}
+  template:
+    metadata:
+      labels:
+{{ tuple $envAll "nms" "nginx" | include "nms.selector-labels" | indent 8 }}
+    spec:
+      {{- if .Values.nginx.manifests.rbac }}
+      serviceAccountName: {{ $serviceAccountName }}
+      {{- end }}
+      {{- with .Values.nginx.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.nginx.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      #nodeSelector:
+      #  {{ .Values.nginx.labels.node_selector_key }}: {{ .Values.nginx.labels.node_selector_value | quote }}
+      terminationGracePeriodSeconds: 60
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml . | trimSuffix "\n" | indent 8 }}
+      {{- end }}
+      restartPolicy: Always
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}"
+          imagePullPolicy: {{ .Values.nginx.image.pullPolicy }}
+{{ tuple $envAll $envAll.Values.pod.resources.nginx | include "nms.kubernetes_resources" | indent 10 }}
+          ports:
+            - containerPort: 443
+          volumeMounts:
+            - name: nginx-proxy-etc
+              mountPath: /etc/nginx/conf.d/nginx_proxy_ssl.conf
+              subPath: nginx_proxy_ssl.conf
+            - name: orc8r-secrets-certs
+              mountPath: /etc/nginx/conf.d/nms_nginx.pem
+              subPath: {{ .Values.nginx.deployment.spec.ssl_cert_name }}
+              readOnly: true
+            - name: orc8r-secrets-certs
+              mountPath: /etc/nginx/conf.d/nms_nginx.key.pem
+              subPath: {{ .Values.nginx.deployment.spec.ssl_cert_key_name }}
+              readOnly: true
+      volumes:
+        - name: nginx-proxy-etc
+          configMap:
+            name: nginx-proxy-etc
+            defaultMode: 0555
+        - name: orc8r-secrets-certs
+          secret:
+            secretName: orc8r-secrets-certs
+            defaultMode: 0444
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/nginx-proxy-service.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/nginx-proxy-service.yaml
new file mode 100644
index 00000000..fffc1482
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/nginx-proxy-service.yaml
@@ -0,0 +1,45 @@
+{{/*
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+
+{{- if .Values.nginx.manifests.service }}
+{{- $envAll := . }}
+{{ $serviceType := .Values.nginx.service.type }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: nginx-proxy
+  labels:
+{{ tuple $envAll "nms" "nginx" | include "nms.labels" | indent 4 }}
+spec:
+  selector:
+{{ tuple $envAll "nms" "nginx" | include "nms.selector-labels" | indent 4 }}
+  type: "{{ .Values.nginx.service.type }}"
+  ports:
+  - name: https
+    port: {{ .Values.nginx.service.https.port }}
+    targetPort: {{ .Values.nginx.service.https.targetPort }}
+    protocol: TCP
+    {{- if eq $serviceType "NodePort" }}
+    {{- if .Values.nginx.service.https.nodePort }}
+    nodePort: {{ .Values.nginx.service.https.nodePort }}
+    {{- end -}}
+    {{- end -}}
+{{- if eq $serviceType "LoadBalancer" }}
+  {{- if .Values.nginxserviceloadBalancerIP }}
+  loadBalancerIP: {{ .Values.nginxserviceloadBalancerIP }}
+  {{- end -}}
+  {{- if .Values.nginx.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range .Values.nginx.service.loadBalancerSourceRanges }}
+  - {{ . }}
+  {{- end }}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/secrets-magmalte-mysql.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/secrets-magmalte-mysql.yaml
new file mode 100644
index 00000000..89c10c0f
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/secrets-magmalte-mysql.yaml
@@ -0,0 +1,24 @@
+{{/*
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+
+{{- if .Values.magmalte.manifests.secrets }}
+{{- $envAll := . }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: magmalte-mysql-secrets
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ tuple $envAll "nms" "magmalte" | include "nms.labels" | indent 4 }}
+type: Opaque
+data:
+  MYSQL_USER: {{ .Values.magmalte.env.mysql_user | b64enc }}
+  MYSQL_PASS: {{ .Values.magmalte.env.mysql_pass | b64enc }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/serviceaccount-rbac.yml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/serviceaccount-rbac.yml
new file mode 100644
index 00000000..69f2968d
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/templates/serviceaccount-rbac.yml
@@ -0,0 +1,105 @@
+{{/*
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+
+{{- if or .Values.magmalte.manifests.rbac  .Values.nginx.manifests.rbac }}
+{{- $envAll := . }}
+
+{{- $saNamespace := $envAll.Release.Namespace }}
+{{- $serviceAccountName := printf "%s" .Release.Name }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ $serviceAccountName }}
+  namespace: {{ .Release.Namespace }}
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ $serviceAccountName }}
+  namespace: {{ .Release.Namespace }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - services
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - extensions
+    resources:
+      - ingresses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - events
+    verbs:
+      - create
+      - patch
+  - apiGroups:
+      - extensions
+    resources:
+      - ingresses/status
+    verbs:
+      - update
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+      - endpoints
+      - nodes
+      - pods
+      - secrets
+    verbs:
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+      - pods
+      - secrets
+      - namespaces
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - create
+      - update
+  - apiGroups:
+      - ""
+    resources:
+      - endpoints
+    verbs:
+      - get
+      - create
+      - update
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ $serviceAccountName }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ $serviceAccountName }}
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: {{ $serviceAccountName }}
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/values.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/values.yaml
new file mode 100644
index 00000000..dbc1fcfd
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/nms/values.yaml
@@ -0,0 +1,110 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+release_group: null
+
+# Reference to one or more secrets to be used when pulling images
+# ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+imagePullSecrets: []
+# - name: orc8r-secrets-registry
+
+magmalte:
+  manifests:
+    secrets: true
+    deployment: true
+    service: true
+    rbac: true
+
+  env:
+    api_host: orc8r-proxy:9443
+    host: 0.0.0.0
+    port: 8081
+    mapbox_access_token: ""
+    mysql_host: mariadb
+    mysql_db: magma
+    mysql_user: magma
+    mysql_pass: password
+
+  labels:
+    node_selector_key: worker-type
+    node_selector_value: controller
+
+  image:
+    repository:
+    tag: latest
+    pullPolicy: Always
+
+  service:
+    type: ClusterIP
+    http:
+      port: 8081
+      targetport: 8081
+      nodePort: ""
+
+  tolerations: []
+
+  affinity: {}
+
+## Nginx-Proxy
+#
+nginxserviceloadBalancerIP: ""
+nginx:
+  manifests:
+    configmap: true
+    secrets: true
+    deployment: true
+    service: true
+    rbac: true
+
+  labels:
+    node_selector_key: worker-type
+    node_selector_value: controller
+
+  image:
+    repository: nginx
+    tag: latest
+    pullPolicy: Always
+
+  service:
+    type: LoadBalancer
+    https:
+      port: 443
+      targetport: 443
+      nodePort: ""
+
+  deployment:
+    spec:
+      ssl_cert_name: controller.crt
+      ssl_cert_key_name: controller.key
+
+  tolerations: []
+
+  affinity: {}
+## POD Resource 
+
+pod:
+  replicas:
+    nginx:
+      server: 1
+    magmalte:
+      server: 1
+  resources:
+    enabled: False
+    nginx:
+      requests:
+        memory: "512Mi"
+        cpu: "100m"
+      limits:
+        memory: "1024Mi"
+        cpu: "2000m"
+    magmalte:
+      requests:
+        memory: "1024Mi"
+        cpu: "100m"
+      limits:
+        memory: "2048Mi"
+        cpu: "2000m"
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/Chart.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/Chart.yaml
new file mode 100644
index 00000000..20580201
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/Chart.yaml
@@ -0,0 +1,22 @@
+apiVersion: v1
+appVersion: 11.7.0
+description: Chart for PostgreSQL, an object-relational database management system
+  (ORDBMS) with an emphasis on extensibility and on standards-compliance.
+home: https://www.postgresql.org/
+icon: https://bitnami.com/assets/stacks/postgresql/img/postgresql-stack-110x117.png
+keywords:
+- postgresql
+- postgres
+- database
+- sql
+- replication
+- cluster
+maintainers:
+- email: containers@bitnami.com
+  name: Bitnami
+- email: cedric@desaintmartin.fr
+  name: desaintmartin
+name: postgresql
+sources:
+- https://github.com/bitnami/bitnami-docker-postgresql
+version: 8.5.0
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/OWNERS b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/OWNERS
new file mode 100644
index 00000000..5fbcd396
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/OWNERS
@@ -0,0 +1,18 @@
+approvers:
+- prydonius
+- tompizmor
+- sameersbn
+- carrodher
+- javsalgar
+- juan131
+- desaintmartin
+- miguelaeh
+reviewers:
+- prydonius
+- tompizmor
+- sameersbn
+- carrodher
+- javsalgar
+- juan131
+- desaintmartin
+- miguelaeh
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/README.md b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/README.md
new file mode 100644
index 00000000..1db8289f
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/README.md
@@ -0,0 +1,566 @@
+# PostgreSQL
+
+[PostgreSQL](https://www.postgresql.org/) is an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance.
+
+For HA, please see [this repo](https://github.com/bitnami/charts/tree/master/bitnami/postgresql-ha)
+
+## TL;DR;
+
+```console
+$ helm install my-release stable/postgresql
+```
+
+## Introduction
+
+This chart bootstraps a [PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+
+Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. This chart has been tested to work with NGINX Ingress, cert-manager, fluentd and Prometheus on top of the [BKPR](https://kubeprod.io/).
+
+## Prerequisites
+
+- Kubernetes 1.12+
+- Helm 2.11+ or Helm 3.0-beta3+
+- PV provisioner support in the underlying infrastructure
+
+## Installing the Chart
+To install the chart with the release name `my-release`:
+
+```console
+$ helm install my-release stable/postgresql
+```
+
+The command deploys PostgreSQL on the Kubernetes cluster in the default configuration. The [Parameters](#parameters) section lists the parameters that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```console
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Parameters
+
+The following tables lists the configurable parameters of the PostgreSQL chart and their default values.
+
+|                   Parameter                   |                                                                                Description                                                                                |                            Default                            |
+|-----------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------|
+| `global.imageRegistry`                        | Global Docker Image registry                                                                                                                                              | `nil`                                                         |
+| `global.postgresql.postgresqlDatabase`        | PostgreSQL database (overrides `postgresqlDatabase`)                                                                                                                      | `nil`                                                         |
+| `global.postgresql.postgresqlUsername`        | PostgreSQL username (overrides `postgresqlUsername`)                                                                                                                      | `nil`                                                         |
+| `global.postgresql.existingSecret`            | Name of existing secret to use for PostgreSQL passwords (overrides `existingSecret`)                                                                                      | `nil`                                                         |
+| `global.postgresql.postgresqlPassword`        | PostgreSQL admin password (overrides `postgresqlPassword`)                                                                                                                | `nil`                                                         |
+| `global.postgresql.servicePort`               | PostgreSQL port (overrides `service.port`)                                                                                                                                | `nil`                                                         |
+| `global.postgresql.replicationPassword`       | Replication user password (overrides `replication.password`)                                                                                                              | `nil`                                                         |
+| `global.imagePullSecrets`                     | Global Docker registry secret names as an array                                                                                                                           | `[]` (does not add image pull secrets to deployed pods)       |
+| `global.storageClass`                         | Global storage class for dynamic provisioning                                                                                                                             | `nil`                                                         |
+| `image.registry`                              | PostgreSQL Image registry                                                                                                                                                 | `docker.io`                                                   |
+| `image.repository`                            | PostgreSQL Image name                                                                                                                                                     | `bitnami/postgresql`                                          |
+| `image.tag`                                   | PostgreSQL Image tag                                                                                                                                                      | `{TAG_NAME}`                                                  |
+| `image.pullPolicy`                            | PostgreSQL Image pull policy                                                                                                                                              | `IfNotPresent`                                                |
+| `image.pullSecrets`                           | Specify Image pull secrets                                                                                                                                                | `nil` (does not add image pull secrets to deployed pods)      |
+| `image.debug`                                 | Specify if debug values should be set                                                                                                                                     | `false`                                                       |
+| `nameOverride`                                | String to partially override postgresql.fullname template with a string (will prepend the release name)                                                                   | `nil`                                                         |
+| `fullnameOverride`                            | String to fully override postgresql.fullname template with a string                                                                                                       | `nil`                                                         |
+| `volumePermissions.enabled`                   | Enable init container that changes volume permissions in the data directory (for cases where the default k8s `runAsUser` and `fsUser` values do not work)                 | `false`                                                       |
+| `volumePermissions.image.registry`            | Init container volume-permissions image registry                                                                                                                          | `docker.io`                                                   |
+| `volumePermissions.image.repository`          | Init container volume-permissions image name                                                                                                                              | `bitnami/minideb`                                             |
+| `volumePermissions.image.tag`                 | Init container volume-permissions image tag                                                                                                                               | `buster`                                                      |
+| `volumePermissions.image.pullPolicy`          | Init container volume-permissions image pull policy                                                                                                                       | `Always`                                                      |
+| `volumePermissions.securityContext.runAsUser` | User ID for the init container (when facing issues in OpenShift or uid unknown, try value "auto")                                                                         | `0`                                                           |
+| `usePasswordFile`                             | Have the secrets mounted as a file instead of env vars                                                                                                                    | `false`                                                       |
+| `ldap.enabled`                                | Enable LDAP support                                                                                                                                                       | `false`                                                       |
+| `ldap.existingSecret`                         | Name of existing secret to use for LDAP passwords                                                                                                                         | `nil`                                                         |
+| `ldap.url`                                    | LDAP URL beginning in the form `ldap[s]://host[:port]/basedn[?[attribute][?[scope][?[filter]]]]`                                                                          | `nil`                                                         |
+| `ldap.server`                                 | IP address or name of the LDAP server.                                                                                                                                    | `nil`                                                         |
+| `ldap.port`                                   | Port number on the LDAP server to connect to                                                                                                                              | `nil`                                                         |
+| `ldap.scheme`                                 | Set to `ldaps` to use LDAPS.                                                                                                                                              | `nil`                                                         |
+| `ldap.tls`                                    | Set to `1` to use TLS encryption                                                                                                                                          | `nil`                                                         |
+| `ldap.prefix`                                 | String to prepend to the user name when forming the DN to bind                                                                                                            | `nil`                                                         |
+| `ldap.suffix`                                 | String to append to the user name when forming the DN to bind                                                                                                             | `nil`                                                         |
+| `ldap.search_attr`                            | Attribute to match agains the user name in the search                                                                                                                     | `nil`                                                         |
+| `ldap.search_filter`                          | The search filter to use when doing search+bind authentication                                                                                                            | `nil`                                                         |
+| `ldap.baseDN`                                 | Root DN to begin the search for the user in                                                                                                                               | `nil`                                                         |
+| `ldap.bindDN`                                 | DN of user to bind to LDAP                                                                                                                                                | `nil`                                                         |
+| `ldap.bind_password`                          | Password for the user to bind to LDAP                                                                                                                                     | `nil`                                                         |
+| `replication.enabled`                         | Enable replication                                                                                                                                                        | `false`                                                       |
+| `replication.user`                            | Replication user                                                                                                                                                          | `repl_user`                                                   |
+| `replication.password`                        | Replication user password                                                                                                                                                 | `repl_password`                                               |
+| `replication.slaveReplicas`                   | Number of slaves replicas                                                                                                                                                 | `1`                                                           |
+| `replication.synchronousCommit`               | Set synchronous commit mode. Allowed values: `on`, `remote_apply`, `remote_write`, `local` and `off`                                                                      | `off`                                                         |
+| `replication.numSynchronousReplicas`          | Number of replicas that will have synchronous replication. Note: Cannot be greater than `replication.slaveReplicas`.                                                      | `0`                                                           |
+| `replication.applicationName`                 | Cluster application name. Useful for advanced replication settings                                                                                                        | `my_application`                                              |
+| `existingSecret`                              | Name of existing secret to use for PostgreSQL passwords. The secret has to contain the keys `postgresql-postgres-password` which is the password for `postgresqlUsername` when it is different of `postgres`, `postgresql-password` which will override `postgresqlPassword`, `postgresql-replication-password` which will override `replication.password` and `postgresql-ldap-password` which will be sed to authenticate on LDAP.                                                                                                                   | `nil`                                                         |
+| `postgresqlPostgresPassword`                  | PostgreSQL admin password (used when `postgresqlUsername` is not `postgres`)                                                                                              | _random 10 character alphanumeric string_                     |
+| `postgresqlUsername`                          | PostgreSQL admin user                                                                                                                                                     | `postgres`                                                    |
+| `postgresqlPassword`                          | PostgreSQL admin password                                                                                                                                                 | _random 10 character alphanumeric string_                     |
+| `postgresqlDatabase`                          | PostgreSQL database                                                                                                                                                       | `nil`                                                         |
+| `postgresqlDataDir`                           | PostgreSQL data dir folder                                                                                                                                                | `/bitnami/postgresql` (same value as persistence.mountPath)   |
+| `extraEnv`                                    | Any extra environment variables you would like to pass on to the pod. The value is evaluated as a template.                                                               | `[]`                                                          |
+| `extraEnvVarsCM`                              | Name of a Config Map containing extra environment variables you would like to pass on to the pod.                                                                         | `nil`                                                         |
+| `postgresqlInitdbArgs`                        | PostgreSQL initdb extra arguments                                                                                                                                         | `nil`                                                         |
+| `postgresqlInitdbWalDir`                      | PostgreSQL location for transaction log                                                                                                                                   | `nil`                                                         |
+| `postgresqlConfiguration`                     | Runtime Config Parameters                                                                                                                                                 | `nil`                                                         |
+| `postgresqlExtendedConf`                      | Extended Runtime Config Parameters (appended to main or default configuration)                                                                                            | `nil`                                                         |
+| `pgHbaConfiguration`                          | Content of pg_hba.conf                                                                                                                                                    | `nil (do not create pg_hba.conf)`                             |
+| `configurationConfigMap`                      | ConfigMap with the PostgreSQL configuration files (Note: Overrides `postgresqlConfiguration` and `pgHbaConfiguration`). The value is evaluated as a template.             | `nil`                                                         |
+| `extendedConfConfigMap`                       | ConfigMap with the extended PostgreSQL configuration files. The value is evaluated as a template.                                                                         | `nil`                                                         |
+| `initdbScripts`                               | Dictionary of initdb scripts                                                                                                                                              | `nil`                                                         |
+| `initdbUsername`                              | PostgreSQL user to execute the .sql and sql.gz scripts                                                                                                                    | `nil`                                                         |
+| `initdbPassword`                              | Password for the user specified in `initdbUsername`                                                                                                                       | `nil`                                                         |
+| `initdbScriptsConfigMap`                      | ConfigMap with the initdb scripts (Note: Overrides `initdbScripts`). The value is evaluated as a template.                                                                | `nil`                                                         |
+| `initdbScriptsSecret`                         | Secret with initdb scripts that contain sensitive information (Note: can be used with `initdbScriptsConfigMap` or `initdbScripts`). The value is evaluated as a template. | `nil`                                                         |
+| `service.type`                                | Kubernetes Service type                                                                                                                                                   | `ClusterIP`                                                   |
+| `service.port`                                | PostgreSQL port                                                                                                                                                           | `5432`                                                        |
+| `service.nodePort`                            | Kubernetes Service nodePort                                                                                                                                               | `nil`                                                         |
+| `service.annotations`                         | Annotations for PostgreSQL service, the value is evaluated as a template.                                                                                                 | {}                                                            |
+| `service.loadBalancerIP`                      | loadBalancerIP if service type is `LoadBalancer`                                                                                                                          | `nil`                                                         |
+| `service.loadBalancerSourceRanges`            | Address that are allowed when svc is LoadBalancer                                                                                                                         | []                                                            |
+| `schedulerName`                               | Name of the k8s scheduler (other than default)                                                                                                                            | `nil`                                                         |
+| `shmVolume.enabled`                           | Enable emptyDir volume for /dev/shm for master and slave(s) Pod(s)                                                                                                        | `true`                                                        |
+| `shmVolume.chmod.enabled`                     | Run at init chmod 777 of the /dev/shm (ignored if `volumePermissions.enabled` is `false`)                                                                                 | `true`                                                        |
+| `persistence.enabled`                         | Enable persistence using PVC                                                                                                                                              | `true`                                                        |
+| `persistence.existingClaim`                   | Provide an existing `PersistentVolumeClaim`, the value is evaluated as a template.                                                                                        | `nil`                                                         |
+| `persistence.mountPath`                       | Path to mount the volume at                                                                                                                                               | `/bitnami/postgresql`                                         |
+| `persistence.subPath`                         | Subdirectory of the volume to mount at                                                                                                                                    | `""`                                                          |
+| `persistence.storageClass`                    | PVC Storage Class for PostgreSQL volume                                                                                                                                   | `nil`                                                         |
+| `persistence.accessModes`                     | PVC Access Mode for PostgreSQL volume                                                                                                                                     | `[ReadWriteOnce]`                                             |
+| `persistence.size`                            | PVC Storage Request for PostgreSQL volume                                                                                                                                 | `8Gi`                                                         |
+| `persistence.annotations`                     | Annotations for the PVC                                                                                                                                                   | `{}`                                                          |
+| `master.nodeSelector`                         | Node labels for pod assignment (postgresql master)                                                                                                                        | `{}`                                                          |
+| `master.affinity`                             | Affinity labels for pod assignment (postgresql master)                                                                                                                    | `{}`                                                          |
+| `master.tolerations`                          | Toleration labels for pod assignment (postgresql master)                                                                                                                  | `[]`                                                          |
+| `master.anotations`                           | Map of annotations to add to the statefulset (postgresql master)                                                                                                          | `{}`                                                          |
+| `master.labels`                               | Map of labels to add to the statefulset (postgresql master)                                                                                                               | `{}`                                                          |
+| `master.podAnnotations`                       | Map of annotations to add to the pods (postgresql master)                                                                                                                 | `{}`                                                          |
+| `master.podLabels`                            | Map of labels to add to the pods (postgresql master)                                                                                                                      | `{}`                                                          |
+| `master.priorityClassName`                    | Priority Class to use for each pod (postgresql master)                                                                                                                    | `nil`                                                          |
+| `master.extraInitContainers`                  | Additional init containers to add to the pods (postgresql master)                                                                                                         | `[]`                                                          |
+| `master.extraVolumeMounts`                    | Additional volume mounts to add to the pods (postgresql master)                                                                                                           | `[]`                                                          |
+| `master.extraVolumes`                         | Additional volumes to add to the pods (postgresql master)                                                                                                                 | `[]`                                                          |
+| `master.sidecars`                                         | Add additional containers to the pod                                                                                                                          | `[]`                                                     |
+| `slave.nodeSelector`                          | Node labels for pod assignment (postgresql slave)                                                                                                                         | `{}`                                                          |
+| `slave.affinity`                              | Affinity labels for pod assignment (postgresql slave)                                                                                                                     | `{}`                                                          |
+| `slave.tolerations`                           | Toleration labels for pod assignment (postgresql slave)                                                                                                                   | `[]`                                                          |
+| `slave.anotations`                            | Map of annotations to add to the statefulsets (postgresql slave)                                                                                                          | `{}`                                                          |
+| `slave.labels`                                | Map of labels to add to the statefulsets (postgresql slave)                                                                                                               | `{}`                                                          |
+| `slave.podAnnotations`                        | Map of annotations to add to the pods (postgresql slave)                                                                                                                  | `{}`                                                          |
+| `slave.podLabels`                             | Map of labels to add to the pods (postgresql slave)                                                                                                                       | `{}`                                                          |
+| `slave.priorityClassName`                     | Priority Class to use for each pod (postgresql slave)                                                                                                                     | `nil`                                                          |
+| `slave.extraInitContainers`                   | Additional init containers to add to the pods (postgresql slave)                                                                                                          | `[]`                                                          |
+| `slave.extraVolumeMounts`                     | Additional volume mounts to add to the pods (postgresql slave)                                                                                                            | `[]`                                                          |
+| `slave.extraVolumes`                          | Additional volumes to add to the pods (postgresql slave)                                                                                                                  | `[]`                                                          |
+| `slave.sidecars`                                         | Add additional containers to the pod                                                                                                                          | `[]`                                                     |
+| `terminationGracePeriodSeconds`               | Seconds the pod needs to terminate gracefully                                                                                                                             | `nil`                                                         |
+| `resources`                                   | CPU/Memory resource requests/limits                                                                                                                                       | Memory: `256Mi`, CPU: `250m`                                  |
+| `securityContext.enabled`                     | Enable security context                                                                                                                                                   | `true`                                                        |
+| `securityContext.fsGroup`                     | Group ID for the container                                                                                                                                                | `1001`                                                        |
+| `securityContext.runAsUser`                   | User ID for the container                                                                                                                                                 | `1001`                                                        |
+| `serviceAccount.enabled`                      | Enable service account (Note: Service Account will only be automatically created if `serviceAccount.name` is not set)                                                     | `false`                                                       |
+| `serviceAcccount.name`                        | Name of existing service account                                                                                                                                          | `nil`                                                         |
+| `livenessProbe.enabled`                       | Would you like a livenessProbe to be enabled                                                                                                                              | `true`                                                        |
+| `networkPolicy.enabled`                       | Enable NetworkPolicy                                                                                                                                                      | `false`                                                       |
+| `networkPolicy.allowExternal`                 | Don't require client label for connections                                                                                                                                | `true`                                                        |
+| `networkPolicy.explicitNamespacesSelector`    | A Kubernetes LabelSelector to explicitly select namespaces from which ingress traffic could be allowed                                                                    | `nil`                                                         |
+| `livenessProbe.initialDelaySeconds`           | Delay before liveness probe is initiated                                                                                                                                  | 30                                                            |
+| `livenessProbe.periodSeconds`                 | How often to perform the probe                                                                                                                                            | 10                                                            |
+| `livenessProbe.timeoutSeconds`                | When the probe times out                                                                                                                                                  | 5                                                             |
+| `livenessProbe.failureThreshold`              | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                | 6                                                             |
+| `livenessProbe.successThreshold`              | Minimum consecutive successes for the probe to be considered successful after having failed                                                                               | 1                                                             |
+| `readinessProbe.enabled`                      | would you like a readinessProbe to be enabled                                                                                                                             | `true`                                                        |
+| `readinessProbe.initialDelaySeconds`          | Delay before readiness probe is initiated                                                                                                                                 | 5                                                             |
+| `readinessProbe.periodSeconds`                | How often to perform the probe                                                                                                                                            | 10                                                            |
+| `readinessProbe.timeoutSeconds`               | When the probe times out                                                                                                                                                  | 5                                                             |
+| `readinessProbe.failureThreshold`             | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                | 6                                                             |
+| `readinessProbe.successThreshold`             | Minimum consecutive successes for the probe to be considered successful after having failed                                                                               | 1                                                             |
+| `metrics.enabled`                             | Start a prometheus exporter                                                                                                                                               | `false`                                                       |
+| `metrics.service.type`                        | Kubernetes Service type                                                                                                                                                   | `ClusterIP`                                                   |
+| `service.clusterIP`                           | Static clusterIP or None for headless services                                                                                                                            | `nil`                                                         |
+| `metrics.service.annotations`                 | Additional annotations for metrics exporter pod                                                                                                                           | `{ prometheus.io/scrape: "true", prometheus.io/port: "9187"}` |
+| `metrics.service.loadBalancerIP`              | loadBalancerIP if redis metrics service type is `LoadBalancer`                                                                                                            | `nil`                                                         |
+| `metrics.serviceMonitor.enabled`              | Set this to `true` to create ServiceMonitor for Prometheus operator                                                                                                       | `false`                                                       |
+| `metrics.serviceMonitor.additionalLabels`     | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus                                                                                     | `{}`                                                          |
+| `metrics.serviceMonitor.namespace`            | Optional namespace in which to create ServiceMonitor                                                                                                                      | `nil`                                                         |
+| `metrics.serviceMonitor.interval`             | Scrape interval. If not set, the Prometheus default scrape interval is used                                                                                               | `nil`                                                         |
+| `metrics.serviceMonitor.scrapeTimeout`        | Scrape timeout. If not set, the Prometheus default scrape timeout is used                                                                                                 | `nil`                                                         |
+| `metrics.prometheusRule.enabled`              | Set this to true to create prometheusRules for Prometheus operator                                                                                                        | `false`                                                       |
+| `metrics.prometheusRule.additionalLabels`     | Additional labels that can be used so prometheusRules will be discovered by Prometheus                                                                                    | `{}`                                                          |
+| `metrics.prometheusRule.namespace`            | namespace where prometheusRules resource should be created                                                                                                                | the same namespace as postgresql                              |
+| `metrics.prometheusRule.rules`                | [rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) to be created, check values for an example.                                            | `[]`                                                          |
+| `metrics.image.registry`                      | PostgreSQL Image registry                                                                                                                                                 | `docker.io`                                                   |
+| `metrics.image.repository`                    | PostgreSQL Image name                                                                                                                                                     | `bitnami/postgres-exporter`                                   |
+| `metrics.image.tag`                           | PostgreSQL Image tag                                                                                                                                                      | `{TAG_NAME}`                                                  |
+| `metrics.image.pullPolicy`                    | PostgreSQL Image pull policy                                                                                                                                              | `IfNotPresent`                                                |
+| `metrics.image.pullSecrets`                   | Specify Image pull secrets                                                                                                                                                | `nil` (does not add image pull secrets to deployed pods)      |
+| `metrics.customMetrics`                       | Additional custom metrics                                                                                                                                                 | `nil`                                                         |
+| `metrics.securityContext.enabled`             | Enable security context for metrics                                                                                                                                       | `false`                                                       |
+| `metrics.securityContext.runAsUser`           | User ID for the container for metrics                                                                                                                                     | `1001`                                                        |
+| `metrics.livenessProbe.initialDelaySeconds`   | Delay before liveness probe is initiated                                                                                                                                  | 30                                                            |
+| `metrics.livenessProbe.periodSeconds`         | How often to perform the probe                                                                                                                                            | 10                                                            |
+| `metrics.livenessProbe.timeoutSeconds`        | When the probe times out                                                                                                                                                  | 5                                                             |
+| `metrics.livenessProbe.failureThreshold`      | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                | 6                                                             |
+| `metrics.livenessProbe.successThreshold`      | Minimum consecutive successes for the probe to be considered successful after having failed                                                                               | 1                                                             |
+| `metrics.readinessProbe.enabled`              | would you like a readinessProbe to be enabled                                                                                                                             | `true`                                                        |
+| `metrics.readinessProbe.initialDelaySeconds`  | Delay before liveness probe is initiated                                                                                                                                  | 5                                                             |
+| `metrics.readinessProbe.periodSeconds`        | How often to perform the probe                                                                                                                                            | 10                                                            |
+| `metrics.readinessProbe.timeoutSeconds`       | When the probe times out                                                                                                                                                  | 5                                                             |
+| `metrics.readinessProbe.failureThreshold`     | Minimum consecutive failures for the probe to be considered failed after having succeeded.                                                                                | 6                                                             |
+| `metrics.readinessProbe.successThreshold`     | Minimum consecutive successes for the probe to be considered successful after having failed                                                                               | 1                                                             |
+| `updateStrategy`                              | Update strategy policy                                                                                                                                                    | `{type: "RollingUpdate"}`                                     |
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```console
+$ helm install my-release \
+  --set postgresqlPassword=secretpassword,postgresqlDatabase=my-database \
+    stable/postgresql
+```
+
+The above command sets the PostgreSQL `postgres` account password to `secretpassword`. Additionally it creates a database named `my-database`.
+
+Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
+
+```console
+$ helm install my-release -f values.yaml stable/postgresql
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)
+
+## Configuration and installation details
+
+### [Rolling VS Immutable tags](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/)
+
+It is strongly recommended to use immutable tags in a production environment. This ensures your deployment does not change automatically if the same tag is updated with a different image.
+
+Bitnami will release a new chart updating its containers if a new version of the main container, significant changes, or critical vulnerabilities exist.
+
+### Production configuration and horizontal scaling
+
+This chart includes a `values-production.yaml` file where you can find some parameters oriented to production configuration in comparison to the regular `values.yaml`. You can use this file instead of the default one.
+
+- Enable replication:
+```diff
+- replication.enabled: false
++ replication.enabled: true
+```
+
+- Number of slaves replicas:
+```diff
+- replication.slaveReplicas: 1
++ replication.slaveReplicas: 2
+```
+
+- Set synchronous commit mode:
+```diff
+- replication.synchronousCommit: "off"
++ replication.synchronousCommit: "on"
+```
+
+- Number of replicas that will have synchronous replication:
+```diff
+- replication.numSynchronousReplicas: 0
++ replication.numSynchronousReplicas: 1
+```
+
+- Start a prometheus exporter:
+```diff
+- metrics.enabled: false
++ metrics.enabled: true
+```
+
+To horizontally scale this chart, you can use the `--replicas` flag to modify the number of nodes in your PostgreSQL deployment. Also you can use the `values-production.yaml` file or modify the parameters shown above.
+
+### Change PostgreSQL version
+
+To modify the PostgreSQL version used in this chart you can specify a [valid image tag](https://hub.docker.com/r/bitnami/postgresql/tags/) using the `image.tag` parameter. For example, `image.tag=12.0.0`
+
+### postgresql.conf / pg_hba.conf files as configMap
+
+This helm chart also supports to customize the whole configuration file.
+
+Add your custom file to "files/postgresql.conf" in your working directory. This file will be mounted as configMap to the containers and it will be used for configuring the PostgreSQL server.
+
+Alternatively, you can specify PostgreSQL configuration parameters using the `postgresqlConfiguration` parameter as a dict, using camelCase, e.g. {"sharedBuffers": "500MB"}.
+
+In addition to these options, you can also set an external ConfigMap with all the configuration files. This is done by setting the `configurationConfigMap` parameter. Note that this will override the two previous options.
+
+### Allow settings to be loaded from files other than the default `postgresql.conf`
+
+If you don't want to provide the whole PostgreSQL configuration file and only specify certain parameters, you can add your extended `.conf` files to "files/conf.d/" in your working directory.
+Those files will be mounted as configMap to the containers adding/overwriting the default configuration using the `include_dir` directive that allows settings to be loaded from files other than the default `postgresql.conf`.
+
+Alternatively, you can also set an external ConfigMap with all the extra configuration files. This is done by setting the `extendedConfConfigMap` parameter. Note that this will override the previous option.
+
+### Initialize a fresh instance
+
+The [Bitnami PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) image allows you to use your custom scripts to initialize a fresh instance. In order to execute the scripts, they must be located inside the chart folder `files/docker-entrypoint-initdb.d` so they can be consumed as a ConfigMap.
+
+Alternatively, you can specify custom scripts using the `initdbScripts` parameter as dict.
+
+In addition to these options, you can also set an external ConfigMap with all the initialization scripts. This is done by setting the `initdbScriptsConfigMap` parameter. Note that this will override the two previous options. If your initialization scripts contain sensitive information such as credentials or passwords, you can use the `initdbScriptsSecret` parameter.
+
+The allowed extensions are `.sh`, `.sql` and `.sql.gz`.
+
+### Sidecars
+
+If you need  additional containers to run within the same pod as PostgreSQL (e.g. an additional metrics or logging exporter), you can do so via the `sidecars` config parameter. Simply define your container according to the Kubernetes container spec.
+
+```yaml
+# For the PostgreSQL master
+master:
+  sidecars:
+  - name: your-image-name
+    image: your-image
+    imagePullPolicy: Always
+    ports:
+    - name: portname
+     containerPort: 1234
+# For the PostgreSQL replicas
+slave:
+  sidecars:
+  - name: your-image-name
+    image: your-image
+    imagePullPolicy: Always
+    ports:
+    - name: portname
+     containerPort: 1234
+```
+
+### Metrics
+
+The chart optionally can start a metrics exporter for [prometheus](https://prometheus.io). The metrics endpoint (port 9187) is not exposed and it is expected that the metrics are collected from inside the k8s cluster using something similar as the described in the [example Prometheus scrape configuration](https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml).
+
+The exporter allows to create custom metrics from additional SQL queries. See the Chart's `values.yaml` for an example and consult the [exporters documentation](https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file) for more details.
+
+### Use of global variables
+
+In more complex scenarios, we may have the following tree of dependencies
+
+```
+                     +--------------+
+                     |              |
+        +------------+   Chart 1    +-----------+
+        |            |              |           |
+        |            --------+------+           |
+        |                    |                  |
+        |                    |                  |
+        |                    |                  |
+        |                    |                  |
+        v                    v                  v
++-------+------+    +--------+------+  +--------+------+
+|              |    |               |  |               |
+|  PostgreSQL  |    |  Sub-chart 1  |  |  Sub-chart 2  |
+|              |    |               |  |               |
++--------------+    +---------------+  +---------------+
+```
+
+The three charts below depend on the parent chart Chart 1. However, subcharts 1 and 2 may need to connect to PostgreSQL as well. In order to do so, subcharts 1 and 2 need to know the PostgreSQL credentials, so one option for deploying could be deploy Chart 1 with the following parameters:
+
+```
+postgresql.postgresqlPassword=testtest
+subchart1.postgresql.postgresqlPassword=testtest
+subchart2.postgresql.postgresqlPassword=testtest
+postgresql.postgresqlDatabase=db1
+subchart1.postgresql.postgresqlDatabase=db1
+subchart2.postgresql.postgresqlDatabase=db1
+```
+
+If the number of dependent sub-charts increases, installing the chart with parameters can become increasingly difficult. An alternative would be to set the credentials using global variables as follows:
+
+```
+global.postgresql.postgresqlPassword=testtest
+global.postgresql.postgresqlDatabase=db1
+```
+
+This way, the credentials will be available in all of the subcharts.
+
+## Persistence
+
+The [Bitnami PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) image stores the PostgreSQL data and configurations at the `/bitnami/postgresql` path of the container.
+
+Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube.
+See the [Parameters](#parameters) section to configure the PVC or to disable persistence.
+
+If you already have data in it, you will fail to sync to standby nodes for all commits, details can refer to [code](https://github.com/bitnami/bitnami-docker-postgresql/blob/8725fe1d7d30ebe8d9a16e9175d05f7ad9260c93/9.6/debian-9/rootfs/libpostgresql.sh#L518-L556). If you need to use those data, please covert them to sql and import after `helm install` finished.
+
+## NetworkPolicy
+
+To enable network policy for PostgreSQL, install [a networking plugin that implements the Kubernetes NetworkPolicy spec](https://kubernetes.io/docs/tasks/administer-cluster/declare-network-policy#before-you-begin), and set `networkPolicy.enabled` to `true`.
+
+For Kubernetes v1.5 & v1.6, you must also turn on NetworkPolicy by setting the DefaultDeny namespace annotation. Note: this will enforce policy for _all_ pods in the namespace:
+
+```console
+$ kubectl annotate namespace default "net.beta.kubernetes.io/network-policy={\"ingress\":{\"isolation\":\"DefaultDeny\"}}"
+```
+
+With NetworkPolicy enabled, traffic will be limited to just port 5432.
+
+For more precise policy, set `networkPolicy.allowExternal=false`. This will only allow pods with the generated client label to connect to PostgreSQL.
+This label will be displayed in the output of a successful install.
+
+## Differences between Bitnami PostgreSQL image and [Docker Official](https://hub.docker.com/_/postgres) image
+
+- The Docker Official PostgreSQL image does not support replication. If you pass any replication environment variable, this would be ignored. The only environment variables supported by the Docker Official image are POSTGRES_USER, POSTGRES_DB, POSTGRES_PASSWORD, POSTGRES_INITDB_ARGS, POSTGRES_INITDB_WALDIR and PGDATA. All the remaining environment variables are specific to the Bitnami PostgreSQL image.
+- The Bitnami PostgreSQL image is non-root by default. This requires that you run the pod with `securityContext` and updates the permissions of the volume with an `initContainer`. A key benefit of this configuration is that the pod follows security best practices and is prepared to run on Kubernetes distributions with hard security constraints like OpenShift.
+- For OpenShift, one may either define the runAsUser and fsGroup accordingly, or try this more dynamic option: volumePermissions.securityContext.runAsUser="auto",securityContext.enabled=false,shmVolume.chmod.enabled=false
+
+### Deploy chart using Docker Official PostgreSQL Image
+
+From chart version 4.0.0, it is possible to use this chart with the Docker Official PostgreSQL image.
+Besides specifying the new Docker repository and tag, it is important to modify the PostgreSQL data directory and volume mount point. Basically, the PostgreSQL data dir cannot be the mount point directly, it has to be a subdirectory.
+
+```
+helm install postgres \
+             --set image.repository=postgres \
+             --set image.tag=10.6 \
+             --set postgresqlDataDir=/data/pgdata \
+             --set persistence.mountPath=/data/ \
+             stable/postgresql
+```
+
+## Upgrade
+
+It's necessary to specify the existing passwords while performing an upgrade to ensure the secrets are not updated with invalid randomly generated passwords. Remember to specify the existing values of the `postgresqlPassword` and `replication.password` parameters when upgrading the chart:
+
+```bash
+$ helm upgrade my-release bitnami/influxdb \
+    --set postgresqlPassword=[POSTGRESQL_PASSWORD] \
+    --set replication.password=[REPLICATION_PASSWORD]
+```
+
+> Note: you need to substitute the placeholders _[POSTGRESQL_PASSWORD]_, and _[REPLICATION_PASSWORD]_ with the values obtained from instructions in the installation notes.
+
+## 8.0.0
+
+Prefixes the port names with their protocols to comply with Istio conventions.
+
+If you depend on the port names in your setup, make sure to update them to reflect this change.
+
+## 7.1.0
+
+Adds support for LDAP configuration.
+
+## 7.0.0
+
+Helm performs a lookup for the object based on its group (apps), version (v1), and kind (Deployment). Also known as its GroupVersionKind, or GVK. Changing the GVK is considered a compatibility breaker from Kubernetes' point of view, so you cannot "upgrade" those objects to the new GVK in-place. Earlier versions of Helm 3 did not perform the lookup correctly which has since been fixed to match the spec.
+
+In https://github.com/helm/charts/pull/17281 the `apiVersion` of the statefulset resources was updated to `apps/v1` in tune with the api's deprecated, resulting in compatibility breakage.
+
+This major version bump signifies this change.
+
+## 6.5.7
+
+In this version, the chart will use PostgreSQL with the Postgis extension included. The version used with Postgresql version 10, 11 and 12 is Postgis 2.5. It has been compiled with the following dependencies:
+
+ - protobuf
+ - protobuf-c
+ - json-c
+ - geos
+ - proj
+
+## 5.0.0
+
+In this version, the **chart is using PostgreSQL 11 instead of PostgreSQL 10**. You can find the main difference and notable changes in the following links: [https://www.postgresql.org/about/news/1894/](https://www.postgresql.org/about/news/1894/) and [https://www.postgresql.org/about/featurematrix/](https://www.postgresql.org/about/featurematrix/).
+
+For major releases of PostgreSQL, the internal data storage format is subject to change, thus complicating upgrades, you can see some errors like the following one in the logs:
+
+```bash
+Welcome to the Bitnami postgresql container
+Subscribe to project updates by watching https://github.com/bitnami/bitnami-docker-postgresql
+Submit issues and feature requests at https://github.com/bitnami/bitnami-docker-postgresql/issues
+Send us your feedback at containers@bitnami.com
+
+INFO  ==> ** Starting PostgreSQL setup **
+NFO  ==> Validating settings in POSTGRESQL_* env vars..
+INFO  ==> Initializing PostgreSQL database...
+INFO  ==> postgresql.conf file not detected. Generating it...
+INFO  ==> pg_hba.conf file not detected. Generating it...
+INFO  ==> Deploying PostgreSQL with persisted data...
+INFO  ==> Configuring replication parameters
+INFO  ==> Loading custom scripts...
+INFO  ==> Enabling remote connections
+INFO  ==> Stopping PostgreSQL...
+INFO  ==> ** PostgreSQL setup finished! **
+
+INFO  ==> ** Starting PostgreSQL **
+  [1] FATAL:  database files are incompatible with server
+  [1] DETAIL:  The data directory was initialized by PostgreSQL version 10, which is not compatible with this version 11.3.
+```
+In this case, you should migrate the data from the old chart to the new one following an approach similar to that described in [this section](https://www.postgresql.org/docs/current/upgrading.html#UPGRADING-VIA-PGDUMPALL) from the official documentation. Basically, create a database dump in the old chart, move and restore it in the new one.
+
+### 4.0.0
+
+This chart will use by default the Bitnami PostgreSQL container starting from version `10.7.0-r68`. This version moves the initialization logic from node.js to bash. This new version of the chart requires setting the `POSTGRES_PASSWORD` in the slaves as well, in order to properly configure the `pg_hba.conf` file. Users from previous versions of the chart are advised to upgrade immediately.
+
+IMPORTANT: If you do not want to upgrade the chart version then make sure you use the `10.7.0-r68` version of the container. Otherwise, you will get this error
+
+```
+The POSTGRESQL_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development
+```
+
+### 3.0.0
+
+This releases make it possible to specify different nodeSelector, affinity and tolerations for master and slave pods.
+It also fixes an issue with `postgresql.master.fullname` helper template not obeying fullnameOverride.
+
+#### Breaking changes
+
+- `affinty` has been renamed to `master.affinity` and `slave.affinity`.
+- `tolerations` has been renamed to `master.tolerations` and `slave.tolerations`.
+- `nodeSelector` has been renamed to `master.nodeSelector` and `slave.nodeSelector`.
+
+### 2.0.0
+
+In order to upgrade from the `0.X.X` branch to `1.X.X`, you should follow the below steps:
+
+ - Obtain the service name (`SERVICE_NAME`) and password (`OLD_PASSWORD`) of the existing postgresql chart. You can find the instructions to obtain the password in the NOTES.txt, the service name can be obtained by running
+
+ ```console
+$ kubectl get svc
+ ```
+
+- Install (not upgrade) the new version
+
+```console
+$ helm repo update
+$ helm install my-release stable/postgresql
+```
+
+- Connect to the new pod (you can obtain the name by running `kubectl get pods`):
+
+```console
+$ kubectl exec -it NAME bash
+```
+
+- Once logged in, create a dump file from the previous database using `pg_dump`, for that we should connect to the previous postgresql chart:
+
+```console
+$ pg_dump -h SERVICE_NAME -U postgres DATABASE_NAME > /tmp/backup.sql
+```
+
+After run above command you should be prompted for a password, this password is the previous chart password (`OLD_PASSWORD`).
+This operation could take some time depending on the database size.
+
+- Once you have the backup file, you can restore it with a command like the one below:
+
+```console
+$ psql -U postgres DATABASE_NAME < /tmp/backup.sql
+```
+
+In this case, you are accessing to the local postgresql, so the password should be the new one (you can find it in NOTES.txt).
+
+If you want to restore the database and the database schema does not exist, it is necessary to first follow the steps described below.
+
+```console
+$ psql -U postgres
+postgres=# drop database DATABASE_NAME;
+postgres=# create database DATABASE_NAME;
+postgres=# create user USER_NAME;
+postgres=# alter role USER_NAME with password 'BITNAMI_USER_PASSWORD';
+postgres=# grant all privileges on database DATABASE_NAME to USER_NAME;
+postgres=# alter database DATABASE_NAME owner to USER_NAME;
+```
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/ci/default-values.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/ci/default-values.yaml
new file mode 100644
index 00000000..fc2ba605
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/ci/default-values.yaml
@@ -0,0 +1 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/ci/shmvolume-disabled-values.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/ci/shmvolume-disabled-values.yaml
new file mode 100644
index 00000000..347d3b40
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/ci/shmvolume-disabled-values.yaml
@@ -0,0 +1,2 @@
+shmVolume:
+  enabled: false
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/files/README.md b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/files/README.md
new file mode 100644
index 00000000..1813a2fe
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/files/README.md
@@ -0,0 +1 @@
+Copy here your postgresql.conf and/or pg_hba.conf files to use it as a config map.
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/files/conf.d/README.md b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/files/conf.d/README.md
new file mode 100644
index 00000000..184c1875
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/files/conf.d/README.md
@@ -0,0 +1,4 @@
+If you don't want to provide the whole configuration file and only specify certain parameters, you can copy here your extended `.conf` files.
+These files will be injected as a config maps and add/overwrite the default configuration using the `include_dir` directive that allows settings to be loaded from files other than the default `postgresql.conf`.
+
+More info in the [bitnami-docker-postgresql README](https://github.com/bitnami/bitnami-docker-postgresql#configuration-file).
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/files/docker-entrypoint-initdb.d/README.md b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/files/docker-entrypoint-initdb.d/README.md
new file mode 100644
index 00000000..cba38091
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/files/docker-entrypoint-initdb.d/README.md
@@ -0,0 +1,3 @@
+You can copy here your custom `.sh`, `.sql` or `.sql.gz` file so they are executed during the first boot of the image.
+
+More info in the [bitnami-docker-postgresql](https://github.com/bitnami/bitnami-docker-postgresql#initializing-a-new-instance) repository.
\ No newline at end of file
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/NOTES.txt b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/NOTES.txt
new file mode 100644
index 00000000..3b5e6c60
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/NOTES.txt
@@ -0,0 +1,60 @@
+** Please be patient while the chart is being deployed **
+
+PostgreSQL can be accessed via port {{ template "postgresql.port" . }} on the following DNS name from within your cluster:
+
+    {{ template "postgresql.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - Read/Write connection
+{{- if .Values.replication.enabled }}
+    {{ template "postgresql.fullname" . }}-read.{{ .Release.Namespace }}.svc.cluster.local - Read only connection
+{{- end }}
+
+{{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }}
+
+To get the password for "postgres" run:
+
+    export POSTGRES_ADMIN_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "postgresql.secretName" . }} -o jsonpath="{.data.postgresql-postgres-password}" | base64 --decode)
+{{- end }}
+
+To get the password for "{{ template "postgresql.username" . }}" run:
+
+    export POSTGRES_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "postgresql.secretName" . }} -o jsonpath="{.data.postgresql-password}" | base64 --decode)
+
+To connect to your database run the following command:
+
+    kubectl run {{ template "postgresql.fullname" . }}-client --rm --tty -i --restart='Never' --namespace {{ .Release.Namespace }} --image {{ template "postgresql.image" . }} --env="PGPASSWORD=$POSTGRES_PASSWORD" {{- if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}
+   --labels="{{ template "postgresql.fullname" . }}-client=true" {{- end }} --command -- psql --host {{ template "postgresql.fullname" . }} -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }} -p {{ template "postgresql.port" . }}
+
+{{ if and (.Values.networkPolicy.enabled) (not .Values.networkPolicy.allowExternal) }}
+Note: Since NetworkPolicy is enabled, only pods with label {{ template "postgresql.fullname" . }}-client=true" will be able to connect to this PostgreSQL cluster.
+{{- end }}
+
+To connect to your database from outside the cluster execute the following commands:
+
+{{- if contains "NodePort" .Values.service.type }}
+
+    export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+    export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "postgresql.fullname" . }})
+    {{ if (include "postgresql.password" . )  }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host $NODE_IP --port $NODE_PORT -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }}
+
+{{- else if contains "LoadBalancer" .Values.service.type }}
+
+  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "postgresql.fullname" . }}'
+
+    export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "postgresql.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+    {{ if (include "postgresql.password" . ) }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host $SERVICE_IP --port {{ template "postgresql.port" . }} -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }}
+
+{{- else if contains "ClusterIP" .Values.service.type }}
+
+    kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "postgresql.fullname" . }} {{ template "postgresql.port" . }}:{{ template "postgresql.port" . }} &
+    {{ if (include "postgresql.password" . ) }}PGPASSWORD="$POSTGRES_PASSWORD" {{ end }}psql --host 127.0.0.1 -U {{ .Values.postgresqlUsername }} -d {{- if .Values.postgresqlDatabase }} {{ .Values.postgresqlDatabase }}{{- else }} postgres{{- end }} -p {{ template "postgresql.port" . }}
+
+{{- end }}
+
+{{- include "postgresql.validateValues" . -}}
+
+{{- if and (contains "bitnami/" .Values.image.repository) (not (.Values.image.tag | toString | regexFind "-r\\d+$|sha256:")) }}
+
+WARNING: Rolling tag detected ({{ .Values.image.repository }}:{{ .Values.image.tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment.
++info https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/
+
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/_helpers.tpl b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/_helpers.tpl
new file mode 100644
index 00000000..3ee55726
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/_helpers.tpl
@@ -0,0 +1,420 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "postgresql.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "postgresql.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "postgresql.master.fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- $fullname := default (printf "%s-%s" .Release.Name $name) .Values.fullnameOverride -}}
+{{- if .Values.replication.enabled -}}
+{{- printf "%s-%s" $fullname "master" | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s" $fullname | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for networkpolicy.
+*/}}
+{{- define "postgresql.networkPolicy.apiVersion" -}}
+{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}}
+"extensions/v1beta1"
+{{- else if semverCompare "^1.7-0" .Capabilities.KubeVersion.GitVersion -}}
+"networking.k8s.io/v1"
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "postgresql.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Return the proper PostgreSQL image name
+*/}}
+{{- define "postgresql.image" -}}
+{{- $registryName := .Values.image.registry -}}
+{{- $repositoryName := .Values.image.repository -}}
+{{- $tag := .Values.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL postgres user password
+*/}}
+{{- define "postgresql.postgres.password" -}}
+{{- if .Values.global.postgresql.postgresqlPostgresPassword }}
+    {{- .Values.global.postgresql.postgresqlPostgresPassword -}}
+{{- else if .Values.postgresqlPostgresPassword -}}
+    {{- .Values.postgresqlPostgresPassword -}}
+{{- else -}}
+    {{- randAlphaNum 10 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL password
+*/}}
+{{- define "postgresql.password" -}}
+{{- if .Values.global.postgresql.postgresqlPassword }}
+    {{- .Values.global.postgresql.postgresqlPassword -}}
+{{- else if .Values.postgresqlPassword -}}
+    {{- .Values.postgresqlPassword -}}
+{{- else -}}
+    {{- randAlphaNum 10 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL replication password
+*/}}
+{{- define "postgresql.replication.password" -}}
+{{- if .Values.global.postgresql.replicationPassword }}
+    {{- .Values.global.postgresql.replicationPassword -}}
+{{- else if .Values.replication.password -}}
+    {{- .Values.replication.password -}}
+{{- else -}}
+    {{- randAlphaNum 10 -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL username
+*/}}
+{{- define "postgresql.username" -}}
+{{- if .Values.global.postgresql.postgresqlUsername }}
+    {{- .Values.global.postgresql.postgresqlUsername -}}
+{{- else -}}
+    {{- .Values.postgresqlUsername -}}
+{{- end -}}
+{{- end -}}
+
+
+{{/*
+Return PostgreSQL replication username
+*/}}
+{{- define "postgresql.replication.username" -}}
+{{- if .Values.global.postgresql.replicationUser }}
+    {{- .Values.global.postgresql.replicationUser -}}
+{{- else -}}
+    {{- .Values.replication.user -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL port
+*/}}
+{{- define "postgresql.port" -}}
+{{- if .Values.global.postgresql.servicePort }}
+    {{- .Values.global.postgresql.servicePort -}}
+{{- else -}}
+    {{- .Values.service.port -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return PostgreSQL created database
+*/}}
+{{- define "postgresql.database" -}}
+{{- if .Values.global.postgresql.postgresqlDatabase }}
+    {{- .Values.global.postgresql.postgresqlDatabase -}}
+{{- else if .Values.postgresqlDatabase -}}
+    {{- .Values.postgresqlDatabase -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper image name to change the volume permissions
+*/}}
+{{- define "postgresql.volumePermissions.image" -}}
+{{- $registryName := .Values.volumePermissions.image.registry -}}
+{{- $repositoryName := .Values.volumePermissions.image.repository -}}
+{{- $tag := .Values.volumePermissions.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper PostgreSQL metrics image name
+*/}}
+{{- define "postgresql.metrics.image" -}}
+{{- $registryName :=  default "docker.io" .Values.metrics.image.registry -}}
+{{- $repositoryName := .Values.metrics.image.repository -}}
+{{- $tag := default "latest" .Values.metrics.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the password secret.
+*/}}
+{{- define "postgresql.secretName" -}}
+{{- if .Values.global.postgresql.existingSecret }}
+    {{- printf "%s" .Values.global.postgresql.existingSecret -}}
+{{- else if .Values.existingSecret -}}
+    {{- printf "%s" .Values.existingSecret -}}
+{{- else -}}
+    {{- printf "%s" (include "postgresql.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return true if a secret object should be created
+*/}}
+{{- define "postgresql.createSecret" -}}
+{{- if .Values.global.postgresql.existingSecret }}
+{{- else if .Values.existingSecret -}}
+{{- else -}}
+    {{- true -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the configuration ConfigMap name.
+*/}}
+{{- define "postgresql.configurationCM" -}}
+{{- if .Values.configurationConfigMap -}}
+{{- printf "%s" (tpl .Values.configurationConfigMap $) -}}
+{{- else -}}
+{{- printf "%s-configuration" (include "postgresql.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the extended configuration ConfigMap name.
+*/}}
+{{- define "postgresql.extendedConfigurationCM" -}}
+{{- if .Values.extendedConfConfigMap -}}
+{{- printf "%s" (tpl .Values.extendedConfConfigMap $) -}}
+{{- else -}}
+{{- printf "%s-extended-configuration" (include "postgresql.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the initialization scripts ConfigMap name.
+*/}}
+{{- define "postgresql.initdbScriptsCM" -}}
+{{- if .Values.initdbScriptsConfigMap -}}
+{{- printf "%s" (tpl .Values.initdbScriptsConfigMap $) -}}
+{{- else -}}
+{{- printf "%s-init-scripts" (include "postgresql.fullname" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the initialization scripts Secret name.
+*/}}
+{{- define "postgresql.initdbScriptsSecret" -}}
+{{- printf "%s" (tpl .Values.initdbScriptsSecret $) -}}
+{{- end -}}
+
+{{/*
+Get the metrics ConfigMap name.
+*/}}
+{{- define "postgresql.metricsCM" -}}
+{{- printf "%s-metrics" (include "postgresql.fullname" .) -}}
+{{- end -}}
+
+{{/*
+Return the proper Docker Image Registry Secret Names
+*/}}
+{{- define "postgresql.imagePullSecrets" -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
+Also, we can not use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+{{- if .Values.global.imagePullSecrets }}
+imagePullSecrets:
+{{- range .Values.global.imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.metrics.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.volumePermissions.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- else if or .Values.image.pullSecrets .Values.metrics.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.metrics.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.volumePermissions.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Get the readiness probe command
+*/}}
+{{- define "postgresql.readinessProbeCommand" -}}
+- |
+{{- if (include "postgresql.database" .) }}
+  exec pg_isready -U {{ include "postgresql.username" . | quote }} -d {{ (include "postgresql.database" .) | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+{{- else }}
+  exec pg_isready -U {{ include "postgresql.username" . | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+{{- end }}
+{{- if contains "bitnami/" .Values.image.repository }}
+  [ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return  the proper Storage Class
+*/}}
+{{- define "postgresql.storageClass" -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
+*/}}
+{{- if .Values.global -}}
+    {{- if .Values.global.storageClass -}}
+        {{- if (eq "-" .Values.global.storageClass) -}}
+            {{- printf "storageClassName: \"\"" -}}
+        {{- else }}
+            {{- printf "storageClassName: %s" .Values.global.storageClass -}}
+        {{- end -}}
+    {{- else -}}
+        {{- if .Values.persistence.storageClass -}}
+              {{- if (eq "-" .Values.persistence.storageClass) -}}
+                  {{- printf "storageClassName: \"\"" -}}
+              {{- else }}
+                  {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
+              {{- end -}}
+        {{- end -}}
+    {{- end -}}
+{{- else -}}
+    {{- if .Values.persistence.storageClass -}}
+        {{- if (eq "-" .Values.persistence.storageClass) -}}
+            {{- printf "storageClassName: \"\"" -}}
+        {{- else }}
+            {{- printf "storageClassName: %s" .Values.persistence.storageClass -}}
+        {{- end -}}
+    {{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Renders a value that contains template.
+Usage:
+{{ include "postgresql.tplValue" ( dict "value" .Values.path.to.the.Value "context" $) }}
+*/}}
+{{- define "postgresql.tplValue" -}}
+    {{- if typeIs "string" .value }}
+        {{- tpl .value .context }}
+    {{- else }}
+        {{- tpl (.value | toYaml) .context }}
+    {{- end }}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for statefulset.
+*/}}
+{{- define "postgresql.statefulset.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "apps/v1beta2" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Compile all warnings into a single message, and call fail.
+*/}}
+{{- define "postgresql.validateValues" -}}
+{{- $messages := list -}}
+{{- $messages := append $messages (include "postgresql.validateValues.ldapConfigurationMethod" .) -}}
+{{- $messages := without $messages "" -}}
+{{- $message := join "\n" $messages -}}
+
+{{- if $message -}}
+{{- printf "\nVALUES VALIDATION:\n%s" $message | fail -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Validate values of Postgresql - If ldap.url is used then you don't need the other settings for ldap
+*/}}
+{{- define "postgresql.validateValues.ldapConfigurationMethod" -}}
+{{- if and .Values.ldap.enabled (and (not (empty .Values.ldap.url)) (not (empty .Values.ldap.server))) }}
+postgresql: ldap.url, ldap.server
+    You cannot set both `ldap.url` and `ldap.server` at the same time.
+    Please provide a unique way to configure LDAP.
+    More info at https://www.postgresql.org/docs/current/auth-ldap.html
+{{- end -}}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/configmap.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/configmap.yaml
new file mode 100644
index 00000000..d2178c07
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/configmap.yaml
@@ -0,0 +1,26 @@
+{{ if and (or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration) (not .Values.configurationConfigMap) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "postgresql.fullname" . }}-configuration
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+data:
+{{- if (.Files.Glob "files/postgresql.conf") }}
+{{ (.Files.Glob "files/postgresql.conf").AsConfig | indent 2 }}
+{{- else if .Values.postgresqlConfiguration }}
+  postgresql.conf: |
+{{- range $key, $value := default dict .Values.postgresqlConfiguration }}
+    {{ $key | snakecase }}={{ $value }}
+{{- end }}
+{{- end }}
+{{- if (.Files.Glob "files/pg_hba.conf") }}
+{{ (.Files.Glob "files/pg_hba.conf").AsConfig | indent 2 }}
+{{- else if .Values.pgHbaConfiguration }}
+  pg_hba.conf: |
+{{ .Values.pgHbaConfiguration | indent 4 }}
+{{- end }}
+{{ end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/extended-config-configmap.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/extended-config-configmap.yaml
new file mode 100644
index 00000000..8a411957
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/extended-config-configmap.yaml
@@ -0,0 +1,21 @@
+{{- if and (or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf) (not .Values.extendedConfConfigMap)}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "postgresql.fullname" . }}-extended-configuration
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+data:
+{{- with .Files.Glob "files/conf.d/*.conf" }}
+{{ .AsConfig | indent 2 }}
+{{- end }}
+{{ with .Values.postgresqlExtendedConf }}
+  override.conf: |
+{{- range $key, $value := . }}
+    {{ $key | snakecase }}={{ $value }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/initialization-configmap.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/initialization-configmap.yaml
new file mode 100644
index 00000000..8eb5e058
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/initialization-configmap.yaml
@@ -0,0 +1,24 @@
+{{- if and (or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScripts) (not .Values.initdbScriptsConfigMap) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "postgresql.fullname" . }}-init-scripts
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+{{- with .Files.Glob "files/docker-entrypoint-initdb.d/*.sql.gz" }}
+binaryData:
+{{- range $path, $bytes := . }}
+  {{ base $path }}: {{ $.Files.Get $path | b64enc | quote }}
+{{- end }}
+{{- end }}
+data:
+{{- with .Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql}" }}
+{{ .AsConfig | indent 2 }}
+{{- end }}
+{{- with .Values.initdbScripts }}
+{{ toYaml . | indent 2 }}
+{{- end }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/metrics-configmap.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/metrics-configmap.yaml
new file mode 100644
index 00000000..524aa2f6
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/metrics-configmap.yaml
@@ -0,0 +1,13 @@
+{{- if and .Values.metrics.enabled .Values.metrics.customMetrics }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "postgresql.metricsCM" . }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+data:
+  custom-metrics.yaml: {{ toYaml .Values.metrics.customMetrics | quote }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/metrics-svc.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/metrics-svc.yaml
new file mode 100644
index 00000000..2a955e44
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/metrics-svc.yaml
@@ -0,0 +1,26 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "postgresql.fullname" . }}-metrics
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+  annotations:
+{{ toYaml .Values.metrics.service.annotations | indent 4 }}
+spec:
+  type: {{ .Values.metrics.service.type }}
+  {{- if and (eq .Values.metrics.service.type "LoadBalancer") .Values.metrics.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }}
+  {{- end }}
+  ports:
+    - name: http-metrics
+      port: 9187
+      targetPort: http-metrics
+  selector:
+    app: {{ template "postgresql.name" . }}
+    release: orc8r
+    role: master
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/networkpolicy.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/networkpolicy.yaml
new file mode 100644
index 00000000..ea1fc9b3
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/networkpolicy.yaml
@@ -0,0 +1,38 @@
+{{- if .Values.networkPolicy.enabled }}
+kind: NetworkPolicy
+apiVersion: {{ template "postgresql.networkPolicy.apiVersion" . }}
+metadata:
+  name: {{ template "postgresql.fullname" . }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+spec:
+  podSelector:
+    matchLabels:
+      app: {{ template "postgresql.name" . }}
+      release: {{ .Release.Name | quote }}
+  ingress:
+    # Allow inbound connections
+    - ports:
+        - port: {{ template "postgresql.port" . }}
+      {{- if not .Values.networkPolicy.allowExternal }}
+      from:
+        - podSelector:
+            matchLabels:
+              {{ template "postgresql.fullname" . }}-client: "true"
+          {{- if .Values.networkPolicy.explicitNamespacesSelector }}
+          namespaceSelector:
+{{ toYaml .Values.networkPolicy.explicitNamespacesSelector | indent 12 }}
+          {{- end }}
+        - podSelector:
+            matchLabels:
+              app: {{ template "postgresql.name" . }}
+              release: {{ .Release.Name | quote }}
+              role: slave
+      {{- end }}
+    # Allow prometheus scrapes
+    - ports:
+        - port: 9187
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/prometheusrule.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/prometheusrule.yaml
new file mode 100644
index 00000000..581b3a1c
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/prometheusrule.yaml
@@ -0,0 +1,23 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ template "postgresql.fullname" . }}
+{{- with .Values.metrics.prometheusRule.namespace }}
+    namespace: {{ .Release.Namespace }}
+{{- end }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+{{- with .Values.metrics.prometheusRule.additionalLabels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- with .Values.metrics.prometheusRule.rules }}
+  groups:
+    - name: {{ template "postgresql.name" $ }}
+      rules: {{ tpl (toYaml .) $ | nindent 8 }}
+{{- end }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/secrets.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/secrets.yaml
new file mode 100644
index 00000000..094d18b4
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/secrets.yaml
@@ -0,0 +1,23 @@
+{{- if (include "postgresql.createSecret" .) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "postgresql.fullname" . }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+type: Opaque
+data:
+  {{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }}
+  postgresql-postgres-password: {{ include "postgresql.postgres.password" . | b64enc | quote }}
+  {{- end }}
+  postgresql-password: {{ include "postgresql.password" . | b64enc | quote }}
+  {{- if .Values.replication.enabled }}
+  postgresql-replication-password: {{ include "postgresql.replication.password" . | b64enc | quote }}
+  {{- end }}
+  {{- if (and .Values.ldap.enabled .Values.ldap.bind_password)}}
+  postgresql-ldap-password: {{ .Values.ldap.bind_password | b64enc | quote }}
+  {{- end }}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/serviceaccount.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/serviceaccount.yaml
new file mode 100644
index 00000000..27e5b516
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/serviceaccount.yaml
@@ -0,0 +1,11 @@
+{{- if and (.Values.serviceAccount.enabled) (not .Values.serviceAccount.name) }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+  name: {{ template "postgresql.fullname" . }}
+{{- end }}
\ No newline at end of file
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/servicemonitor.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/servicemonitor.yaml
new file mode 100644
index 00000000..ead58ad4
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/servicemonitor.yaml
@@ -0,0 +1,33 @@
+{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "postgresql.fullname" . }}
+  {{- if .Values.metrics.serviceMonitor.namespace }}
+    namespace: {{ .Release.Namespace }}
+  {{- end }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+    {{- if .Values.metrics.serviceMonitor.additionalLabels }}
+{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }}
+    {{- end }}
+spec:
+  endpoints:
+    - port: http-metrics
+      {{- if .Values.metrics.serviceMonitor.interval }}
+      interval: {{ .Values.metrics.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app: {{ template "postgresql.name" . }}
+      release: orc8r
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/statefulset-slaves.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/statefulset-slaves.yaml
new file mode 100644
index 00000000..3290ff7f
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/statefulset-slaves.yaml
@@ -0,0 +1,299 @@
+{{- if .Values.replication.enabled }}
+apiVersion: {{ template "postgresql.statefulset.apiVersion" . }}
+kind: StatefulSet
+metadata:
+  name: "{{ template "postgresql.fullname" . }}-slave"
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+{{- with .Values.slave.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- with .Values.slave.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  serviceName: {{ template "postgresql.fullname" . }}-headless
+  replicas: {{ .Values.replication.slaveReplicas }}
+  selector:
+    matchLabels:
+      app: {{ template "postgresql.name" . }}
+      release: {{ .Release.Name | quote }}
+      role: slave
+  template:
+    metadata:
+      name: {{ template "postgresql.fullname" . }}
+      labels:
+        app: {{ template "postgresql.name" . }}
+        chart: {{ template "postgresql.chart" . }}
+        release: {{ .Release.Name | quote }}
+        heritage: {{ .Release.Service | quote }}
+        role: slave
+{{- with .Values.slave.podLabels }}
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.slave.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
+    spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+      {{- end }}
+{{- include "postgresql.imagePullSecrets" . | indent 6 }}
+      {{- if .Values.slave.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.slave.nodeSelector | indent 8 }}
+      {{- end }}
+      {{- if .Values.slave.affinity }}
+      affinity:
+{{ toYaml .Values.slave.affinity | indent 8 }}
+      {{- end }}
+      {{- if .Values.slave.tolerations }}
+      tolerations:
+{{ toYaml .Values.slave.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+      {{- end }}
+      {{- if .Values.serviceAccount.enabled }}
+      serviceAccountName: {{ default (include "postgresql.fullname" . ) .Values.serviceAccount.name}}
+      {{- end }}
+      {{- if or .Values.slave.extraInitContainers (and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled))) }}
+      initContainers:
+      {{- if and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled)) }}
+        - name: init-chmod-data
+          image: {{ template "postgresql.volumePermissions.image" . }}
+          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          command:
+            - /bin/sh
+            - -cx
+            - |
+              {{ if .Values.persistence.enabled }}
+              mkdir -p {{ .Values.persistence.mountPath }}/data
+              chmod 700 {{ .Values.persistence.mountPath }}/data
+              find {{ .Values.persistence.mountPath }} -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" | \
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+                xargs chown -R `id -u`:`id -G | cut -d " " -f2`
+              {{- else }}
+                xargs chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}
+              {{- end }}
+              {{- end }}
+              {{- if and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled }}
+              chmod -R 777 /dev/shm
+              {{- end }}
+          {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+          securityContext:
+          {{- else }}
+          securityContext:
+            runAsUser: {{ .Values.volumePermissions.securityContext.runAsUser }}
+          {{- end }}
+          volumeMounts:
+            {{ if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+      {{- end }}
+      {{- if .Values.slave.extraInitContainers }}
+{{ tpl .Values.slave.extraInitContainers . | indent 8 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.slave.priorityClassName }}
+      priorityClassName: {{ .Values.slave.priorityClassName }}
+      {{- end }}
+      containers:
+        - name: {{ template "postgresql.fullname" . }}
+          image: {{ template "postgresql.image" . }}
+          imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          {{- if .Values.securityContext.enabled }}
+          securityContext:
+            runAsUser: {{ .Values.securityContext.runAsUser }}
+          {{- end }}
+          env:
+            - name: BITNAMI_DEBUG
+              value: {{ ternary "true" "false" .Values.image.debug | quote }}
+            - name: POSTGRESQL_VOLUME_DIR
+              value: "{{ .Values.persistence.mountPath }}"
+            - name: POSTGRESQL_PORT_NUMBER
+              value: "{{ template "postgresql.port" . }}"
+            {{- if .Values.persistence.mountPath }}
+            - name: PGDATA
+              value: {{ .Values.postgresqlDataDir | quote }}
+            {{- end }}
+            - name: POSTGRES_REPLICATION_MODE
+              value: "slave"
+            - name: POSTGRES_REPLICATION_USER
+              value: {{ include "postgresql.replication.username" . | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_REPLICATION_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-replication-password"
+            {{- else }}
+            - name: POSTGRES_REPLICATION_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-replication-password
+            {{- end }}
+            - name: POSTGRES_CLUSTER_APP_NAME
+              value: {{ .Values.replication.applicationName }}
+            - name: POSTGRES_MASTER_HOST
+              value: {{ template "postgresql.fullname" . }}
+            - name: POSTGRES_MASTER_PORT_NUMBER
+              value: {{ include "postgresql.port" . | quote }}
+            {{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-postgres-password"
+            {{- else }}
+            - name: POSTGRES_POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-postgres-password
+            {{- end }}
+            {{- end }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-password"
+            {{- else }}
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-password
+            {{- end }}
+          ports:
+            - name: tcp-postgresql
+              containerPort: {{ template "postgresql.port" . }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                {{- if (include "postgresql.database" .) }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d {{ (include "postgresql.database" .) | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- else }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- end }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - -e
+                {{- include "postgresql.readinessProbeCommand" . | nindent 16 }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- end }}
+          volumeMounts:
+            {{- if .Values.usePasswordFile }}
+            - name: postgresql-password
+              mountPath: /opt/bitnami/postgresql/secrets/
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+            {{- if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{ end }}
+            {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+            - name: postgresql-extended-config
+              mountPath: /bitnami/postgresql/conf/conf.d/
+            {{- end }}
+            {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }}
+            - name: postgresql-config
+              mountPath: /bitnami/postgresql/conf
+            {{- end }}
+            {{- if .Values.slave.extraVolumeMounts }}
+            {{- toYaml .Values.slave.extraVolumeMounts | nindent 12 }}
+            {{- end }}
+{{- if .Values.slave.sidecars }}
+{{- include "postgresql.tplValue" ( dict "value" .Values.slave.sidecars "context" $ ) | nindent 8 }}
+{{- end }}
+      volumes:
+        {{- if .Values.usePasswordFile }}
+        - name: postgresql-password
+          secret:
+            secretName: {{ template "postgresql.secretName" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap}}
+        - name: postgresql-config
+          configMap:
+            name: {{ template "postgresql.configurationCM" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+        - name: postgresql-extended-config
+          configMap:
+            name: {{ template "postgresql.extendedConfigurationCM" . }}
+        {{- end }}
+        {{- if .Values.shmVolume.enabled }}
+        - name: dshm
+          emptyDir:
+            medium: Memory
+            sizeLimit: 1Gi
+        {{- end }}
+        {{- if not .Values.persistence.enabled }}
+        - name: data
+          emptyDir: {}
+        {{- end }}
+        {{- if .Values.slave.extraVolumes }}
+        {{- toYaml .Values.slave.extraVolumes | nindent 8 }}
+        {{- end }}
+  updateStrategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "Recreate" .Values.updateStrategy.type) }}
+    rollingUpdate: null
+    {{- end }}
+{{- if .Values.persistence.enabled }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      {{- with .Values.persistence.annotations }}
+        annotations:
+        {{- range $key, $value := . }}
+          {{ $key }}: {{ $value }}
+        {{- end }}
+      {{- end }}
+      spec:
+        accessModes:
+        {{- range .Values.persistence.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.persistence.size | quote }}
+        {{ include "postgresql.storageClass" . }}
+{{- end }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/statefulset.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/statefulset.yaml
new file mode 100644
index 00000000..3390be22
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/statefulset.yaml
@@ -0,0 +1,458 @@
+apiVersion: {{ template "postgresql.statefulset.apiVersion" . }}
+kind: StatefulSet
+metadata:
+  name: {{ template "postgresql.master.fullname" . }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+{{- with .Values.master.labels }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- with .Values.master.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  serviceName: {{ template "postgresql.fullname" . }}-headless
+  replicas: 1
+  updateStrategy:
+    type: {{ .Values.updateStrategy.type }}
+    {{- if (eq "Recreate" .Values.updateStrategy.type) }}
+    rollingUpdate: null
+    {{- end }}
+  selector:
+    matchLabels:
+      app: {{ template "postgresql.name" . }}
+      release: {{ .Release.Name | quote }}
+      role: master
+  template:
+    metadata:
+      name: {{ template "postgresql.fullname" . }}
+      labels:
+        app: {{ template "postgresql.name" . }}
+        chart: {{ template "postgresql.chart" . }}
+        release: {{ .Release.Name | quote }}
+        heritage: {{ .Release.Service | quote }}
+        role: master
+{{- with .Values.master.podLabels }}
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.master.podAnnotations }}
+      annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
+    spec:
+      {{- if .Values.schedulerName }}
+      schedulerName: "{{ .Values.schedulerName }}"
+      {{- end }}
+{{- include "postgresql.imagePullSecrets" . | indent 6 }}
+      {{- if .Values.master.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.master.nodeSelector | indent 8 }}
+      {{- end }}
+      {{- if .Values.master.affinity }}
+      affinity:
+{{ toYaml .Values.master.affinity | indent 8 }}
+      {{- end }}
+      {{- if .Values.master.tolerations }}
+      tolerations:
+{{ toYaml .Values.master.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+      {{- end }}
+      {{- if .Values.serviceAccount.enabled }}
+      serviceAccountName: {{ default (include "postgresql.fullname" . ) .Values.serviceAccount.name }}
+      {{- end }}
+      {{- if or .Values.master.extraInitContainers (and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled))) }}
+      initContainers:
+      {{- if and .Values.volumePermissions.enabled (or .Values.persistence.enabled (and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled)) }}
+        - name: init-chmod-data
+          image: {{ template "postgresql.volumePermissions.image" . }}
+          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          command:
+            - /bin/sh
+            - -cx
+            - |
+              {{ if .Values.persistence.enabled }}
+              mkdir -p {{ .Values.persistence.mountPath }}/data
+              chmod 700 {{ .Values.persistence.mountPath }}/data
+              find {{ .Values.persistence.mountPath }} -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" | \
+              {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+                xargs chown -R `id -u`:`id -G | cut -d " " -f2`
+              {{- else }}
+                xargs chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.fsGroup }}
+              {{- end }}
+              {{- end }}
+              {{- if and .Values.shmVolume.enabled .Values.shmVolume.chmod.enabled }}
+              chmod -R 777 /dev/shm
+              {{- end }}
+          {{- if eq ( toString ( .Values.volumePermissions.securityContext.runAsUser )) "auto" }}
+          securityContext:
+          {{- else }}
+          securityContext:
+            runAsUser: {{ .Values.volumePermissions.securityContext.runAsUser }}
+          {{- end }}
+          volumeMounts:
+            {{ if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+      {{- end }}
+      {{- if .Values.master.extraInitContainers }}
+{{ tpl .Values.master.extraInitContainers . | indent 8 }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.master.priorityClassName }}
+      priorityClassName: {{ .Values.master.priorityClassName }}
+      {{- end }}
+      containers:
+        - name: {{ template "postgresql.fullname" . }}
+          image: {{ template "postgresql.image" . }}
+          imagePullPolicy: "{{ .Values.image.pullPolicy }}"
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
+          {{- if .Values.securityContext.enabled }}
+          securityContext:
+            runAsUser: {{ .Values.securityContext.runAsUser }}
+          {{- end }}
+          env:
+            - name: BITNAMI_DEBUG
+              value: {{ ternary "true" "false" .Values.image.debug | quote }}
+            - name: POSTGRESQL_PORT_NUMBER
+              value: "{{ template "postgresql.port" . }}"
+            - name: POSTGRESQL_VOLUME_DIR
+              value: "{{ .Values.persistence.mountPath }}"
+            {{- if .Values.postgresqlInitdbArgs }}
+            - name: POSTGRES_INITDB_ARGS
+              value: {{ .Values.postgresqlInitdbArgs | quote }}
+            {{- end }}
+            {{- if .Values.postgresqlInitdbWalDir }}
+            - name: POSTGRES_INITDB_WALDIR
+              value: {{ .Values.postgresqlInitdbWalDir | quote }}
+            {{- end }}
+            {{- if .Values.initdbUser }}
+            - name: POSTGRESQL_INITSCRIPTS_USERNAME
+              value: {{ .Values.initdbUser }}
+            {{- end }}
+            {{- if .Values.initdbPassword }}
+            - name: POSTGRESQL_INITSCRIPTS_PASSWORD
+              value: .Values.initdbPassword
+            {{- end }}
+            {{- if .Values.persistence.mountPath }}
+            - name: PGDATA
+              value: {{ .Values.postgresqlDataDir | quote }}
+            {{- end }}
+            {{- if .Values.replication.enabled }}
+            - name: POSTGRES_REPLICATION_MODE
+              value: "master"
+            - name: POSTGRES_REPLICATION_USER
+              value: {{ include "postgresql.replication.username" . | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_REPLICATION_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-replication-password"
+            {{- else }}
+            - name: POSTGRES_REPLICATION_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-replication-password
+            {{- end }}
+            {{- if not (eq .Values.replication.synchronousCommit "off")}}
+            - name: POSTGRES_SYNCHRONOUS_COMMIT_MODE
+              value: {{ .Values.replication.synchronousCommit | quote }}
+            - name: POSTGRES_NUM_SYNCHRONOUS_REPLICAS
+              value: {{ .Values.replication.numSynchronousReplicas | quote }}
+            {{- end }}
+            - name: POSTGRES_CLUSTER_APP_NAME
+              value: {{ .Values.replication.applicationName }}
+            {{- end }}
+            {{- if and .Values.postgresqlPostgresPassword (not (eq .Values.postgresqlUsername "postgres")) }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-postgres-password"
+            {{- else }}
+            - name: POSTGRES_POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-postgres-password
+            {{- end }}
+            {{- end }}
+            - name: POSTGRES_USER
+              value: {{ include "postgresql.username" . | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: POSTGRES_PASSWORD_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-password"
+            {{- else }}
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-password
+            {{- end }}
+            {{- if (include "postgresql.database" .) }}
+            - name: POSTGRES_DB
+              value: {{ (include "postgresql.database" .) | quote }}
+            {{- end }}
+            {{- if .Values.extraEnv }}
+            {{- include "postgresql.tplValue" (dict "value" .Values.extraEnv "context" $) | nindent 12 }}
+            {{- end }}
+            - name: POSTGRESQL_ENABLE_LDAP
+              value: {{ ternary "yes" "no" .Values.ldap.enabled | quote }}
+            {{- if .Values.ldap.enabled }}
+            - name: POSTGRESQL_LDAP_SERVER
+              value: {{ .Values.ldap.server }}
+            - name: POSTGRESQL_LDAP_PORT
+              value: {{ .Values.ldap.port | quote }}
+            - name: POSTGRESQL_LDAP_SCHEME
+              value: {{ .Values.ldap.scheme }}
+            {{- if .Values.ldap.tls }}
+            - name: POSTGRESQL_LDAP_TLS
+              value: "1"
+            {{- end}}
+            - name: POSTGRESQL_LDAP_PREFIX
+              value: {{ .Values.ldap.prefix | quote }}
+            - name: POSTGRESQL_LDAP_SUFFIX
+              value: {{ .Values.ldap.suffix | quote}}
+            - name: POSTGRESQL_LDAP_BASE_DN
+              value: {{ .Values.ldap.baseDN }}
+            - name: POSTGRESQL_LDAP_BIND_DN
+              value: {{ .Values.ldap.bindDN }}
+            {{- if (not (empty .Values.ldap.bind_password)) }}
+            - name: POSTGRESQL_LDAP_BIND_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-ldap-password
+            {{- end}}
+            - name: POSTGRESQL_LDAP_SEARCH_ATTR
+              value: {{ .Values.ldap.search_attr }}
+            - name: POSTGRESQL_LDAP_SEARCH_FILTER
+              value: {{ .Values.ldap.search_filter }}
+            - name: POSTGRESQL_LDAP_URL
+              value: {{ .Values.ldap.url }}
+            {{- end}}
+          {{- if .Values.extraEnvVarsCM }}
+          envFrom:
+            - configMapRef:
+                name: {{ .Values.extraEnvVarsCM }}
+          {{- end }}
+          ports:
+            - name: tcp-postgresql
+              containerPort: {{ template "postgresql.port" . }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                {{- if (include "postgresql.database" .) }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -d {{ (include "postgresql.database" .) | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- else }}
+                - exec pg_isready -U {{ include "postgresql.username" . | quote }} -h 127.0.0.1 -p {{ template "postgresql.port" . }}
+                {{- end }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - -e
+                {{- include "postgresql.readinessProbeCommand" . | nindent 16 }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- end }}
+          volumeMounts:
+            {{- if or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
+            - name: custom-init-scripts
+              mountPath: /docker-entrypoint-initdb.d/
+            {{- end }}
+            {{- if .Values.initdbScriptsSecret }}
+            - name: custom-init-scripts-secret
+              mountPath: /docker-entrypoint-initdb.d/secret
+            {{- end }}
+            {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+            - name: postgresql-extended-config
+              mountPath: /bitnami/postgresql/conf/conf.d/
+            {{- end }}
+            {{- if .Values.usePasswordFile }}
+            - name: postgresql-password
+              mountPath: /opt/bitnami/postgresql/secrets/
+            {{- end }}
+            {{- if .Values.shmVolume.enabled }}
+            - name: dshm
+              mountPath: /dev/shm
+            {{- end }}
+            {{- if .Values.persistence.enabled }}
+            - name: data
+              mountPath: {{ .Values.persistence.mountPath }}
+              subPath: {{ .Values.persistence.subPath }}
+            {{- end }}
+            {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap }}
+            - name: postgresql-config
+              mountPath: /bitnami/postgresql/conf
+            {{- end }}
+            {{- if .Values.master.extraVolumeMounts }}
+            {{- toYaml .Values.master.extraVolumeMounts | nindent 12 }}
+            {{- end }}
+{{- if .Values.master.sidecars }}
+{{- include "postgresql.tplValue" ( dict "value" .Values.master.sidecars "context" $ ) | nindent 8 }}
+{{- end }}
+{{- if .Values.metrics.enabled }}
+        - name: metrics
+          image: {{ template "postgresql.metrics.image" . }}
+          imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
+         {{- if .Values.metrics.securityContext.enabled }}
+          securityContext:
+            runAsUser: {{ .Values.metrics.securityContext.runAsUser }}
+        {{- end }}
+          env:
+            {{- $database := required "In order to enable metrics you need to specify a database (.Values.postgresqlDatabase or .Values.global.postgresql.postgresqlDatabase)" (include "postgresql.database" .) }}
+            - name: DATA_SOURCE_URI
+              value: {{ printf "127.0.0.1:%d/%s?sslmode=disable" (int (include "postgresql.port" .)) $database | quote }}
+            {{- if .Values.usePasswordFile }}
+            - name: DATA_SOURCE_PASS_FILE
+              value: "/opt/bitnami/postgresql/secrets/postgresql-password"
+            {{- else }}
+            - name: DATA_SOURCE_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "postgresql.secretName" . }}
+                  key: postgresql-password
+            {{- end }}
+            - name: DATA_SOURCE_USER
+              value: {{ template "postgresql.username" . }}
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http-metrics
+            initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http-metrics
+            initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }}
+          {{- end }}
+          volumeMounts:
+            {{- if .Values.usePasswordFile }}
+            - name: postgresql-password
+              mountPath: /opt/bitnami/postgresql/secrets/
+            {{- end }}
+            {{- if .Values.metrics.customMetrics }}
+            - name: custom-metrics
+              mountPath: /conf
+              readOnly: true
+          args: ["--extend.query-path", "/conf/custom-metrics.yaml"]
+            {{- end }}
+          ports:
+            - name: http-metrics
+              containerPort: 9187
+          {{- if .Values.metrics.resources }}
+          resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
+          {{- end }}
+{{- end }}
+      volumes:
+        {{- if or (.Files.Glob "files/postgresql.conf") (.Files.Glob "files/pg_hba.conf") .Values.postgresqlConfiguration .Values.pgHbaConfiguration .Values.configurationConfigMap}}
+        - name: postgresql-config
+          configMap:
+            name: {{ template "postgresql.configurationCM" . }}
+        {{- end }}
+        {{- if or (.Files.Glob "files/conf.d/*.conf") .Values.postgresqlExtendedConf .Values.extendedConfConfigMap }}
+        - name: postgresql-extended-config
+          configMap:
+            name: {{ template "postgresql.extendedConfigurationCM" . }}
+        {{- end }}
+        {{- if .Values.usePasswordFile }}
+        - name: postgresql-password
+          secret:
+            secretName: {{ template "postgresql.secretName" . }}
+        {{- end }}
+        {{- if  or (.Files.Glob "files/docker-entrypoint-initdb.d/*.{sh,sql,sql.gz}") .Values.initdbScriptsConfigMap .Values.initdbScripts }}
+        - name: custom-init-scripts
+          configMap:
+            name: {{ template "postgresql.initdbScriptsCM" . }}
+        {{- end }}
+        {{- if .Values.initdbScriptsSecret }}
+        - name: custom-init-scripts-secret
+          secret:
+            secretName: {{ template "postgresql.initdbScriptsSecret" . }}
+        {{- end }}
+        {{- if .Values.master.extraVolumes }}
+        {{- toYaml .Values.master.extraVolumes | nindent 8 }}
+        {{- end }}
+        {{- if and .Values.metrics.enabled .Values.metrics.customMetrics }}
+        - name: custom-metrics
+          configMap:
+            name: {{ template "postgresql.metricsCM" . }}
+        {{- end }}
+        {{- if .Values.shmVolume.enabled }}
+        - name: dshm
+          emptyDir:
+            medium: Memory
+            sizeLimit: 1Gi
+        {{- end }}
+{{- if and .Values.persistence.enabled .Values.persistence.existingClaim }}
+        - name: data
+          persistentVolumeClaim:
+{{- with .Values.persistence.existingClaim }}
+            claimName: {{ tpl . $ }}
+{{- end }}
+{{- else if not .Values.persistence.enabled }}
+        - name: data
+          emptyDir: {}
+{{- else if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+  volumeClaimTemplates:
+    - metadata:
+        name: data
+      {{- with .Values.persistence.annotations }}
+        annotations:
+        {{- range $key, $value := . }}
+          {{ $key }}: {{ $value }}
+        {{- end }}
+      {{- end }}
+      spec:
+        accessModes:
+        {{- range .Values.persistence.accessModes }}
+          - {{ . | quote }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.persistence.size | quote }}
+        {{ include "postgresql.storageClass" . }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/svc-headless.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/svc-headless.yaml
new file mode 100644
index 00000000..02b0a363
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/svc-headless.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Service
+metadata:
+  #name: {{ template "postgresql.fullname" . }}-headless
+  name: postgresql-headless
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+spec:
+  type: ClusterIP
+  clusterIP: None
+  ports:
+    - name: tcp-postgresql
+      port: {{ template "postgresql.port" . }}
+      targetPort: tcp-postgresql
+  selector:
+    app: {{ template "postgresql.name" . }}
+    release: {{ .Release.Name | quote }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/svc-read.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/svc-read.yaml
new file mode 100644
index 00000000..20510d38
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/svc-read.yaml
@@ -0,0 +1,32 @@
+{{- if .Values.replication.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+#  name: {{ template "postgresql.fullname" . }}-read
+  name: postgresql
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+{{- with .Values.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  {{- if and .Values.service.loadBalancerIP (eq .Values.service.type "LoadBalancer") }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  ports:
+    - name: tcp-postgresql
+      port:  {{ template "postgresql.port" . }}
+      targetPort: tcp-postgresql
+      {{- if .Values.service.nodePort }}
+      nodePort: {{ .Values.service.nodePort }}
+      {{- end }}
+  selector:
+    app: {{ template "postgresql.name" . }}
+    release: {{ .Release.Name | quote }}
+    role: slave
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/svc.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/svc.yaml
new file mode 100644
index 00000000..0baea4ac
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/templates/svc.yaml
@@ -0,0 +1,38 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "postgresql.fullname" . }}
+  labels:
+    app: {{ template "postgresql.name" . }}
+    chart: {{ template "postgresql.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
+{{- with .Values.service.annotations }}
+  annotations:
+{{ tpl (toYaml .) $ | indent 4 }}
+{{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  {{- if and .Values.service.loadBalancerIP (eq .Values.service.type "LoadBalancer") }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{ with .Values.service.loadBalancerSourceRanges }}
+{{ toYaml . | indent 4 }}
+{{- end }}
+  {{- end }}
+  {{- if and (eq .Values.service.type "ClusterIP") .Values.service.clusterIP }}
+  clusterIP: {{ .Values.service.clusterIP }}
+  {{- end }}
+  ports:
+    - name: tcp-postgresql
+      port: {{ template "postgresql.port" . }}
+      targetPort: tcp-postgresql
+      {{- if .Values.service.nodePort }}
+      nodePort: {{ .Values.service.nodePort }}
+      {{- end }}
+  selector:
+    app: {{ template "postgresql.name" . }}
+    release: {{ .Release.Name | quote }}
+    role: master
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/values-production.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/values-production.yaml
new file mode 100644
index 00000000..8da0b3d9
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/values-production.yaml
@@ -0,0 +1,520 @@
+## Global Docker image parameters
+## Please, note that this will override the image parameters, including dependencies, configured to use the global value
+## Current available global Docker image parameters: imageRegistry and imagePullSecrets
+##
+global:
+  postgresql: {}
+#   imageRegistry: myRegistryName
+#   imagePullSecrets:
+#     - myRegistryKeySecretName
+#   storageClass: myStorageClass
+
+## Bitnami PostgreSQL image version
+## ref: https://hub.docker.com/r/bitnami/postgresql/tags/
+##
+image:
+  registry: docker.io
+  repository: bitnami/postgresql
+  tag: 11.7.0-debian-10-r9
+  ## Specify a imagePullPolicy
+  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+  ##
+  pullPolicy: IfNotPresent
+  ## Optionally specify an array of imagePullSecrets.
+  ## Secrets must be manually created in the namespace.
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  ##
+  # pullSecrets:
+  #   - myRegistryKeySecretName
+
+  ## Set to true if you would like to see extra information on logs
+  ## It turns BASH and NAMI debugging in minideb
+  ## ref:  https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging
+  debug: false
+
+## String to partially override postgresql.fullname template (will maintain the release name)
+##
+# nameOverride:
+
+## String to fully override postgresql.fullname template
+##
+# fullnameOverride:
+
+##
+## Init containers parameters:
+## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup
+##
+volumePermissions:
+  enabled: false
+  image:
+    registry: docker.io
+    repository: bitnami/minideb
+    tag: buster
+    ## Specify a imagePullPolicy
+    ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+    ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+    ##
+    pullPolicy: Always
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  ## Init container Security Context
+  ## Note: the chown of the data folder is done to securityContext.runAsUser
+  ## and not the below volumePermissions.securityContext.runAsUser
+  ## When runAsUser is set to special value "auto", init container will try to chwon the
+  ## data folder to autodetermined user&group, using commands: `id -u`:`id -G | cut -d" " -f2`
+  ## "auto" is especially useful for OpenShift which has scc with dynamic userids (and 0 is not allowed).
+  ## You may want to use this volumePermissions.securityContext.runAsUser="auto" in combination with
+  ## pod securityContext.enabled=false and shmVolume.chmod.enabled=false
+  ##
+  securityContext:
+    runAsUser: 0
+
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName:
+
+## Pod Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+##
+securityContext:
+  enabled: true
+  fsGroup: 1001
+  runAsUser: 1001
+
+## Pod Service Account
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
+serviceAccount:
+  enabled: false
+  ## Name of an already existing service account. Setting this value disables the automatic service account creation.
+  # name:
+
+replication:
+  enabled: true
+  user: repl_user
+  password: repl_password
+  slaveReplicas: 2
+  ## Set synchronous commit mode: on, off, remote_apply, remote_write and local
+  ## ref: https://www.postgresql.org/docs/9.6/runtime-config-wal.html#GUC-WAL-LEVEL
+  synchronousCommit: "on"
+  ## From the number of `slaveReplicas` defined above, set the number of those that will have synchronous replication
+  ## NOTE: It cannot be > slaveReplicas
+  numSynchronousReplicas: 1
+  ## Replication Cluster application name. Useful for defining multiple replication policies
+  applicationName: my_application
+
+## PostgreSQL admin password (used when `postgresqlUsername` is not `postgres`)
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-user-on-first-run (see note!)
+# postgresqlPostgresPassword:
+
+## PostgreSQL user (has superuser privileges if username is `postgres`)
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
+postgresqlUsername: postgres
+
+## PostgreSQL password
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
+##
+# postgresqlPassword:
+
+## PostgreSQL password using existing secret
+## existingSecret: secret
+
+## Mount PostgreSQL secret as a file instead of passing environment variable
+# usePasswordFile: false
+
+## Create a database
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-on-first-run
+##
+# postgresqlDatabase:
+
+## PostgreSQL data dir
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+postgresqlDataDir: /bitnami/postgresql/data
+
+## An array to add extra environment variables
+## For example:
+## extraEnv:
+##   - name: FOO
+##     value: "bar"
+##
+# extraEnv:
+extraEnv: []
+
+## Name of a ConfigMap containing extra env vars
+##
+# extraEnvVarsCM:
+
+## Specify extra initdb args
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+# postgresqlInitdbArgs:
+
+## Specify a custom location for the PostgreSQL transaction log
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+# postgresqlInitdbWalDir:
+
+## PostgreSQL configuration
+## Specify runtime configuration parameters as a dict, using camelCase, e.g.
+## {"sharedBuffers": "500MB"}
+## Alternatively, you can put your postgresql.conf under the files/ directory
+## ref: https://www.postgresql.org/docs/current/static/runtime-config.html
+##
+# postgresqlConfiguration:
+
+## PostgreSQL extended configuration
+## As above, but _appended_ to the main configuration
+## Alternatively, you can put your *.conf under the files/conf.d/ directory
+## https://github.com/bitnami/bitnami-docker-postgresql#allow-settings-to-be-loaded-from-files-other-than-the-default-postgresqlconf
+##
+# postgresqlExtendedConf:
+
+## PostgreSQL client authentication configuration
+## Specify content for pg_hba.conf
+## Default: do not create pg_hba.conf
+## Alternatively, you can put your pg_hba.conf under the files/ directory
+# pgHbaConfiguration: |-
+#   local all all trust
+#   host all all localhost trust
+#   host mydatabase mysuser 192.168.0.0/24 md5
+
+## ConfigMap with PostgreSQL configuration
+## NOTE: This will override postgresqlConfiguration and pgHbaConfiguration
+# configurationConfigMap:
+
+## ConfigMap with PostgreSQL extended configuration
+# extendedConfConfigMap:
+
+## initdb scripts
+## Specify dictionary of scripts to be run at first boot
+## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory
+##
+# initdbScripts:
+#   my_init_script.sh: |
+#      #!/bin/sh
+#      echo "Do something."
+
+## Specify the PostgreSQL username and password to execute the initdb scripts
+# initdbUser:
+# initdbPassword:
+
+## ConfigMap with scripts to be run at first boot
+## NOTE: This will override initdbScripts
+# initdbScriptsConfigMap:
+
+## Secret with scripts to be run at first boot (in case it contains sensitive information)
+## NOTE: This can work along initdbScripts or initdbScriptsConfigMap
+# initdbScriptsSecret:
+
+## Optional duration in seconds the pod needs to terminate gracefully.
+## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods
+##
+# terminationGracePeriodSeconds: 30
+
+## LDAP configuration
+##
+ldap:
+  enabled: false
+  url: ""
+  server: ""
+  port: ""
+  prefix: ""
+  suffix: ""
+  baseDN: ""
+  bindDN: ""
+  bind_password:
+  search_attr: ""
+  search_filter: ""
+  scheme: ""
+  tls: false
+
+## PostgreSQL service configuration
+service:
+  ## PosgresSQL service type
+  type: ClusterIP
+  # clusterIP: None
+  port: 5432
+
+  ## Specify the nodePort value for the LoadBalancer and NodePort service types.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+  ##
+  # nodePort:
+
+  ## Provide any additional annotations which may be required.
+  ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
+  annotations: {}
+  ## Set the LoadBalancer service type to internal only.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
+  ##
+  # loadBalancerIP:
+
+  ## Load Balancer sources
+  ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service
+  ##
+  # loadBalancerSourceRanges:
+  # - 10.10.10.0/24
+
+## Start master and slave(s) pod(s) without limitations on shm memory.
+## By default docker and containerd (and possibly other container runtimes)
+## limit `/dev/shm` to `64M` (see e.g. the
+## [docker issue](https://github.com/docker-library/postgres/issues/416) and the
+## [containerd issue](https://github.com/containerd/containerd/issues/3654),
+## which could be not enough if PostgreSQL uses parallel workers heavily.
+##
+shmVolume:
+  ## Set `shmVolume.enabled` to `true` to mount a new tmpfs volume to remove
+  ## this limitation.
+  ##
+  enabled: true
+  ## Set to `true` to `chmod 777 /dev/shm` on a initContainer.
+  ## This option is ingored if `volumePermissions.enabled` is `false`
+  ##
+  chmod:
+    enabled: true
+
+## PostgreSQL data Persistent Volume Storage Class
+## If defined, storageClassName: <storageClass>
+## If set to "-", storageClassName: "", which disables dynamic provisioning
+## If undefined (the default) or set to null, no storageClassName spec is
+##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+##   GKE, AWS & OpenStack)
+##
+persistence:
+  enabled: true
+  ## A manually managed Persistent Volume and Claim
+  ## If defined, PVC must be created manually before volume will be bound
+  ## The value is evaluated as a template, so, for example, the name can depend on .Release or .Chart
+  ##
+  # existingClaim:
+
+  ## The path the volume will be mounted at, useful when using different
+  ## PostgreSQL images.
+  ##
+  mountPath: /bitnami/postgresql
+
+  ## The subdirectory of the volume to mount to, useful in dev environments
+  ## and one PV for multiple services.
+  ##
+  subPath: ""
+
+  # storageClass: "-"
+  accessModes:
+    - ReadWriteOnce
+  size: 8Gi
+  annotations: {}
+
+## updateStrategy for PostgreSQL StatefulSet and its slaves StatefulSets
+## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
+updateStrategy:
+  type: RollingUpdate
+
+##
+## PostgreSQL Master parameters
+##
+master:
+  ## Node, affinity, tolerations, and priorityclass settings for pod assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
+  ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption
+  nodeSelector: {}
+  affinity: {}
+  tolerations: []
+  labels: {}
+  annotations: {}
+  podLabels: {}
+  podAnnotations: {}
+  priorityClassName: ""
+  ## Additional PostgreSQL Master Volume mounts
+  ##
+  extraVolumeMounts: []
+  ## Additional PostgreSQL Master Volumes
+  ##
+  extraVolumes: []
+  ## Add sidecars to the pod
+  ##
+  ## For example:
+  ## sidecars:
+  ##   - name: your-image-name
+  ##     image: your-image
+  ##     imagePullPolicy: Always
+  ##     ports:
+  ##       - name: portname
+  ##         containerPort: 1234
+  sidecars: []
+
+##
+## PostgreSQL Slave parameters
+##
+slave:
+  ## Node, affinity, tolerations, and priorityclass settings for pod assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
+  ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption
+  nodeSelector: {}
+  affinity: {}
+  tolerations: []
+  labels: {}
+  annotations: {}
+  podLabels: {}
+  podAnnotations: {}
+  priorityClassName: ""
+  extraInitContainers: |
+    # - name: do-something
+    #   image: busybox
+    #   command: ['do', 'something']
+  ## Additional PostgreSQL Slave Volume mounts
+  ##
+  extraVolumeMounts: []
+  ## Additional PostgreSQL Slave Volumes
+  ##
+  extraVolumes: []
+  ## Add sidecars to the pod
+  ##
+  ## For example:
+  ## sidecars:
+  ##   - name: your-image-name
+  ##     image: your-image
+  ##     imagePullPolicy: Always
+  ##     ports:
+  ##       - name: portname
+  ##         containerPort: 1234
+  sidecars: []
+
+## Configure resource requests and limits
+## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+##
+resources:
+  requests:
+    memory: 256Mi
+    cpu: 250m
+
+networkPolicy:
+  ## Enable creation of NetworkPolicy resources. Only Ingress traffic is filtered for now.
+  ##
+  enabled: false
+
+  ## The Policy model to apply. When set to false, only pods with the correct
+  ## client label will have network access to the port PostgreSQL is listening
+  ## on. When true, PostgreSQL will accept connections from any source
+  ## (with the correct destination port).
+  ##
+  allowExternal: true
+
+  ## if explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace
+  ## and that match other criteria, the ones that have the good label, can reach the DB.
+  ## But sometimes, we want the DB to be accessible to clients from other namespaces, in this case, we can use this
+  ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added.
+  ##
+  # explicitNamespacesSelector:
+    # matchLabels:
+      # role: frontend
+    # matchExpressions:
+      # - {key: role, operator: In, values: [frontend]}
+
+## Configure extra options for liveness and readiness probes
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
+livenessProbe:
+  enabled: true
+  initialDelaySeconds: 30
+  periodSeconds: 10
+  timeoutSeconds: 5
+  failureThreshold: 6
+  successThreshold: 1
+
+readinessProbe:
+  enabled: true
+  initialDelaySeconds: 5
+  periodSeconds: 10
+  timeoutSeconds: 5
+  failureThreshold: 6
+  successThreshold: 1
+
+## Configure metrics exporter
+##
+metrics:
+  enabled: true
+  # resources: {}
+  service:
+    type: ClusterIP
+    annotations:
+      prometheus.io/scrape: "true"
+      prometheus.io/port: "9187"
+    loadBalancerIP:
+  serviceMonitor:
+    enabled: false
+    additionalLabels: {}
+    # namespace: monitoring
+    # interval: 30s
+    # scrapeTimeout: 10s
+  ## Custom PrometheusRule to be defined
+  ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
+  ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
+  prometheusRule:
+    enabled: false
+    additionalLabels: {}
+    namespace: ""
+    rules: []
+      ## These are just examples rules, please adapt them to your needs.
+      ## Make sure to constraint the rules to the current postgresql service.
+      # - alert: HugeReplicationLag
+      #   expr: pg_replication_lag{service="{{ template "postgresql.fullname" . }}-metrics"} / 3600 > 1
+      #   for: 1m
+      #   labels:
+      #     severity: critical
+      #   annotations:
+      #     description: replication for {{ template "postgresql.fullname" . }} PostgreSQL is lagging by {{ "{{ $value }}" }} hour(s).
+      #     summary: PostgreSQL replication is lagging by {{ "{{ $value }}" }} hour(s).
+  image:
+    registry: docker.io
+    repository: bitnami/postgres-exporter
+    tag: 0.8.0-debian-10-r28
+    pullPolicy: IfNotPresent
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  ## Define additional custom metrics
+  ## ref: https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file
+  # customMetrics:
+  #   pg_database:
+  #     query: "SELECT d.datname AS name, CASE WHEN pg_catalog.has_database_privilege(d.datname, 'CONNECT') THEN pg_catalog.pg_database_size(d.datname) ELSE 0 END AS size FROM pg_catalog.pg_database d where datname not in ('template0', 'template1', 'postgres')"
+  #     metrics:
+  #       - name:
+  #           usage: "LABEL"
+  #           description: "Name of the database"
+  #       - size_bytes:
+  #           usage: "GAUGE"
+  #           description: "Size of the database in bytes"
+  ## Pod Security Context
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  ##
+  securityContext:
+    enabled: false
+    runAsUser: 1001
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
+  ## Configure extra options for liveness and readiness probes
+  livenessProbe:
+    enabled: true
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
+
+  readinessProbe:
+    enabled: true
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/values.schema.json b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/values.schema.json
new file mode 100644
index 00000000..ac2de6e9
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/values.schema.json
@@ -0,0 +1,103 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "type": "object",
+  "properties": {
+    "postgresqlUsername": {
+      "type": "string",
+      "title": "Admin user",
+      "form": true
+    },
+    "postgresqlPassword": {
+      "type": "string",
+      "title": "Password",
+      "form": true
+    },
+    "persistence": {
+      "type": "object",
+      "properties": {
+        "size": {
+          "type": "string",
+          "title": "Persistent Volume Size",
+          "form": true,
+          "render": "slider",
+          "sliderMin": 1,
+          "sliderMax": 100,
+          "sliderUnit": "Gi"
+        }
+      }
+    },
+    "resources": {
+      "type": "object",
+      "title": "Required Resources",
+      "description": "Configure resource requests",
+      "form": true,
+      "properties": {
+        "requests": {
+          "type": "object",
+          "properties": {
+            "memory": {
+              "type": "string",
+              "form": true,
+              "render": "slider",
+              "title": "Memory Request",
+              "sliderMin": 10,
+              "sliderMax": 2048,
+              "sliderUnit": "Mi"
+            },
+            "cpu": {
+              "type": "string",
+              "form": true,
+              "render": "slider",
+              "title": "CPU Request",
+              "sliderMin": 10,
+              "sliderMax": 2000,
+              "sliderUnit": "m"
+            }
+          }
+        }
+      }
+    },
+    "replication": {
+      "type": "object",
+      "form": true,
+      "title": "Replication Details",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "title": "Enable Replication",
+          "form": true
+        },
+        "slaveReplicas": {
+          "type": "integer",
+          "title": "Slave Replicas",
+          "form": true,
+          "hidden": {
+            "condition": false,
+            "value": "replication.enabled"
+          }
+        }
+      }
+    },
+    "volumePermissions": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "form": true,
+          "title": "Enable Init Containers",
+          "description": "Change the owner of the persist volume mountpoint to RunAsUser:fsGroup"
+        }
+      }
+    },
+    "metrics": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "title": "Configure metrics exporter",
+          "form": true
+        }
+      }
+    }
+  }
+}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/values.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/values.yaml
new file mode 100644
index 00000000..43f2415a
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/postgresql/values.yaml
@@ -0,0 +1,526 @@
+## Global Docker image parameters
+## Please, note that this will override the image parameters, including dependencies, configured to use the global value
+## Current available global Docker image parameters: imageRegistry and imagePullSecrets
+##
+global:
+  postgresql: {}
+#   imageRegistry: myRegistryName
+#   imagePullSecrets:
+#     - myRegistryKeySecretName
+#   storageClass: myStorageClass
+
+## Bitnami PostgreSQL image version
+## ref: https://hub.docker.com/r/bitnami/postgresql/tags/
+##
+image:
+  registry: docker.io
+  repository: bitnami/postgresql
+  tag: 11.7.0-debian-10-r9
+  ## Specify a imagePullPolicy
+  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+  ##
+  pullPolicy: IfNotPresent
+  ## Optionally specify an array of imagePullSecrets.
+  ## Secrets must be manually created in the namespace.
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  ##
+  # pullSecrets:
+  #   - myRegistryKeySecretName
+
+  ## Set to true if you would like to see extra information on logs
+  ## It turns BASH and NAMI debugging in minideb
+  ## ref:  https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging
+  debug: false
+
+## String to partially override postgresql.fullname template (will maintain the release name)
+##
+# nameOverride:
+
+## String to fully override postgresql.fullname template
+##
+fullnameOverride: postgresql
+
+##
+## Init containers parameters:
+## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup
+##
+volumePermissions:
+  enabled: false
+  image:
+    registry: docker.io
+    repository: bitnami/minideb
+    tag: buster
+    ## Specify a imagePullPolicy
+    ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+    ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+    ##
+    pullPolicy: Always
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  ## Init container Security Context
+  ## Note: the chown of the data folder is done to securityContext.runAsUser
+  ## and not the below volumePermissions.securityContext.runAsUser
+  ## When runAsUser is set to special value "auto", init container will try to chwon the
+  ## data folder to autodetermined user&group, using commands: `id -u`:`id -G | cut -d" " -f2`
+  ## "auto" is especially useful for OpenShift which has scc with dynamic userids (and 0 is not allowed).
+  ## You may want to use this volumePermissions.securityContext.runAsUser="auto" in combination with
+  ## pod securityContext.enabled=false and shmVolume.chmod.enabled=false
+  ##
+  securityContext:
+    runAsUser: 0
+
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName:
+
+
+## Pod Security Context
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+##
+securityContext:
+  enabled: true
+  fsGroup: 1001
+  runAsUser: 1001
+
+## Pod Service Account
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
+serviceAccount:
+  enabled: false
+  ## Name of an already existing service account. Setting this value disables the automatic service account creation.
+  # name:
+
+replication:
+  enabled: false
+  user: repl_user
+  password: repl_password
+  slaveReplicas: 1
+  ## Set synchronous commit mode: on, off, remote_apply, remote_write and local
+  ## ref: https://www.postgresql.org/docs/9.6/runtime-config-wal.html#GUC-WAL-LEVEL
+  synchronousCommit: "off"
+  ## From the number of `slaveReplicas` defined above, set the number of those that will have synchronous replication
+  ## NOTE: It cannot be > slaveReplicas
+  numSynchronousReplicas: 0
+  ## Replication Cluster application name. Useful for defining multiple replication policies
+  applicationName: my_application
+
+## PostgreSQL admin password (used when `postgresqlUsername` is not `postgres`)
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-user-on-first-run (see note!)
+# postgresqlPostgresPassword:
+
+## PostgreSQL user (has superuser privileges if username is `postgres`)
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
+postgresqlUsername: postgres
+
+## PostgreSQL password
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#setting-the-root-password-on-first-run
+##
+postgresqlPassword: postgres
+
+## PostgreSQL password using existing secret
+## existingSecret: secret
+
+## Mount PostgreSQL secret as a file instead of passing environment variable
+# usePasswordFile: false
+
+## Create a database
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-on-first-run
+##
+postgresqlDatabase: magma
+
+## PostgreSQL data dir
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+postgresqlDataDir: /bitnami/postgresql/data
+
+## An array to add extra environment variables
+## For example:
+## extraEnv:
+##   - name: FOO
+##     value: "bar"
+##
+# extraEnv:
+extraEnv: []
+
+## Name of a ConfigMap containing extra env vars
+##
+# extraEnvVarsCM:
+
+## Specify extra initdb args
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+# postgresqlInitdbArgs:
+
+## Specify a custom location for the PostgreSQL transaction log
+## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md
+##
+# postgresqlInitdbWalDir:
+
+## PostgreSQL configuration
+## Specify runtime configuration parameters as a dict, using camelCase, e.g.
+## {"sharedBuffers": "500MB"}
+## Alternatively, you can put your postgresql.conf under the files/ directory
+## ref: https://www.postgresql.org/docs/current/static/runtime-config.html
+##
+# postgresqlConfiguration:
+
+## PostgreSQL extended configuration
+## As above, but _appended_ to the main configuration
+## Alternatively, you can put your *.conf under the files/conf.d/ directory
+## https://github.com/bitnami/bitnami-docker-postgresql#allow-settings-to-be-loaded-from-files-other-than-the-default-postgresqlconf
+##
+# postgresqlExtendedConf:
+
+## PostgreSQL client authentication configuration
+## Specify content for pg_hba.conf
+## Default: do not create pg_hba.conf
+## Alternatively, you can put your pg_hba.conf under the files/ directory
+# pgHbaConfiguration: |-
+#   local all all trust
+#   host all all localhost trust
+#   host mydatabase mysuser 192.168.0.0/24 md5
+
+## ConfigMap with PostgreSQL configuration
+## NOTE: This will override postgresqlConfiguration and pgHbaConfiguration
+# configurationConfigMap:
+
+## ConfigMap with PostgreSQL extended configuration
+# extendedConfConfigMap:
+
+## initdb scripts
+## Specify dictionary of scripts to be run at first boot
+## Alternatively, you can put your scripts under the files/docker-entrypoint-initdb.d directory
+##
+# initdbScripts:
+#   my_init_script.sh: |
+#      #!/bin/sh
+#      echo "Do something."
+
+## ConfigMap with scripts to be run at first boot
+## NOTE: This will override initdbScripts
+# initdbScriptsConfigMap:
+
+## Secret with scripts to be run at first boot (in case it contains sensitive information)
+## NOTE: This can work along initdbScripts or initdbScriptsConfigMap
+# initdbScriptsSecret:
+
+## Specify the PostgreSQL username and password to execute the initdb scripts
+# initdbUser:
+# initdbPassword:
+
+## Optional duration in seconds the pod needs to terminate gracefully.
+## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods
+##
+# terminationGracePeriodSeconds: 30
+
+## LDAP configuration
+##
+ldap:
+  enabled: false
+  url: ""
+  server: ""
+  port: ""
+  prefix: ""
+  suffix: ""
+  baseDN: ""
+  bindDN: ""
+  bind_password:
+  search_attr: ""
+  search_filter: ""
+  scheme: ""
+  tls: false
+
+## PostgreSQL service configuration
+service:
+  ## PosgresSQL service type
+  type: ClusterIP
+  # clusterIP: None
+  port: 5432
+
+  ## Specify the nodePort value for the LoadBalancer and NodePort service types.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+  ##
+  # nodePort:
+
+  ## Provide any additional annotations which may be required.
+  ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
+  annotations: {}
+  ## Set the LoadBalancer service type to internal only.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
+  ##
+  # loadBalancerIP:
+
+  ## Load Balancer sources
+  ## https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service
+  ##
+  # loadBalancerSourceRanges:
+  # - 10.10.10.0/24
+
+## Start master and slave(s) pod(s) without limitations on shm memory.
+## By default docker and containerd (and possibly other container runtimes)
+## limit `/dev/shm` to `64M` (see e.g. the
+## [docker issue](https://github.com/docker-library/postgres/issues/416) and the
+## [containerd issue](https://github.com/containerd/containerd/issues/3654),
+## which could be not enough if PostgreSQL uses parallel workers heavily.
+##
+shmVolume:
+  ## Set `shmVolume.enabled` to `true` to mount a new tmpfs volume to remove
+  ## this limitation.
+  ##
+  enabled: true
+  ## Set to `true` to `chmod 777 /dev/shm` on a initContainer.
+  ## This option is ingored if `volumePermissions.enabled` is `false`
+  ##
+  chmod:
+    enabled: true
+
+## PostgreSQL data Persistent Volume Storage Class
+## If defined, storageClassName: <storageClass>
+## If set to "-", storageClassName: "", which disables dynamic provisioning
+## If undefined (the default) or set to null, no storageClassName spec is
+##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+##   GKE, AWS & OpenStack)
+##
+persistence:
+  enabled: false
+  ## A manually managed Persistent Volume and Claim
+  ## If defined, PVC must be created manually before volume will be bound
+  ## The value is evaluated as a template, so, for example, the name can depend on .Release or .Chart
+  ##
+  # existingClaim:
+
+  ## The path the volume will be mounted at, useful when using different
+  ## PostgreSQL images.
+  ##
+  mountPath: /bitnami/postgresql
+
+  ## The subdirectory of the volume to mount to, useful in dev environments
+  ## and one PV for multiple services.
+  ##
+  subPath: ""
+
+  # storageClass: "-"
+  accessModes:
+    - ReadWriteOnce
+  size: 8Gi
+  annotations: {}
+
+## updateStrategy for PostgreSQL StatefulSet and its slaves StatefulSets
+## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
+updateStrategy:
+  type: RollingUpdate
+
+##
+## PostgreSQL Master parameters
+##
+master:
+  ## Node, affinity, tolerations, and priorityclass settings for pod assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
+  ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption
+  nodeSelector: {}
+  affinity: {}
+  tolerations: []
+  labels: {}
+  annotations: {}
+  podLabels: {}
+  podAnnotations: {}
+  priorityClassName: ""
+  extraInitContainers: |
+    # - name: do-something
+    #   image: busybox
+    #   command: ['do', 'something']
+
+  ## Additional PostgreSQL Master Volume mounts
+  ##
+  extraVolumeMounts: []
+  ## Additional PostgreSQL Master Volumes
+  ##
+  extraVolumes: []
+  ## Add sidecars to the pod
+  ##
+  ## For example:
+  ## sidecars:
+  ##   - name: your-image-name
+  ##     image: your-image
+  ##     imagePullPolicy: Always
+  ##     ports:
+  ##       - name: portname
+  ##         containerPort: 1234
+  sidecars: []
+
+##
+## PostgreSQL Slave parameters
+##
+slave:
+  ## Node, affinity, tolerations, and priorityclass settings for pod assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
+  ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption
+  nodeSelector: {}
+  affinity: {}
+  tolerations: []
+  labels: {}
+  annotations: {}
+  podLabels: {}
+  podAnnotations: {}
+  priorityClassName: ""
+  extraInitContainers: |
+    # - name: do-something
+    #   image: busybox
+    #   command: ['do', 'something']
+  ## Additional PostgreSQL Slave Volume mounts
+  ##
+  extraVolumeMounts: []
+  ## Additional PostgreSQL Slave Volumes
+  ##
+  extraVolumes: []
+  ## Add sidecars to the pod
+  ##
+  ## For example:
+  ## sidecars:
+  ##   - name: your-image-name
+  ##     image: your-image
+  ##     imagePullPolicy: Always
+  ##     ports:
+  ##       - name: portname
+  ##         containerPort: 1234
+  sidecars: []
+
+## Configure resource requests and limits
+## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+##
+resources:
+  requests:
+    memory: 256Mi
+    cpu: 250m
+
+networkPolicy:
+  ## Enable creation of NetworkPolicy resources. Only Ingress traffic is filtered for now.
+  ##
+  enabled: false
+
+  ## The Policy model to apply. When set to false, only pods with the correct
+  ## client label will have network access to the port PostgreSQL is listening
+  ## on. When true, PostgreSQL will accept connections from any source
+  ## (with the correct destination port).
+  ##
+  allowExternal: true
+
+  ## if explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace
+  ## and that match other criteria, the ones that have the good label, can reach the DB.
+  ## But sometimes, we want the DB to be accessible to clients from other namespaces, in this case, we can use this
+  ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added.
+  ##
+  # explicitNamespacesSelector:
+    # matchLabels:
+      # role: frontend
+    # matchExpressions:
+      # - {key: role, operator: In, values: [frontend]}
+
+## Configure extra options for liveness and readiness probes
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
+livenessProbe:
+  enabled: true
+  initialDelaySeconds: 30
+  periodSeconds: 10
+  timeoutSeconds: 5
+  failureThreshold: 6
+  successThreshold: 1
+
+readinessProbe:
+  enabled: true
+  initialDelaySeconds: 5
+  periodSeconds: 10
+  timeoutSeconds: 5
+  failureThreshold: 6
+  successThreshold: 1
+
+## Configure metrics exporter
+##
+metrics:
+  enabled: false
+  # resources: {}
+  service:
+    type: ClusterIP
+    annotations:
+      prometheus.io/scrape: "true"
+      prometheus.io/port: "9187"
+    loadBalancerIP:
+  serviceMonitor:
+    enabled: false
+    additionalLabels: {}
+    # namespace: monitoring
+    # interval: 30s
+    # scrapeTimeout: 10s
+  ## Custom PrometheusRule to be defined
+  ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
+  ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
+  prometheusRule:
+    enabled: true
+    additionalLabels: {}
+    namespace: ""
+    rules: []
+      ## These are just examples rules, please adapt them to your needs.
+      ## Make sure to constraint the rules to the current postgresql service.
+      # - alert: HugeReplicationLag
+      #   expr: pg_replication_lag{service="{{ template "postgresql.fullname" . }}-metrics"} / 3600 > 1
+      #   for: 1m
+      #   labels:
+      #     severity: critical
+      #   annotations:
+      #     description: replication for {{ template "postgresql.fullname" . }} PostgreSQL is lagging by {{ "{{ $value }}" }} hour(s).
+      #     summary: PostgreSQL replication is lagging by {{ "{{ $value }}" }} hour(s).
+  image:
+    registry: docker.io
+    repository: bitnami/postgres-exporter
+    tag: 0.8.0-debian-10-r28
+    pullPolicy: IfNotPresent
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+  ## Define additional custom metrics
+  ## ref: https://github.com/wrouesnel/postgres_exporter#adding-new-metrics-via-a-config-file
+  # customMetrics:
+  #   pg_database:
+  #     query: "SELECT d.datname AS name, CASE WHEN pg_catalog.has_database_privilege(d.datname, 'CONNECT') THEN pg_catalog.pg_database_size(d.datname) ELSE 0 END AS size FROM pg_catalog.pg_database d where datname not in ('template0', 'template1', 'postgres')"
+  #     metrics:
+  #       - name:
+  #           usage: "LABEL"
+  #           description: "Name of the database"
+  #       - size_bytes:
+  #           usage: "GAUGE"
+  #           description: "Size of the database in bytes"
+  ## Pod Security Context
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  ##
+  securityContext:
+    enabled: false
+    runAsUser: 1001
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
+  ## Configure extra options for liveness and readiness probes
+  livenessProbe:
+    enabled: true
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
+
+  readinessProbe:
+    enabled: true
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.helmignore b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.helmignore
new file mode 100644
index 00000000..50af0317
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/admin_operator.key.pem b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/admin_operator.key.pem
new file mode 100644
index 00000000..8fd5ffcc
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/admin_operator.key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAruWop4qVKPD/+3vfIfkCy7pAEhzmKQJVhXF2nTKmzBB+4n5D
+yZeZ7yODZOfM0xnHN31I+z7x0Lie+BBqUMnAGPV3vqeNlvG22NJzdy45xnKy5uWr
+JtCI6ENNicmYQ74zoA33A+ErKl3zRN0vSp3snt/U/xq7DG2Xan6150qpYGSQK+R/
+LY8pFd29mR8M0riHuFOlOkmbKjlFJ1nOirxTcYLazMdLzjBu1N3PgfiPUimQlevy
+PECnboZvYWi0JzIHTVD44c56y1YmHBtrhswNr9mtN8Tcvu3bBrO/DmAE3x0fp2zj
+jD+F86WfJL4r5nGH4RR6kAgzgjURFuZs8hUn/wIDAQABAoIBAFQHVRuB0p5EA8jQ
+v+izmatGBchuCArF607cr69hCZBbkIrDPVBavQOPHW7ai6cU6Ij5cZn8qPOt7/qg
+8GN2OwwCy5BXMgjGgyHzIrStCecVbmzPBYb1hAGLbHJ53+UUOft5GifMBBAr6Vg5
+qKIB9BB03AHg1uNmt+vbiwvf7Da57mhDoaJsbPEwb7BPTU5TkTRe4p925vWsIVya
+h0az/Mct/5P1Ri73G6T3MAOb11KVo1mGgn98DtFBF86HzFxTcZVV+HC7pBnokuBw
+3BEGQqjLDEXsH5Px0PCC5qKF2ZcX/xhMH5ev/M2uXbto+B2nDKQkxlSavOI31EU2
+upXcg6ECgYEA4Zniwwqv7+hjAuER0CSiADJbS8ReWwUqmHSJ9VhFAdTud14hFaBI
+0xkvDOQJNB6Xg1ZLJcMwR+TnAp4a8pT7iFYhQ4cTfgvYJxum8aclbAnCWQgS0bjY
+bz1Qm119T/1ynsMpj2g71Veizm4OG92XisblUrqLNX4/Yhq5UZnWFU8CgYEAxna8
+v/LrMkUejoQwN4UxhI5mij1kfq/RLSsLVLpF7E5mbfgxAOY1gh85SP0cI4NnE0ep
+e1Lz2XlQY6sJsqzj3jjwpr0MybnFY+6DcrILkGVRsBmcOazTWtcjECJQ7bzIM7t6
+vOKodJHOWMr924pArjyF+9iBCYUvhuTd1FqadlECgYAx8Cl0+Smm1m8MVRvnUiSW
+HI9+/xHP3h3mr21WZNqppCPBQpHaQqe8Ksfyd4veAKOTTAfIbSOD1pSYTL00U2w2
+arJkS0MyVJbdWU6kEVbESoi9wn6/88XdIdp0+cXibfzwTc0mVHFiMUr1nQD8hBmm
+e46JuIdWKQMIyVeaS45LGwKBgQCWCrC6gaG0+LKYVnHJl8YPDEWTn8R5TtzaxB8l
+6Eny1Hb2DtylbGXpwUdi2hDK/I4R8my8ksNOmDvhji6fybvghrXRqT2gyPTljy4L
+qXW6rg7rDwGgTPvhQqL8kKUUh1PoYIXzhXyL3KvfT2BK+SPbVmCJPW6YzvtWhXL8
+F5+NcQKBgGNWYSsBIscQ/tLK5iQUSDDlt+o8q0KowKy2965TPn7skR36MZDtbzH9
+IEk/R6I6xae23Hl3cT7TjzHel0v/hchjordiwJBQqIJX8TwY47lIGw53UHd82dRJ
+SGxpnTRTRzYXRDDpedqhVF2KluCvm+CFbqCOog1KbQBJyKZmwBsO
+-----END RSA PRIVATE KEY-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/admin_operator.pem b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/admin_operator.pem
new file mode 100644
index 00000000..456fbf3a
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/admin_operator.pem
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC2TCCAcECFFpPjiKSGkzqXqVKntjFSdnikqbIMA0GCSqGSIb3DQEBCwUAMCwx
+CzAJBgNVBAYTAlVTMR0wGwYDVQQDDBRjZXJ0aWZpZXIubWFnbWEudGVzdDAeFw0y
+MTAzMTMxMDE5MDRaFw0zMTAzMTExMDE5MDRaMCYxCzAJBgNVBAYTAlVTMRcwFQYD
+VQQDDA5hZG1pbl9vcGVyYXRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAK7lqKeKlSjw//t73yH5Asu6QBIc5ikCVYVxdp0ypswQfuJ+Q8mXme8jg2Tn
+zNMZxzd9SPs+8dC4nvgQalDJwBj1d76njZbxttjSc3cuOcZysublqybQiOhDTYnJ
+mEO+M6AN9wPhKypd80TdL0qd7J7f1P8auwxtl2p+tedKqWBkkCvkfy2PKRXdvZkf
+DNK4h7hTpTpJmyo5RSdZzoq8U3GC2szHS84wbtTdz4H4j1IpkJXr8jxAp26Gb2Fo
+tCcyB01Q+OHOestWJhwba4bMDa/ZrTfE3L7t2wazvw5gBN8dH6ds44w/hfOlnyS+
+K+Zxh+EUepAIM4I1ERbmbPIVJ/8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAinVM
+f0/+vEZKeNn42CilS0ffAWNXrY0MFG9Vmo79cE0E3292UuV+RD9NsXYFYtmV/PNt
+UAdVUzvXBxu1tUkFCb4e/Q+C9jRa/PQBUTjHiWuRlJLkyn80j7WjD1IGhQzaUB41
+C1Is/WCI60kbrw4pU/JI2LUHUdtGnW9tmfvaqhsIC1pfP/AlaR2w6JyF0sa//TUI
+7P8Kv5/h0FfQyWM/5HASlo3choe3cbYAqsVFgp2raaH+iwdoAPxLGu5n6YYPLWKl
+b6CN4Kn/i9CcJMdGS0OqatiQvXAHqKHMuKAA+n+4hiIsYnDMvXLnmPrcuqAsW5So
+noLfo+fxMtrtJ1327g==
+-----END CERTIFICATE-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/admin_operator.pfx b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/admin_operator.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..8deb59cbf35832292ee678ddf0018e48852ade19
GIT binary patch
literal 2333
zcmV+&3F7uJf(aP{0Ru3C2;T+?Duzgg_YDCD0ic2i&;)`A%rJro$S{Hfe+CIEhDe6@
z4FLxRpn?N%FoFYY0s#Opf&*m+2`Yw2hW8Bt2LUh~1_~;MNQU<f0So~KFb)I=ix@0z
z92>rF0s;sCfPw=!9wf3_t?wI<Ec>&V8w%VWkFSnxED~e+th$L;>H>2j0EKwF@7>{Q
zC?}c9Rj{wv>MCg*8KJLc9A-8jkIbJceQdf2Cc??N6s)C(ONGFlFl1#_zw_3SNSW{6
zDuZMfU#?x;Iu+T?q?}h(^Sfp5TJ*^FM?p&ABLG{UJArhO;24_Z4;zm$u&k))l*pk0
zkR6ZX5o_(^b4?m(emE(se>g7%!Q$zjp8NfHkb#@ou^b_TdXhN9f%xpOt4A)`JIEvq
ztPZ%~Y@VeC{BPMzfzg7b4cxL6zzD5~-5r1_fj3a%#L{~6Z0)yU2c>zQkdm+H9c^~#
zkJ$OxuL$1zz6g=S2NjTZWf(7>YF+-U`d4j_kD_=TJaTKJ<4}!n@BT%1ciumHX1F1g
zbOzVReNDjB4cIqhKzb$n>M(fYBG3jvJwY$@69X3r%j5=jtnk8et+9ZnNW5g<DsIdU
zlm8dbZUAedvy@_AIT(SBVs6DdCk*#ni4P-<6YYa+As|582Ed>dOuNrHsy}9=S8A*2
zBpMVMusYyz==s@pCcXnGc;IxHRhma&b)Gy=e!yGpK!Q2If;mAaw^FG)=!A`5je}rA
zxrd5#di6Vj+|yt2qv7G^D^ij6W!X0kFI|xQS^czg=o`>^hqHs^r!aGLe6=^Jp8`1o
zzr*{|H0BB^P2OI(z~mh&x0b$@P!~XfcFJNj3{$oYd!Ng+16W2QB}PA_XaDx;)q_<M
zZ_w<3VhL~Nu*c#$U#tP|kMkdH0?aX-CYw3yk0=qXyqxta{JqZLR-=VPXSLgU`zu&@
zKLpUxPA%^B8>-488;%-e$$(8pF(~gk*X=Z11IWq@D*W6X=E-Sbhp4ugQeo<Q7qcrc
zbvl*b_Q)Ym^-I;^S|Etf^9lm?fbs{ht`Q&5y(&_t&lGDq2-A}2OO<B;^OtX@YysSq
z<3>Of_2?;Q2R<`pofuLaMrbs2i#;`$j-$OO`ojgntBBuY&`z$|wqS!ELCb8!y!yW*
zP;9b?N>;BaR=sPD)23vNkG~qkc~ME{ivwV23+!O|_?v)XO3}K7RG(-%AY4QwE@2@r
z_z@pRFoFd^1_>&LNQU<f0S5t~f(0@Jf(0%xf(0rtf(0f93o3?4hW8Bt3<?1Ppn?SM
zFoFc?FdPO7Duzgg_YDCI0Ru1&1PBwfI&w`hWUm4O2ml0v1jxgGDxq=d=bj8GF;R0l
zST1D*0OA#ii0@wSK(UIK(Du>9IK^<IuB~bM?mo5VRO4A#?7uXY<p6A273;IwrCpx;
zmlom>5M@wMIeMVYPuV2xVEl?NZSTtk4&K<cP4zTeq#f%QeffRvBBmiMO>@*}g<b?3
z`+q!Nb=If50xz3^di;oHq<I`P&aDRN|2|QcXA%{wm(LNzBplq$9JKXG&FG3e*cy0r
z?|+oV2Sc{jM;*3z3<9Q!z$!Xo{yoNBb~i~RtC1w3H!i^Nfv7yT<qwBuNb|W{iNwrb
zt?_I#A|H@C<`eGk9|3xgwsoKAQT=q+Y4}w#5EUxtqsU=dxu$ijeYXqB;%H)hWp@$A
zC9*)=di7ax8Xm0OMX=S)CHU##E5sj*J#+)~aiU}1;HbpGt|LfJ<L*Xt&NP)q8uNZ4
zrOYRe8?VXk-jgX#$-67<XJYQxWcY{BiREJvBRsPWc9$3eo3~wmrgSZ#um9<FKX8IL
zAQihft->`Y;>I^+tef^HifMW0<`;9{)P%U^YM4A?Z^y2-N$EgWgHZf$@CjRL=456O
zy?F^O6%hGNrl+6yPm@KyoK3xF2N{>(ZDO9$$Oh<q*`Xu-+{+}9t`Umt?AiLTYgSob
zrG+qtGxP=gJaSN`fi4<WgWw0-aMm9#%vVMF3<&n&Ot`VhQXvb5y6ml#K1@Rq`L4Ps
zD;<L(?+UTRQeKM<SiXa<+gcyoK7M)P3A3@#Ajr0F+YROTd?%5}e<8~?c|eLMWjaw!
z+0;%rQ!@Yy(aPOHx=i(|5~<YUGEM4BLW|Mrg$Zt-`dJbd+m8DM(C<*wKQ^&obD6B;
zMXfP-Y1D}GAQoU!RaB^;39qh;<ee55G^HG|qi~NH)d1y(&5!F0HH`57fROC~OVuCW
zN5-f}p&WT40=@zdKu50}9;v^$vVr3g20@w`qel>sK=f^pbaeR&7sqdmmRk#$29qqQ
zzPO6kon1_})9r-7)FjlIy)r3Q`yyX*G9I+&N?8(8LH+E0a#^O2syM!U-#=p)9e8!|
z=>5R75~}6D%BN2Q7nWZ$DrK22?14bK=aZ8y1J6VD!zNFh*zzSz#`K9XGI&GdiM1>L
zS|p$WCMt<0jlLlxn|kirlK}!$l?Pf%%=KB@kC}K?4)ri=I<02eX92Wey?z1ViMdvn
zYrk{t-9w;N1Hv5tyMRYZ01&c^*dp`Q0x2Tm5_!DiFV>Q!MX&5fuPw*)X)Tx|HeN88
zxTg()yIJ+Qc8kZ=OM#PZ{QgSU&J&6p3nzTnlx2`JM6Li>hu4+h<Zw&Zzw*(ggUQoa
zq+CX)|8+-`6fdw!&rys4y`BfexWwU+$sMPB+ugUG%}sh4NG(TLjw}ufJG$aFD2)?V
z&X^I+)(8dyx2X12H(`ZA3OEZxDbD$*(W@9i+N50G`c#IN&zByqsJ5pT%AWuI6jIaO
zw&s#S-l7v>?iHErkQkF^C%Ar_|M`|dNto2~1U-3{4NnTne7?d(YWOw35n6vu`uhx0
zFC3%bY=Ip69_QjsFc^HK9kIUE1UxT!y%qfjd@{DhBIa0xRpG$A6JIS?mr#oGH4ezy
z8j^E^YaJEVKsaDLRjM&1Fe3&DDuzgg_YDCF6)_eB6!B_3oWJDNP4-II?e1|K12&#a
zlrS+cAutIB1uG5%0vZJX1Qadsa(A{zY;wC!s}+fHI9%h#Cou#FsCcR??CEG@0s;sC
DZDvVW

literal 0
HcmV?d00001

diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/bootstrapper.key b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/bootstrapper.key
new file mode 100644
index 00000000..fe764a47
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/bootstrapper.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpgIBAAKCAQEA0OcE4XQKXoJ0EyatSNRJioF7KD0H3WRn5C9LpCZAlnPqeLdN
+8v4LfkU6X8f7+g9aVbd2EOOqSYTjOXvT/S0FrKWm1rc3rfJI/E5wyJeLrkVSPVhw
+91hhqYxJbH92Rzglms2Vk8VdDapWt8eq6do/6tg1e0KUUvmsLn3GfKrIWsnGjYHR
+GjyaUVf8QnFXyIjDwZKf9yGp9WaBWS0IqbH9nSznQBTI//gkA5GdYmhtN8SLD3gP
++rqu4rhH18r6qLplJ7sym1aS9SYgVMj6Iz6n9JbvEVw/FqzLuYgjdsG7jangeRpi
+jdwmelvZOCJZH5ieri2m1EcSIjE2fbUz4LZoTwIDAQABAoIBAQCGmPLqGIw9zKvh
+UwA/dphTp42kpX4VxYWy3k5MW2EuD025rdGJiOn617v+zqmpuo6nv+dQhn/Hktmc
+xg4WiBWp4amXmsFDUGJ6Pkgo1ovnIz8Ty5ItrEJwrbT5NT8OMDz6ew+vAHEuRtxM
+2VdkCX05YUlEO+e5dqjb46op1Rf2dfRBypxfQ0gBwavQWw58wjRICPXMf6u/3swK
+C26sMP84KFUPL2Lto1wNPrGzYRLWH/l2FBu431LfK51186/u6Fm3nMlT7KZqvJaW
+KIVVQpnD0DzzmkWs3M6Yo1w+Vy7kbtWlWRvMcfenDVRmErHS8CapSh87jjFh4CVy
+MjpNdWvBAoGBAP0fxoaELIty04aEZ+S65UeJurjdF3WVYcACoiRnwQ+lHFj/O+aF
+8I9Kujb6rVdIUN5OyPzMUO2BgRnvX1ZjD0gPQrtRAzqK2tk/QZBW15caVeWwutmJ
+Dkh+bnrupnN2HUoXk0Eh/MHxkMbJJbfqsb63aovbozJ5gwyiZDkxFhiRAoGBANNG
+n1qUg0bFuSimYy7i57UlB5SFIhPh2iwF2jLLhBjZVHYzJJsmXSBXJNaQKevOFyZR
+5fR2TzPjLtVV8NNviP1Nr2ZSpMOkcMj9QnjoZnD0YkeFLjxSDqAzjwA/VZvOka32
+o62zbM8GKYTNZj24qrlZM77etS7MxJM19FPL1+LfAoGBALJB02Rd5qTZ258K1cOd
+3uPPWcDgaqny5mD7Ocabjrl+1ITUUhHY132B6bvYM4SZN+Im56IoHQH1xr5F9gT3
+RAbCQIN73OM4cEC4LGsCzVbrQ/y6xgt2Wqmw6AsI0A3V63CHQ7uFvOO0Q/nKJBbu
+X/hoYM9XgQmFy0V1g1FHgUERAoGBAJZl9rhnclAmHpnmYEKXOjTESHIcl9apd0LR
+Y7O3FrENvMdrvspHdBG6lzm6ZG09R1N7B4SP1+/q8ILja81H36/Z5lujxzCSVctu
+Jiyl247bGT8qenBsRYcbTNfzPgDs+t1o7rmPOYziKRolkXusgrPw4Roltbq7/89/
+oA8q0+LnAoGBAPsdYH3743kKrrhDpUVZkwMWdEXt4rCSzEhM/tBTbIr7wObfYiMh
+28YpZAsG+65L4RJnSQYj9KZkGE0q/EbAqDwrlJ1ulOkvB02rHuuWZNjy+9HSGT8M
+Sk21b72hB2OLAWJWgU0Js+A7HYXmgR6RNFw7ePckitJmJ1C90RoroWLe
+-----END RSA PRIVATE KEY-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/certifier.key b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/certifier.key
new file mode 100644
index 00000000..4732c7ae
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/certifier.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAzQyarOknGLpYAheUHpVtZopgzHrnfxKIiQrugy7IB/ydeeR/
+q0AINPmyt1kHFxVyjUirTagIVK8OgpJbYIMkOwBw93RONtHusqY5ZayaVhW44Uux
+goQ2fAT2yKOZNjdb3+OUpSPMaSDK1mRx8BoTFg4/2ARhX6SbqU/TCYruDVFK9InH
+urDSeT8p0Kk3HCnV28fnJemfAbIC0cfYjHUEpx8bDVnVH8dWA95GJJfwyaMOajeU
+IEXyxS0l1T/DW3cbGqL9qDw7DHqcnVpUusgD6zsosDXaH4WVJTda+Wg4BPlY0vVE
+cwYjcK+cUeHbJIvpcFy7PdUZ+rLH2IBjxWjEeQIDAQABAoIBACI4HUQH8N9ekbtf
+pfdopoY7R6Y4SJPbSu/b5Cv+TaGPldQ2vtucZwI4PYv9joJasPBFFVlzVliTkk9W
+D2vO1ugFzdRuE3Nwm24y8Vc3c9Yz79OhZzFJ0THnPiwDqVjz6iA2AaOBkuZkc5VN
+0/nm0BKZNCxfpsRoWxXpXWW1Sr7r6oKul1bPQfgV5ifDPLBBtBSf64DPSDNHn35m
+QWlYRr95wNTWAvdvuB44UJyH1Mu8Z1BhBbZsrypCLYeENgNwSMCmZSHS3TTnoNOf
+DlQNoMPzThkB0p2TU7A9gmhweq7ah8JPHvbqDKsXR922N+9OblFW1Bzi7tqr1Cla
+GLJgpFUCgYEA83PneiALrqoCuzzOfqaEjuTsGgZ6TyCOnoCJuvwbmWwigt8/vyCk
+ObBzHJJ/G7m3n/Kasy8tyEus+JQBsHQ5SbV2Rn352DUVkfQO3HECdxPkMTv2HyD5
+wjgAlISlYBIzUp02qC0WEjkhU2nsP8kuUlF97c3JmkMDbC5MsT7hZ38CgYEA154B
+02NMJwgYH1SBpaz+VQYqp92SuewkwTfmIkEr4/fqHottrRmwE6SzQlyyHZwlIMkD
+g+mqR9n5tbM9VfjQIRjLfSJxCPz3aRoSScy70TLnyIQk3khNZFD4E6EknF7KdQt5
+h9aXY4MROS1JzzDNsbdQtnV5ZlqUia2o/NS5EAcCgYAOsCV9FsXdqeA0T7zdo0pI
+HMOp5k4my/4Ozg6BO4imvwFuB+4ep+eAm4a2aJhGofPUMJzoxqXqebZb4QIhFUIH
+km0qX5tdUgaVIbZr0l2ltYuE9OsqgaDP+PUAAOjBXRe/mkCb8Oxt+Qhrse5RAuBK
+kyQX3tyU9AoW0sxJvVN4HQKBgHka7JeYrEs4BqSCSJePxQJohkjm8OSwuCw2g3I1
+/Lr8omkpkx6o0PcXiP/7JKfw7gGuJeVPty7IRbNCy26gY/ZTAOh2Edskiqpj1GXT
+MqLb3sgHQNYA8kcoG06bMf8KVtjK6yXa6AkisufUgiJ3nPD2r8Tr0pYkxk1WVxY7
+PP69AoGAAT00oRmQMgz+zJrPGpdCMVSNEAx57OWRAb5pDbU3ihy2G/EOEnlVJmFJ
+RTOoJ3AFqwRiOOBarsfBwc4D17xs7ojj8gsXa/0vIRXr+wghVnmewTNft4m0Yzsi
+x+WfPUOLiO2EIvDDGxYcFy/VdNAHYuRU8I2sVSt49p8ZUqwPlzE=
+-----END RSA PRIVATE KEY-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/certifier.pem b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/certifier.pem
new file mode 100644
index 00000000..1cca5be7
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/certifier.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDOTCCAiGgAwIBAgIUGEBesQkIThAcN9is3I0bqw+RD60wDQYJKoZIhvcNAQEL
+BQAwLDELMAkGA1UEBhMCVVMxHTAbBgNVBAMMFGNlcnRpZmllci5tYWdtYS50ZXN0
+MB4XDTIxMDMxMzEwMTc0OFoXDTMxMDMxMTEwMTc0OFowLDELMAkGA1UEBhMCVVMx
+HTAbBgNVBAMMFGNlcnRpZmllci5tYWdtYS50ZXN0MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAzQyarOknGLpYAheUHpVtZopgzHrnfxKIiQrugy7IB/yd
+eeR/q0AINPmyt1kHFxVyjUirTagIVK8OgpJbYIMkOwBw93RONtHusqY5ZayaVhW4
+4UuxgoQ2fAT2yKOZNjdb3+OUpSPMaSDK1mRx8BoTFg4/2ARhX6SbqU/TCYruDVFK
+9InHurDSeT8p0Kk3HCnV28fnJemfAbIC0cfYjHUEpx8bDVnVH8dWA95GJJfwyaMO
+ajeUIEXyxS0l1T/DW3cbGqL9qDw7DHqcnVpUusgD6zsosDXaH4WVJTda+Wg4BPlY
+0vVEcwYjcK+cUeHbJIvpcFy7PdUZ+rLH2IBjxWjEeQIDAQABo1MwUTAdBgNVHQ4E
+FgQUa7lHwng46+SoaY7nsE9AfAwLBLUwHwYDVR0jBBgwFoAUa7lHwng46+SoaY7n
+sE9AfAwLBLUwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEADELJ
+AFMqYaONndO5rlTrjd5KZ7L5VKhRPDi5ZuajzOVqIs2JRs+memEUN0YZG5281YQm
+UWXlF6tVp07P2VbnAUCQ88QvM4B1IMpjZ++6XhfX2PIzY0NX8sdQLWI6593iEXNs
+KhT4ttBTMW3Rv4dAnWcsa3NZCfji0qmq68rGZQdMY6An3Ah7pmMfYFfcmvsbemsR
++Xn32h7CDwL9Tsa34AUdjkq/x6MHKdcNTI6v7sWwSQ/M5IEIoqMmLWDjxGTzaDXC
+dd3nZwe89xBqIveXv9n84dja1/7bAzotIDA17Dr7Qt4qpVFKqrggtLNoPZMUrPFw
+Ke0esceFfcqOPBG9HA==
+-----END CERTIFICATE-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/controller.crt b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/controller.crt
new file mode 100644
index 00000000..4acdbd78
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/controller.crt
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC1DCCAbwCFCrTQmqWA2/pgQa9h4PgTufmG2MAMA0GCSqGSIb3DQEBCwUAMCkx
+CzAJBgNVBAYTAlVTMRowGAYDVQQDDBFyb290Y2EubWFnbWEudGVzdDAeFw0yMTAz
+MTMxMDIwNTVaFw0zMTAzMTExMDIwNTVaMCQxCzAJBgNVBAYTAlVTMRUwEwYDVQQD
+DAwqLm1hZ21hLnRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDg
+13Plcft3l+LSaThoJD5/LEWYlghOP7svEKnn0YfDe7O+ihscDMSmnhIFs7WxDj4o
+Y2FWeZWfRDU939QjpS2ELVWpUdVRObpzJtJxfFfzTknvMXRib5XQ6TjHcPg4f1wG
+/KsWumVpY4M0JRFKnKd9Mt7c6V0ZBadXTl1XPEcxq+4Rw80bJYUF61hYmYfcJNpV
+1/CWDAARq+19Zw4RnOsuLUuxNFdmR1iFqFDURiXrg4Hyt4MQX5Kijr8tz11eyk0C
+nj7KsOkv3JgW7etAyHcbaX5qynh8qRbgrson1uG4SOz7yN6kJMbGWGHO0L3IP+zU
+kK3WoRNRyzyHJgOtccNtAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACLwxwfv2Zm9
+3AcjNESqw8sKH21kDckP1tnSsNoDXJ5Q5qmgWCcryCrfQdCree2LBM8pfEwSItcb
+014UDkhAcKNQgLQZwp/fHnwXEf2rN7ubhAgWz28W3TyE2pzXcOgTJD3RaNTJsQ3N
+xBaMdfbzzxN3c6JGVB5OKsGNdM7BFBUquLo0mTMSMKxR62T40oHR9aFbRlm95dr5
+8NBUrnfSJKudVcu2/fCCR3eO12mnM+mMRCdPFz5XuhSydlrk8Ylf7VIRY0l0Jx65
+fKUVyhWX8FqE3BA8XUGm4TYXdkvA9z0yguNmEW0t25Xn0tdEYSlMKIjO9ELM1Yt/
+CrzTPfou8rg=
+-----END CERTIFICATE-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/controller.csr b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/controller.csr
new file mode 100644
index 00000000..a26711a8
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/controller.csr
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICaTCCAVECAQAwJDELMAkGA1UEBhMCVVMxFTATBgNVBAMMDCoubWFnbWEudGVz
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAODXc+Vx+3eX4tJpOGgk
+Pn8sRZiWCE4/uy8QqefRh8N7s76KGxwMxKaeEgWztbEOPihjYVZ5lZ9ENT3f1COl
+LYQtValR1VE5unMm0nF8V/NOSe8xdGJvldDpOMdw+Dh/XAb8qxa6ZWljgzQlEUqc
+p30y3tzpXRkFp1dOXVc8RzGr7hHDzRslhQXrWFiZh9wk2lXX8JYMABGr7X1nDhGc
+6y4tS7E0V2ZHWIWoUNRGJeuDgfK3gxBfkqKOvy3PXV7KTQKePsqw6S/cmBbt60DI
+dxtpfmrKeHypFuCuyifW4bhI7PvI3qQkxsZYYc7Qvcg/7NSQrdahE1HLPIcmA61x
+w20CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQBR9zglGb+/XRH60RsoUnMKWF3D
+3p7vQXUgdy7VKMoQnNrbthEE+7EYBzWX3hYKVf6la+tRSlb749NxSzH8uK2Ohmdk
+scKjyKf4h74I0zMfmbDgIc2Y9EucbQwSVEm0C6S3GoJSV0OUhXq1Zw62Ec7eiEld
+LR57kfGRPaquVeUMNzIgob5EmzN+hpAH8lrXJ9cPC4KbiIZtlmFt5jQ/cBnx3OyC
+0QdIa6oQ7tIN7vcV9x+D7fgkvq+pOGhPCXbDzwc+PxVd+Cc3Y8nrfhls3bmZsina
+MzjvaAWQQ2DRasqxf2ZZUeoC6U7zgLP8+i0GkL/Klw2BYE7MfmFwo8LyNfdA
+-----END CERTIFICATE REQUEST-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/controller.key b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/controller.key
new file mode 100644
index 00000000..965e5ffd
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/controller.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA4Ndz5XH7d5fi0mk4aCQ+fyxFmJYITj+7LxCp59GHw3uzvoob
+HAzEpp4SBbO1sQ4+KGNhVnmVn0Q1Pd/UI6UthC1VqVHVUTm6cybScXxX805J7zF0
+Ym+V0Ok4x3D4OH9cBvyrFrplaWODNCURSpynfTLe3OldGQWnV05dVzxHMavuEcPN
+GyWFBetYWJmH3CTaVdfwlgwAEavtfWcOEZzrLi1LsTRXZkdYhahQ1EYl64OB8reD
+EF+Soo6/Lc9dXspNAp4+yrDpL9yYFu3rQMh3G2l+asp4fKkW4K7KJ9bhuEjs+8je
+pCTGxlhhztC9yD/s1JCt1qETUcs8hyYDrXHDbQIDAQABAoIBAHo7JrpZmMePPrP8
+l7ml2oPwYXVuOt2vL+eKO5PXCONw4Gp5UfuRxWZ/EHUhGWlDwO7b+BK2zmxi/D7C
+6+Tk6zWsH6GI51rc80uek1E2s+mFahQq4oaQ+vUzlLZ357lvI2x499nHQ1Jj0vQK
+IrhZKYSanyWhiAcOV8bSx1OhZWLOfA1XrA9Olc31XpVgnhCo5V9Upg71SHSb6IGU
+KmybTbRJYvv4OOEtBC5geZ8GnfnWYOA8Hw2zll4N5fXTJAqz0x8PYpEAoJ8KvqF0
+t3JwtV6TFgOX+WNCiE5NGxDZAU+mJTZxBcTQpI9cmbAjr+hLyTEtSMUILKs+WIqM
+6GxC9gECgYEA9qv2kE4gWuGOuZNUA4TtBeD97cUJMD54dt6QSGc1m8/4sY6mGfF0
+jN8+Sw4fe5Xk98cMGh5yI0hdDvNl9VC6dlsO1pHGlvPm8otocMk1bDz6tsCpPIek
+SbyuC3s0B+3go7fcelzgnA4LVnUeRsB0dAfPmEL+aRDVpACXXc5Uv2ECgYEA6Vgm
+yScTq8pvjpHFy0Pwpsjghnva1jEneFzuFNe+wO2pGKx90pXrgN6DQe72UKhru+6W
+O4yYTWWaP+ibDuobdzZUY6ZPn4W28xaFCnBjTeYpMVPcyzW+u5o00II98+lzuBaN
+qI4KA1gYUzLbiUCtI5MUw+8y5/c+oRzkra5JO40CgYAL5rwctkhFWkCin4McMFun
+PvXBdRI+a6UwRwi7FY+2ltAu8Oz+r3GqIlNFF8dZFSBY/BePYwyquyESSZgPv/df
+IoGSxLHKMrZf2W4Okwaq1D5cduszam/4xsu27hjSkR2XiJVwqe6EWQEfCMOPMlXs
+Czxu4jyYISHNqeGjuwLHwQKBgQC5e/AAz8YsNZOt0aRXql7eRSls3YEb6CDG5Z//
+A2xHMePLkDnILpHwc3AE9i3n+akBz2quVVkvlMcjbAPtvBwvDAnS2H3MgV7nJoyE
+usfFQWKXKmGFSuidebvnzs/uVjE9MPhT9uxwshNL905ZcQbwE1dbVIWzrG6lZTFF
++heOdQKBgBOWDLDMswyWtwl/1gG1CzvKDB9t7947yP2I++yJsPoWhlojoPsgjLK4
+YrrEU66xXd3b0s5s0UQtLN45nkd8kBOv/mYwrasWcb8mp4BsMVPLGwZ2puYHcDS1
+o0DYVYQTBmDF1ecqadXjJRKWkwnT4j3X2w4KbwXfUNmBRTf6Uy4s
+-----END RSA PRIVATE KEY-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/nms_controller.key b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/nms_controller.key
new file mode 100644
index 00000000..e5b73ed7
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/nms_controller.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAvbwuwp+L8hx/caM9hvIXbO5zSpZNA9xWqH7w2UQlgPfcWiya
+pexSgiJcmi7GFZU0j182EEHKe5pyrPLq4BdbVp2UtohX1NFrDPqGFlX1e6A3YDd2
+KHrhi0VARhUbLKcrYiu27uY1NrH7SZOeLghUDSNZYq90r+NG1brI4P9YlZiWofcO
+48yw0WEuKXGCqmByDKTIRog8WXf/CzB1MFbdPtqrVa4ePy9cMeax7DP2TCQNFVBs
+bIYJxrlEVDAKFz/oB1t81Kk2sFHoA0U/hW2iLpK2qMfqPjEFE3sTbNLw8c5cTbq4
+oo9DqUVT+zyv7L4X3xs/R25urWB+YSAe2dofsQIDAQABAoIBAEgl+/4EH3pEfe3f
+bjEXc/L3RZ4SQ1z5d3aBNuLXeA9vsToVBgWcNM/Jcz8qFCb24tK2GN/btLyFwZ+k
+i84E87WfHILAm+2QaM25oi1yKHQHO6d5z5ObDpMgFU3RDtFPDD87ckesAIY47d5P
+pPHKNvP8Aix1ncCYg0IY0fRFBRF1Gc2dlRkt4MYEymgIn8z2jfbzoJhyQqDr7qbC
+mkUg+xW6HtN3NsV+IIu1djkivW/mF6jxoFsEnHlpIuFJHm4qMnj4XZx8Sbd4+DFx
+YmYFsmUVG7WkmhPim67LGAB8ah2K729q53eaSs2900Qh8l8qpSAoHC1OaPtQbrq/
+H2R0BfECgYEA6MEp4xxN/FCIQEjDdKSl+mEmsrES92lGBaTeIg0CbAvPyAZfwC/o
+08Jun5TEZgkkjmf/6xGqJXL4ohh8VHz3W4XcPUzGUbGSK+czC5zhAjy17vJjxh6/
+qKD31kcwtMzp/sH8ajSl24setiomiGbCc/HoDQIx0K53t50KQHbpuZUCgYEA0K8j
+8geq0MYw408hC+EyJHKOc/doUKBfV3+j/ZI37xTEeYx9DaZdKax04KsF76pvr1ZY
+SesIhUvgo8UOGYUdnRq7p4/BjEt8yuh00ezspcBAZPH/wvC6FZVw+f1u7ZdOY0D0
+1XIDT0dToVx2CunUxC8i8SDlpcZa6c2xEun3Xq0CgYEAwepVBJNLYeCSc8Rrm12l
+rwGL5SpkG98IaKFgNExUbUI1/XdaBNulhe+ijK+8JSqO21pIPEd+Uy8DeMEfrKBk
+0UqoICY7wEpJ9uvrekxcpqmABjDJ8YEiutJJSawMJ0Xl2csyiiWM3Wl9z9U0P0Yl
+0cWESHpAmJUSxtY+eVDZDzUCgYEArxZjKEw6ixPeLLlVVqxI77+VucKYqR0FIVqc
+csHdYCCigADZYzxz6eUh4uZbAqyTLB9b0Bj8eyogfgd1PwAqyoeFbp70mwsy1uOW
+MBOCscbNwGQyXJKw7i8GLRjvmzRZtnjncrZIBJoplrcG6z0pILkTrhAV3bLA0G2d
+5eqbe7kCgYAbsBdJRvbAekQ3qlNT3l5DrMLDcsua4V+omjYtTKQ1+1SPpNYP7/zv
+mTsj7aPhdNMGWPjWYtM6D4Rpg6ry+uPytBRPCoAas5bTSYi6vJBaxjpeMW37eXCA
+aSwnYg+DQvHK4MQWu2vcElnuZ8qY2EKGeDen7jK/2iOLJlQUIkptGg==
+-----END RSA PRIVATE KEY-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/nms_controller.pem b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/nms_controller.pem
new file mode 100644
index 00000000..02edd658
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/nms_controller.pem
@@ -0,0 +1,18 @@
+-----BEGIN TRUSTED CERTIFICATE-----
+MIIC1DCCAbwCFCrTQmqWA2/pgQa9h4PgTufmG2MBMA0GCSqGSIb3DQEBCwUAMCkx
+CzAJBgNVBAYTAlVTMRowGAYDVQQDDBFyb290Y2EubWFnbWEudGVzdDAeFw0yMTAz
+MTMxMDIxMzNaFw0zMTAzMTExMDIxMzNaMCQxCzAJBgNVBAYTAlVTMRUwEwYDVQQD
+DAwqLm1hZ21hLnRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9
+vC7Cn4vyHH9xoz2G8hds7nNKlk0D3FaofvDZRCWA99xaLJql7FKCIlyaLsYVlTSP
+XzYQQcp7mnKs8urgF1tWnZS2iFfU0WsM+oYWVfV7oDdgN3YoeuGLRUBGFRsspyti
+K7bu5jU2sftJk54uCFQNI1lir3Sv40bVusjg/1iVmJah9w7jzLDRYS4pcYKqYHIM
+pMhGiDxZd/8LMHUwVt0+2qtVrh4/L1wx5rHsM/ZMJA0VUGxshgnGuURUMAoXP+gH
+W3zUqTawUegDRT+FbaIukraox+o+MQUTexNs0vDxzlxNuriij0OpRVP7PK/svhff
+Gz9Hbm6tYH5hIB7Z2h+xAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADln7CADyd53
+iIgSU4aYZ238Dqk4v1VbirY4gl/XG84hCPQ9T0gDVWRGYPqoKXuJJbMYcDTUojPV
+VjxhR/Z7N4OZdtzPFDoGwOAytAdmFdsPgD2WVAwD1FP0Jl7v7BG6TO5Zzbjz/k/u
+5i2Muv7RRxhRfmEOqn+c+t7ccGgLW1RKHWjik3o0asLkE4v7BdPZq3VyGknuPYOP
+Lkkl7ecuqqVZUqfD5rpnQY9ON+cGZFRQGEcTSt3aPGLlykNbrpa5TZxBBUA/1GMH
+34pTCtzeuNCg/6M/FUv/Xjc25VfwRDvG4Nawx6+ReqvHzAy2TU6aSSFW5KLDNdOC
+1OESKovShzE=
+-----END TRUSTED CERTIFICATE-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/rootCA.key b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/rootCA.key
new file mode 100644
index 00000000..39babdc5
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/rootCA.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAojR8cU/S3bBlI2FIO7TR4e9VYXxx4lDmoiaGMtql9wz5tVpp
+VGaXLTCkUXz3YqD72hDbbDgfqCXKYpR4MNkJ0L3JLGy15XNrA4b9Y9AguqPDARtY
+NBU1HQ41glvoSwOEwQvlglSAXMdDOL1r6qRBssPrTJT9qiR4j+cSZ9V/PlK2Pcmq
+P+E23BqvmVbr4KSNjMxhemJHnfCTLhyJGiRCW2aa/MrIinwTTb2vsylSteRs4jCr
+j9ZoIhedza2OIfdbx/OCuLnVHxYRXtCV78GKAlGLT0+vxfBy82ttLN5s2841sI3Q
+w+g37j5y/ofnV0bRUHGDtmHUbznxKAwvKvxrKQIDAQABAoIBAQCduGVslM6YK4Yc
+YeKn08nlZB/kW+oswreP4d/JoRuR3rcMJW6X1+2Vzl9osRenepuJzaxeTTBTAvQI
+6Q75iIDnzTLJFKfGBXWAB4lpvZ2lfckG0Xzxn9F2gDN9nzp/fltejt/K27m4/TSa
+/mzpym/rkF/CpnkFMNNeMbSO7GT+xke34/rme9Y0O+roBUeWf4Yq+MZCbLddrxTH
+UDDE3tHCs9Xccu4uxUsBrC7P2yvMwFKmKDcuRuiOkzpojt7HP9AmVoQmy7v1+7yX
+ljdGxx98vBxEJwljXN1r0odCNeM//fEH35OgEQViXtMz4QNZz8ERaIzn7EBeGseY
+wzsDw3FFAoGBANRcj1bpBuybwAtAZJGONiIH3Y6tBPODR+J3CghCKYltz+9DLFXE
+n04VH8qybXu+X/YrOb94pkY2+BSpAofwVDZhO0EcRbxE9Otdbja2KZFGfyddYzf8
+LapVtksqA1x3k4dhmLaggxaezc414cEAcEYF9k3Yg+aq9Ig6/l/iUhVHAoGBAMOJ
+Z1b9NWQHpVq9SgLTsb4bsFy0ug9QoQohN2vt967LYRH6tBQo2IZpUkBnSE8E3s1j
+o5hGxrEtE0+uYfgMc33ihWNEOhOllsR+PM2XWtwmxFiXV112HtcPMgVq1oK4IQO3
+VeNS/CUsYGM2EgEYi8Vzw6LoyQJ9hL5CLCD9r3QPAoGBALuNuAcBLd1gvV7ykx++
+ou6xVatCAgJzqtRHYDPlAzxeIOxmvkxNqIjUvUxPA8TrYWNPz+PcUbXnrHjKv/KB
+fk681xFtP+XEXS9WSBXIErQ8t+ZzY0K51TcAFk0SIP/UmBZUSwTYhI5A2PFLw0Oq
++H3PnDYqiGv8BpYezDSw9N/XAoGAPZpBU1eMhYofHxo5gfB9s933Tw2k/IQzaASU
++EzNVmU+nLJ2H0/K/3WY8y9WyYZIRz7X4HaTzGfeCKFwvfv2OretvFtXTK9Dc34t
+27uOZYNVIm/zlz9KcgiYgrppAF/QDuKojWishW2YpEj5nRzFlBxniyB5i25N7r7c
+NjyWFSMCgYBn8peRk6ddYIXbWkwTdDbCO7ZrWRXWEUBP4V7MeeB3DbqfsYl0Llft
+flmqEfeOgEpZ6Lp/BZ3lQtNZ4ORpsCXPBl6AbujpsEtzaveVRzwAdHFgbstBh8Le
+DLAchZ6IAKuW9U6Iz+V1zPIKxHh4Mc5JLqzCVihbau8A+ISOjZ2VSw==
+-----END RSA PRIVATE KEY-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/rootCA.pem b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/rootCA.pem
new file mode 100644
index 00000000..6be49d5f
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/rootCA.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDMzCCAhugAwIBAgIUYI1D3IYYT6/GPxE4PF1KDXcnDJUwDQYJKoZIhvcNAQEL
+BQAwKTELMAkGA1UEBhMCVVMxGjAYBgNVBAMMEXJvb3RjYS5tYWdtYS50ZXN0MB4X
+DTIxMDMxMzEwMjAzN1oXDTMxMDMxMTEwMjAzN1owKTELMAkGA1UEBhMCVVMxGjAY
+BgNVBAMMEXJvb3RjYS5tYWdtYS50ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAojR8cU/S3bBlI2FIO7TR4e9VYXxx4lDmoiaGMtql9wz5tVppVGaX
+LTCkUXz3YqD72hDbbDgfqCXKYpR4MNkJ0L3JLGy15XNrA4b9Y9AguqPDARtYNBU1
+HQ41glvoSwOEwQvlglSAXMdDOL1r6qRBssPrTJT9qiR4j+cSZ9V/PlK2PcmqP+E2
+3BqvmVbr4KSNjMxhemJHnfCTLhyJGiRCW2aa/MrIinwTTb2vsylSteRs4jCrj9Zo
+Ihedza2OIfdbx/OCuLnVHxYRXtCV78GKAlGLT0+vxfBy82ttLN5s2841sI3Qw+g3
+7j5y/ofnV0bRUHGDtmHUbznxKAwvKvxrKQIDAQABo1MwUTAdBgNVHQ4EFgQUXfQ6
+Mbn1aSDvMWk1V4TUcyNZ/7kwHwYDVR0jBBgwFoAUXfQ6Mbn1aSDvMWk1V4TUcyNZ
+/7kwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAeozDdEbB94tB
+sIU+tCPkAw9dcs5n0jRxWcqS/u5rJBxWRPWMBXmBRYPGN0pke5RtedbQa/Sa1LPd
+NB5tG8KFW3dbL5jUA+FqNnQ4C5iv88B7sftwkYTQpro8lLfesilpje2RMVSaZX2X
+fDukU7Eu0Xwwe66Nusnn0FWOCwblx+XPI2Zx8dvFQ/fu/XZJ/p7Z4+wDQdW0QGjM
+VXu5VvMBf7cHHWFgAKHKP7u18dXXqRbud8aYyF6VKRLDER2dSggKGDnjoKX/m2zM
+6AN4dukEI11WqXFd0pbOe8htwvzZzh9glac9NH3Rk0PBmK9/v+JVvYLZHqqhGERv
+DdXRaDnPLg==
+-----END CERTIFICATE-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/rootCA.srl b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/rootCA.srl
new file mode 100644
index 00000000..6e0025d4
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/rootCA.srl
@@ -0,0 +1 @@
+2AD3426A96036FE98106BD8783E04EE7E61B6302
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/vpn_ca.crt b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/vpn_ca.crt
new file mode 100644
index 00000000..8c48322f
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/vpn_ca.crt
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC1DCCAbwCFCrTQmqWA2/pgQa9h4PgTufmG2MCMA0GCSqGSIb3DQEBCwUAMCkx
+CzAJBgNVBAYTAlVTMRowGAYDVQQDDBFyb290Y2EubWFnbWEudGVzdDAeFw0yMTAz
+MTMxMDI0NDNaFw0zMTAzMTExMDI0NDNaMCQxCzAJBgNVBAYTAlVTMRUwEwYDVQQD
+DAwqLm1hZ21hLnRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj
+3TWsovnWOTHgEunCs0LfDvmVK5crWIbGjg80cWNKsRANz/zFV0WiPBoT7lvGeiyU
+laJxqRLs9d8MY/yRpfTWrV3xlZnk3pPEFC1dftGLjVGfF6723fUSGmQ0PRfjhk65
+KLGhemJHLU90AlZYnlFYMFOaSo431+hMn7z59dQwSNJP/MjV5d7FrtY1DCFREnWt
+Us305P0VoZMru4Z5/nhALqAuQhDqHZnKXulxjFoX/b8X9yp22MJr/D9fJWOCSux9
+n+6S3rUvrflc/KsVE+P6h19oRUY3FYQNg5vyVLDhC9+Vu7D8h86JhByM3pQHI3UV
+88zhOGBD9Ix+egv8CUjnAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAamSbQN1VkU
+Mc2j9NSUNpeUVSbbrZDykNkRyIj+qUq3U28aSI5a93nLvI+KneikrHRDO0Wy0irb
+glhMRkmgE5F+0c17OKsJYONWPkQb2hZ7aUkEuOagfNyBnWjDwZP6L1VUZf3l8vev
+fLeuCjBR/gYKX7vKnlhX6e3pfURAWvHAeyFAmNNtUPPYScZOJO+x36E/K/q9hQmo
+phm7aQSTqOKops6tpCb8gtqiPYAmcVokAvsqnEE/tYLqm4drnFLS1ke7ET6fAr1j
+Mr0xLnyM1Yd2JMDrVRqKAf7XlZAztU8AFTa+kQ1cwuiHtUfF5Kg6CgKqxK47cacn
+yQIKuCjhg5c=
+-----END CERTIFICATE-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/vpn_ca.key b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/vpn_ca.key
new file mode 100644
index 00000000..6159651e
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/certs/vpn_ca.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAo901rKL51jkx4BLpwrNC3w75lSuXK1iGxo4PNHFjSrEQDc/8
+xVdFojwaE+5bxnoslJWicakS7PXfDGP8kaX01q1d8ZWZ5N6TxBQtXX7Ri41Rnxeu
+9t31EhpkND0X44ZOuSixoXpiRy1PdAJWWJ5RWDBTmkqON9foTJ+8+fXUMEjST/zI
+1eXexa7WNQwhURJ1rVLN9OT9FaGTK7uGef54QC6gLkIQ6h2Zyl7pcYxaF/2/F/cq
+dtjCa/w/XyVjgkrsfZ/ukt61L635XPyrFRPj+odfaEVGNxWEDYOb8lSw4Qvflbuw
+/IfOiYQcjN6UByN1FfPM4ThgQ/SMfnoL/AlI5wIDAQABAoIBAC9C3/Y400IcIOx1
+yAIl3cWj9gw2FFWmJMkjs/L2OSMTyoORV2A7eZP/La5N8x5donoAZmfN0e2SRJC4
+TeJcMS+xtQS2lzpRj+DfyO3MY/eR/Nab6BS/k61y+y+t5zPySsZQnFrsh2fsA5x8
+CBdrIh8DYTmBA1/L3+4prEGTy21ZPS+I3DdL/R3hjKOXw3vkiTkpKBYHs7c7ityD
+YO5iEPmin4fusDIzOx1f4WF1YDB+kzIyefib+HO/lKRiqAD69h54TeoLh0iyhJhP
+onsUg1NDCWaQujUuk7jRNB43UMoxgdxoQqfKmU/uZPVUkoSFWfFY+MHcqxFlAryL
+cs3QZDECgYEA1/QdUX9Ib0gJUozJ/+u0qdeMlWQiqKgjGfJKd5+hTruPRXTLd0Ks
+UG0vRQ7MPtkmUOxFypGgYsRLyUTJ2gXAUS9Ahi7cirsj0I9xbNkj9ZWEIgKQ6ot8
+SHqxzzuxkKz/53n7KGk+z3GN5Ru+Hh+9fy08pfAtNqsBIOjgbikwJEsCgYEAwkBF
+Q0ZcJmlgWprYQnJlHyi1tUIg0B8rEjYiPfzb/hn8b9hJEKmk82+CtT4sMEs8r6Ez
+eLgzyBRcutm10CJvzXqngiVPNej2b5/YS40hfr6jjy22uzUpyMJ0AvMabkZhdIww
+XJXQeJlcWZNKOxwxWeezaaVQ3z4Zh64Axd5KNFUCgYAtNm3A904aBlH1V4afLyEX
+Agrr6BgdiX4323Nd0iz6h+g6GXbT1ECxYfqoka2PZvVPsff2rkCPDRv02pMMM3IN
+TUBMF5mS7hVUgAO2T0vpCdGtMS5X/LYbkpyRj6Tgbmfxdadw0YAV/GdB1WobcnfB
+HZ55+2vr6yeEVV1Pkw4COwKBgQC9OJ4/ymo5gKy7ldrT31th3uYiiygrlDEArHru
+p0IlZGrjCG0kLhzghd9tbgLdiGy1KPJaxhSq8iriWPEirmj6YGCMBowCl8x3L94i
+unfGXy40avN1qXPqfIFF3koA4c5NGcKCbe2FjN7I4xGMQwpP6cR7RO5iiLuVz4ox
+NThTgQKBgDI0ZcE8Ag0Y4dLsRfL8kj3+FH2zd6lZUejX3z1i4T2JmVJgDcaxEKLo
+Pwk90+1IaqLPvPlkPA8tCotkxzDup82kYAnk0ylqapBLZYP2DeU9DHNqdc3qoaHp
++kdI5hbYrmXFgsDHWRGbFp6U7JD9ro5eucx04ie3Wi4TwuDJWn/b
+-----END RSA PRIVATE KEY-----
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/configs/orc8r/metricsd.yml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/configs/orc8r/metricsd.yml
new file mode 100644
index 00000000..f153a887
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/.secrets/configs/orc8r/metricsd.yml
@@ -0,0 +1,9 @@
+profile: "prometheus"
+
+prometheusQueryAddress: "http://orc8r-prometheus:9090"
+prometheusPushAddresses:
+  - "http://orc8r-prometheus-cache:9091/metrics"
+
+alertmanagerApiURL: "http://orc8r-alertmanager:9093/api/v2/alerts"
+prometheusConfigServiceURL: "http://orc8r-config-manager:9100"
+alertmanagerConfigServiceURL: "http://orc8r-config-manager:9101"
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/Chart.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/Chart.yaml
new file mode 100644
index 00000000..89062793
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/Chart.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart to create magma orchestrator secrets
+keywords:
+- magma
+- or8cr
+- secrets
+name: secrets
+sources:
+- https://github.com/facebookincubator/magma
+version: 0.1.3
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/README.md b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/README.md
new file mode 100644
index 00000000..0e3543d3
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/README.md
@@ -0,0 +1,51 @@
+# Orchestrator Secrets
+
+Orchestrator Secrets is used to apply a set of secrets required by magma orchestrator.
+
+## TL;DR;
+
+```bash
+# Copy secrets into subchart root
+$ mkdir charts/secrets/.secrets && \
+    cp -r <secrets>/* charts/secrets/.secrets/
+
+# Apply secrets
+helm template charts/secrets \
+    --name orc8r-secrets \
+    --namespace magma \
+    --set=docker.registry=docker.io \
+    --set=docker.username=username \
+    --set=docker.password=password |
+kubectl apply -f -
+```
+
+## Overview
+
+This chart installs a set to secrets required by magma orchestrator.
+The secrets are expected to be provided as files and placed under
+secrets subchart root.
+```bash
+$ ls charts/secrets/.secrets
+certs  configs envdir
+$ pwd
+magma/orc8r/cloud/helm/orc8r
+```
+## Image Pull Secret
+
+This chart can also be used to install image pull secret which is required
+when working with private docker registries.
+
+## Configuration
+
+The following table lists the configurable secret locations, 
+docker credentials and their default values.
+
+| Parameter        | Description     | Default   |
+| ---              | ---             | ---       |
+| `create` | Set to ``true`` to create orc8r secrets. | `false` |
+| `secret.certs` | Root relative certs directory. | `.secrets/certs` |
+| `secret.configs` | Root relative configs directory. | `.secrets/configs` |
+| `secret.envdir` | Root relative envdir directory. | `.secrets/envdir` |
+| `docker.registry` | Docker registry. | `""` |
+| `docker.username` | Docker registry username. | `""` |
+| `docker.password` | Docker registry password. | `""` |
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/_helpers.tpl b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/_helpers.tpl
new file mode 100644
index 00000000..e571cbb0
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/_helpers.tpl
@@ -0,0 +1,15 @@
+{{/*
+Copyright (c) 2018-present, Facebook, Inc.
+All rights reserved.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree. An additional grant
+of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+{{- define "labels" -}}
+app.kubernetes.io/name: {{ .Chart.Name }}
+app.kubernetes.io/instance: orc8r
+app.kubernetes.io/managed-by: helm
+app.kubernetes.io/part-of: magma
+helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/certs.secret.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/certs.secret.yaml
new file mode 100644
index 00000000..9e8b4743
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/certs.secret.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+{{- if .Values.create }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: orc8r-secrets-certs
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "labels" . | indent 4 }}
+data:
+{{- (.Files.Glob (print .Values.secret.certs "/*")).AsSecrets | nindent 2 }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/configs-orc8r.secret.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/configs-orc8r.secret.yaml
new file mode 100644
index 00000000..b6109058
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/configs-orc8r.secret.yaml
@@ -0,0 +1,20 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+# Config secrets for orc8r module
+# TODO: it should be possible to range at the top level and dynamically generate secrets based on subdirectories under .secrets/configs/
+{{- if .Values.create }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: orc8r-secrets-configs-orc8r
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "labels" . | indent 4 }}
+data:
+{{- (.Files.Glob (print .Values.secret.configs "/orc8r/*.yml")).AsSecrets | nindent 2 }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/envdir.secret.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/envdir.secret.yaml
new file mode 100644
index 00000000..1c6d7607
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/envdir.secret.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+{{- if .Values.create }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: orc8r-secrets-envdir
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "labels" . | indent 4 }}
+data:
+{{- (.Files.Glob (print .Values.secret.envdir "/*")).AsSecrets | nindent 2 }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/registry.secret.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/registry.secret.yaml
new file mode 100644
index 00000000..21cf4738
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/templates/registry.secret.yaml
@@ -0,0 +1,21 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+{{- if .Values.create }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: orc8r-secrets-registry
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{ include "labels" . | indent 4 }}
+type: kubernetes.io/dockerconfigjson
+data:
+  {{- with .Values.docker }}
+  .dockerconfigjson: {{ printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .registry (print .username ":" .password | b64enc) | b64enc }}
+  {{- end }}
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/values.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/values.yaml
new file mode 100644
index 00000000..a3986ab6
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/charts/secrets/values.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+# Create orchestrator secrets.
+create: true
+
+# orc8r secret configuration
+secret:
+  # base directory holding cert secrets
+  certs: .secrets/certs
+  # base directory holding config secrets.
+  configs: .secrets/configs
+  # base directory holding envdir secrets.
+  envdir: .secrets/envdir
+
+# private docker registry credentials
+docker:
+  registry:
+  username:
+  password:
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/fabfile.py b/magma/fb_magma_knf/helm-chart-v3s/orc8r/fabfile.py
new file mode 100644
index 00000000..45f31103
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/fabfile.py
@@ -0,0 +1,76 @@
+"""
+Copyright (c) Facebook, Inc. and its affiliates.
+All rights reserved.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree.
+"""
+
+import time
+
+import os
+from fabric.api import env, local
+from fabric.context_managers import lcd
+from fabric.operations import prompt
+
+MAGMA_ROOT = os.path.realpath('../../..')
+HELM_ROOT = os.path.join(MAGMA_ROOT, 'orc8r/cloud/helm/orc8r')
+SECRETS_CHART_ROOT = os.path.join(HELM_ROOT, 'charts/secrets')
+
+
+def deploy(vals_file: str,
+           kubeconfig: str,
+           secrets_s3_bucket: str,
+           install: bool=False):
+    """
+    Upgrade or initiate a Helm release for Orchestrator.
+
+    Args:
+        vals_file: Full path to the vals.yml file for the Helm deployment
+        kubeconfig: Full path to the kubeconfig file for the target k8s cluster
+        secrets_s3_bucket: Name of the s3 bucket where secrets are stored
+        install: Set to True to do a fresh helm install. False by default.
+    """
+    print("You're initiating a Helm release upgrade. Have you updated the "
+          f'image tags in {vals_file}?')
+    print('Think about it for 3 seconds...')
+    time.sleep(3)
+    sure = prompt('Are you ready to continue?',
+                  default='no', validate='^(yes|no)$')
+    if sure != 'yes':
+        exit()
+
+    _copy_secrets(secrets_s3_bucket)
+    os.environ['KUBECONFIG'] = kubeconfig
+
+    # template secrets and kubectl apply
+    env.release_success = False
+    try:
+        with lcd(HELM_ROOT):
+            if not install:
+                local(f'helm upgrade orc8r . --values={vals_file}')
+            else:
+                local(f'helm install --name orc8r --namespace magma . '
+                      f'--values={vals_file}')
+            env.release_success = True
+    except Exception as e:
+        print(e)
+    finally:
+        local(f"rm -rf {os.path.join(SECRETS_CHART_ROOT, '.secrets')}")
+        if env.release_success:
+            text = f'Upgrade Successful!' \
+                   'Use `kubectl -n magma get pods -w` ' \
+                   'to monitor the health of the release.'
+            print(text)
+        else:
+            print('Failed to upgrade release')
+            exit(1)
+
+
+def _copy_secrets(s3_bucket_name: str):
+    new_secrets_dir = os.path.join(SECRETS_CHART_ROOT, '.secrets-deploy')
+    local(f'aws s3 cp s3://{s3_bucket_name} {new_secrets_dir} --recursive')
+
+    final_secrets_dir = os.path.join(SECRETS_CHART_ROOT, '.secrets')
+    local(f'rm -rf {final_secrets_dir}')
+    local(f'mv {new_secrets_dir} {final_secrets_dir}')
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/output/icepanel.yml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/output/icepanel.yml
new file mode 100644
index 00000000..ecbb990d
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/output/icepanel.yml
@@ -0,0 +1,227 @@
+files:
+  - loader: k8s
+    path: orc8h.yaml
+nodes:
+  - kind: ConfigMap
+    name: nginx-proxy-etc
+    plugin: kubernetes-config-map
+    position:
+      x: 566
+      y: 1920
+  - kind: ConfigMap
+    name: orc8r-fluentd-es-configs
+    plugin: kubernetes-config-map
+    position:
+      x: 560
+      y: 2480
+  - kind: ConfigMap
+    name: prometheus-config-file
+    plugin: kubernetes-config-map
+    position:
+      x: 20
+      y: 1400
+  - kind: ConfigMap
+    name: release-name-mariadb
+    plugin: kubernetes-config-map
+    position:
+      x: -30
+      y: 880
+  - kind: ConfigMap
+    name: release-name-mariadb-tests
+    plugin: kubernetes-config-map
+    position:
+      x: 15
+      y: 1200
+  - kind: Deployment
+    name: nms-magmalte
+    plugin: kubernetes-deployment
+    position:
+      x: 860
+      y: 40
+  - kind: Deployment
+    name: nms-nginx-proxy
+    plugin: kubernetes-deployment
+    position:
+      x: 800
+      y: 560
+  - kind: Deployment
+    name: orc8r-configmanager
+    plugin: kubernetes-deployment
+    position:
+      x: 800
+      y: 320
+  - kind: Deployment
+    name: orc8r-controller
+    plugin: kubernetes-deployment
+    position:
+      x: 40
+      y: 2080
+  - kind: Deployment
+    name: orc8r-grafana
+    plugin: kubernetes-deployment
+    position:
+      x: 40
+      y: 2280
+  - kind: Deployment
+    name: orc8r-prometheus
+    plugin: kubernetes-deployment
+    position:
+      x: 261
+      y: 1400
+  - kind: Deployment
+    name: orc8r-prometheus-cache
+    plugin: kubernetes-deployment
+    position:
+      x: 480
+      y: 2280
+  - kind: Deployment
+    name: orc8r-proxy
+    plugin: kubernetes-deployment
+    position:
+      x: 306
+      y: 240
+  - kind: Pod
+    name: release-name-mariadb-test-mhow6
+    plugin: kubernetes-pod
+    position:
+      x: 330
+      y: 1200
+  - kind: Secret
+    name: magmalte-mysql-secrets
+    plugin: kubernetes-secret
+    position:
+      x: 565
+      y: 40
+  - kind: Secret
+    name: orc8r-controller
+    plugin: kubernetes-secret
+    position:
+      x: -170
+      y: 2080
+  - kind: Secret
+    name: orc8r-secrets-certs
+    plugin: kubernetes-secret
+    position:
+      x: 320
+      y: 2480
+  - kind: Secret
+    name: orc8r-secrets-configs-orc8r
+    plugin: kubernetes-secret
+    position:
+      x: 40
+      y: 2480
+  - kind: Secret
+    name: orc8r-secrets-envdir
+    plugin: kubernetes-secret
+    position:
+      x: 1080
+      y: 2440
+  - kind: Secret
+    name: orc8r-secrets-registry
+    plugin: kubernetes-secret
+    position:
+      x: 1080
+      y: 2280
+  - kind: Secret
+    name: postgresql
+    plugin: kubernetes-secret
+    position:
+      x: 92
+      y: 1640
+  - kind: Secret
+    name: release-name-mariadb
+    plugin: kubernetes-secret
+    position:
+      x: 40
+      y: 40
+  - kind: Service
+    name: bootstrapper-orc8r-proxy
+    plugin: kubernetes-service
+    position:
+      x: 539
+      y: 480
+  - kind: Service
+    name: magmalte
+    plugin: kubernetes-service
+    position:
+      x: 1131
+      y: 40
+  - kind: Service
+    name: mariadb
+    plugin: kubernetes-service
+    position:
+      x: 643
+      y: 880
+  - kind: Service
+    name: nginx-proxy
+    plugin: kubernetes-service
+    position:
+      x: 1040
+      y: 560
+  - kind: Service
+    name: orc8r-clientcert-legacy
+    plugin: kubernetes-service
+    position:
+      x: 539
+      y: 680
+  - kind: Service
+    name: orc8r-configmanager
+    plugin: kubernetes-service
+    position:
+      x: 1097
+      y: 320
+  - kind: Service
+    name: orc8r-controller
+    plugin: kubernetes-service
+    position:
+      x: 1318
+      y: 2080
+  - kind: Service
+    name: orc8r-grafana
+    plugin: kubernetes-service
+    position:
+      x: 287
+      y: 2280
+  - kind: Service
+    name: orc8r-prometheus
+    plugin: kubernetes-service
+    position:
+      x: 546
+      y: 1400
+  - kind: Service
+    name: orc8r-prometheus-cache
+    plugin: kubernetes-service
+    position:
+      x: 795
+      y: 2280
+  - kind: Service
+    name: orc8r-proxy
+    plugin: kubernetes-service
+    position:
+      x: 539
+      y: 240
+  - kind: Service
+    name: postgresql
+    plugin: kubernetes-service
+    position:
+      x: 679
+      y: 1640
+  - kind: Service
+    name: postgresql-headless
+    plugin: kubernetes-service
+    position:
+      x: 40
+      y: 440
+  - kind: StatefulSet
+    name: postgresql
+    plugin: kubernetes-stateful-set
+    position:
+      x: 367
+      y: 1640
+  - kind: StatefulSet
+    name: release-name-mariadb
+    plugin: kubernetes-stateful-set
+    position:
+      x: 330
+      y: 880
+version: '1'
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/output/orc8h.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/output/orc8h.yaml
new file mode 100644
index 00000000..62896f70
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/output/orc8h.yaml
@@ -0,0 +1,1809 @@
+apiVersion: v1
+data:
+  nginx_proxy_ssl.conf: |
+    server {
+      listen 443;
+      ssl on;
+      ssl_certificate /etc/nginx/conf.d/nms_nginx.pem;
+      ssl_certificate_key /etc/nginx/conf.d/nms_nginx.key.pem;
+      location / {
+         proxy_pass http://magmalte:8081;
+      }
+    }
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/component: nginx
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: nms
+    app.kubernetes.io/part-of: magma
+    release_group: release-name
+  name: nginx-proxy-etc
+  namespace: default
+---
+apiVersion: v1
+data:
+  fluent.conf: |-
+    @include /fluentd/etc/kubernetes.conf
+    @include /fluentd/etc/systemd.conf
+    @include /fluentd/etc/output.conf
+  kubernetes.conf: >-
+    <match fluent.**>
+      @type null
+    </match>
+
+
+    <source>
+      @type tail
+      @id in_tail_container_logs
+      path /var/log/containers/*.log
+      pos_file /var/log/fluentd-containers.log.pos
+      tag kubernetes.*
+      read_from_head true
+      <parse>
+        @type "#{ENV['FLUENT_CONTAINER_TAIL_PARSER_TYPE'] || 'json'}"
+        time_format %Y-%m-%dT%H:%M:%S.%NZ
+      </parse>
+    </source>
+
+
+    <source>
+      @type tail
+      @id in_tail_minion
+      path /var/log/salt/minion
+      pos_file /var/log/fluentd-salt.pos
+      tag salt
+      <parse>
+        @type regexp
+        expression /^(?<time>[^ ]* [^ ,]*)[^\[]*\[[^\]]*\]\[(?<severity>[^ \]]*) *\] (?<message>.*)$/
+        time_format %Y-%m-%d %H:%M:%S
+      </parse>
+    </source>
+
+
+    <source>
+      @type tail
+      @id in_tail_startupscript
+      path /var/log/startupscript.log
+      pos_file /var/log/fluentd-startupscript.log.pos
+      tag startupscript
+      <parse>
+        @type syslog
+      </parse>
+    </source>
+
+
+    <source>
+      @type tail
+      @id in_tail_docker
+      path /var/log/docker.log
+      pos_file /var/log/fluentd-docker.log.pos
+      tag docker
+      <parse>
+        @type regexp
+        expression /^time="(?<time>[^)]*)" level=(?<severity>[^ ]*) msg="(?<message>[^"]*)"( err="(?<error>[^"]*)")?( statusCode=($<status_code>\d+))?/
+      </parse>
+    </source>
+
+
+    <source>
+      @type tail
+      @id in_tail_etcd
+      path /var/log/etcd.log
+      pos_file /var/log/fluentd-etcd.log.pos
+      tag etcd
+      <parse>
+        @type none
+      </parse>
+    </source>
+
+
+    <source>
+      @type tail
+      @id in_tail_kubelet
+      multiline_flush_interval 5s
+      path /var/log/kubelet.log
+      pos_file /var/log/fluentd-kubelet.log.pos
+      tag kubelet
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+
+    <source>
+      @type tail
+      @id in_tail_kube_proxy
+      multiline_flush_interval 5s
+      path /var/log/kube-proxy.log
+      pos_file /var/log/fluentd-kube-proxy.log.pos
+      tag kube-proxy
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+
+    <source>
+      @type tail
+      @id in_tail_kube_apiserver
+      multiline_flush_interval 5s
+      path /var/log/kube-apiserver.log
+      pos_file /var/log/fluentd-kube-apiserver.log.pos
+      tag kube-apiserver
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+
+    <source>
+      @type tail
+      @id in_tail_kube_controller_manager
+      multiline_flush_interval 5s
+      path /var/log/kube-controller-manager.log
+      pos_file /var/log/fluentd-kube-controller-manager.log.pos
+      tag kube-controller-manager
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+
+    <source>
+      @type tail
+      @id in_tail_kube_scheduler
+      multiline_flush_interval 5s
+      path /var/log/kube-scheduler.log
+      pos_file /var/log/fluentd-kube-scheduler.log.pos
+      tag kube-scheduler
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+
+    <source>
+      @type tail
+      @id in_tail_rescheduler
+      multiline_flush_interval 5s
+      path /var/log/rescheduler.log
+      pos_file /var/log/fluentd-rescheduler.log.pos
+      tag rescheduler
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+
+    <source>
+      @type tail
+      @id in_tail_glbc
+      multiline_flush_interval 5s
+      path /var/log/glbc.log
+      pos_file /var/log/fluentd-glbc.log.pos
+      tag glbc
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+
+    <source>
+      @type tail
+      @id in_tail_cluster_autoscaler
+      multiline_flush_interval 5s
+      path /var/log/cluster-autoscaler.log
+      pos_file /var/log/fluentd-cluster-autoscaler.log.pos
+      tag cluster-autoscaler
+      <parse>
+        @type kubernetes
+      </parse>
+    </source>
+
+
+    # Example:
+
+    # 2017-02-09T00:15:57.992775796Z AUDIT:
+    id="90c73c7c-97d6-4b65-9461-f94606ff825f" ip="104.132.1.72" method="GET"
+    user="kubecfg" as="<self>" asgroups="<lookup>" namespace="default"
+    uri="/api/v1/namespaces/default/pods"
+
+    # 2017-02-09T00:15:57.993528822Z AUDIT:
+    id="90c73c7c-97d6-4b65-9461-f94606ff825f" response="200"
+
+    <source>
+      @type tail
+      @id in_tail_kube_apiserver_audit
+      multiline_flush_interval 5s
+      path /var/log/kubernetes/kube-apiserver-audit.log
+      pos_file /var/log/kube-apiserver-audit.log.pos
+      tag kube-apiserver-audit
+      <parse>
+        @type multiline
+        format_firstline /^\S+\s+AUDIT:/
+        # Fields must be explicitly captured by name to be parsed into the record.
+        # Fields may not always be present, and order may change, so this just looks
+        # for a list of key="\"quoted\" value" pairs separated by spaces.
+        # Unknown fields are ignored.
+        # Note: We can't separate query/response lines as format1/format2 because
+        #       they don't always come one after the other for a given query.
+        format1 /^(?<time>\S+) AUDIT:(?: (?:id="(?<id>(?:[^"\\]|\\.)*)"|ip="(?<ip>(?:[^"\\]|\\.)*)"|method="(?<method>(?:[^"\\]|\\.)*)"|user="(?<user>(?:[^"\\]|\\.)*)"|groups="(?<groups>(?:[^"\\]|\\.)*)"|as="(?<as>(?:[^"\\]|\\.)*)"|asgroups="(?<asgroups>(?:[^"\\]|\\.)*)"|namespace="(?<namespace>(?:[^"\\]|\\.)*)"|uri="(?<uri>(?:[^"\\]|\\.)*)"|response="(?<response>(?:[^"\\]|\\.)*)"|\w+="(?:[^"\\]|\\.)*"))*/
+        time_format %Y-%m-%dT%T.%L%Z
+      </parse>
+    </source>
+
+
+    <filter kubernetes.**orc8r-proxy**>
+      @type parser
+      key_name log
+
+      <parse>
+        @type multi_format
+
+        <pattern>
+          format regexp
+          expression /^(?<time>.*)@\|@(?<remote_addr>.*)@\|@(?<http_host>.*)@\|@(?<server_port>.*)@\|@(?<request>.*)@\|@(?<status>.*)@\|@(?<body_bytes_sent>.*)@\|@(?<request_time>.*)@\|@(?<alpn>.*)@\|@(?<tls_client_serial>.*)@\|@(?<tls_client_subject_name>.*)@\|@(?<tls_session_reused>.*)@\|@(?<tls_sni>.*)@\|@(?<tls_protocol>.*)@\|@(?<tls_cipher>.*)@\|@(?<backend_host>.*)@\|@(?<backend_port>.*)$/
+          time_format %iso8601
+        </pattern>
+
+        <pattern>
+          format none
+        </pattern>
+      </parse>
+    </filter>
+
+
+    <filter kubernetes.**>
+      @type kubernetes_metadata
+      @id filter_kube_metadata
+    </filter>
+  output.conf: |-
+    <match **>
+      @type elasticsearch
+      @id out_es
+      @log_level info
+      include_tag_key true
+      host "#{ENV['FLUENT_ELASTICSEARCH_HOST']}"
+      port "#{ENV['FLUENT_ELASTICSEARCH_PORT']}"
+      scheme "#{ENV['FLUENT_ELASTICSEARCH_SCHEME'] || 'https'}"
+      ssl_verify "#{ENV['FLUENT_ELASTICSEARCH_SSL_VERIFY'] || 'false'}"
+      ssl_version "#{ENV['FLUENT_ELASTICSEARCH_SSL_VERSION'] || 'TLSv1'}"
+      reload_connections "#{ENV['FLUENT_ELASTICSEARCH_RELOAD_CONNECTIONS'] || 'false'}"
+      reconnect_on_error "#{ENV['FLUENT_ELASTICSEARCH_RECONNECT_ON_ERROR'] || 'true'}"
+      reload_on_failure "#{ENV['FLUENT_ELASTICSEARCH_RELOAD_ON_FAILURE'] || 'true'}"
+      log_es_400_reason "#{ENV['FLUENT_ELASTICSEARCH_LOG_ES_400_REASON'] || 'false'}"
+      logstash_prefix "#{ENV['FLUENT_ELASTICSEARCH_LOGSTASH_PREFIX'] || 'logstash'}"
+      logstash_format "#{ENV['FLUENT_ELASTICSEARCH_LOGSTASH_FORMAT'] || 'true'}"
+      index_name "#{ENV['FLUENT_ELASTICSEARCH_LOGSTASH_INDEX_NAME'] || 'logstash'}"
+      type_name "#{ENV['FLUENT_ELASTICSEARCH_LOGSTASH_TYPE_NAME'] || 'fluentd'}"
+      <buffer>
+        flush_thread_count "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_FLUSH_THREAD_COUNT'] || '8'}"
+        flush_interval "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_FLUSH_INTERVAL'] || '5s'}"
+        chunk_limit_size "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_CHUNK_LIMIT_SIZE'] || '2M'}"
+        queue_limit_length "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_QUEUE_LIMIT_LENGTH'] || '32'}"
+        retry_max_interval "#{ENV['FLUENT_ELASTICSEARCH_BUFFER_RETRY_MAX_INTERVAL'] || '30'}"
+        retry_forever true
+      </buffer>
+    </match>
+  systemd.conf: |-
+    # Logs from systemd-journal for interesting services.
+    <source>
+      @type systemd
+      @id in_systemd_kubelet
+      matches [{ "_SYSTEMD_UNIT": "kubelet.service" }]
+      <storage>
+        @type local
+        persistent true
+        path /var/log/fluentd-journald-kubelet-cursor.json
+      </storage>
+      <entry>
+        fields_strip_underscores true
+      </entry>
+      read_from_head true
+      tag kubelet
+    </source>
+
+    # Logs from docker-systemd
+    <source>
+      @type systemd
+      @id in_systemd_docker
+      matches [{ "_SYSTEMD_UNIT": "docker.service" }]
+      <storage>
+        @type local
+        persistent true
+        path /var/log/fluentd-journald-docker-cursor.json
+      </storage>
+      <entry>
+        fields_strip_underscores true
+      </entry>
+      read_from_head true
+      tag docker.systemd
+    </source>
+
+    # Logs from systemd-journal for interesting services.
+    <source>
+      @type systemd
+      @id in_systemd_bootkube
+      matches [{ "_SYSTEMD_UNIT": "bootkube.service" }]
+      <storage>
+        @type local
+        persistent true
+        path /var/log/fluentd-journald-bootkube-cursor.json
+      </storage>
+      <entry>
+        fields_strip_underscores true
+      </entry>
+      read_from_head true
+      tag bootkube
+    </source>
+kind: ConfigMap
+metadata:
+  labels:
+    addonmanager.kubernetes.io/mode: Reconcile
+  name: orc8r-fluentd-es-configs
+  namespace: default
+---
+apiVersion: v1
+data:
+  prometheus.yml: |
+    global:
+      scrape_interval:     15s # By default, scrape targets every 15 seconds.
+      evaluation_interval: 15s # By default, scrape targets every 15 seconds.
+      external_labels:
+        monitor: 'master'
+
+    scrape_configs:
+      - job_name: 'prometheus'
+        static_configs:
+          - targets: ['localhost:9090']
+
+      - job_name: "magma_pushgateway"
+        honor_labels: true
+        metric_relabel_configs:
+          - regex: 'job'
+            action: labeldrop
+          - regex: 'instance'
+            action: labeldrop
+        static_configs:
+          - targets: ['orc8r-prometheus-cache:9091']
+
+    rule_files:
+      - '/etc/prometheus/alert_rules/*_rules.yml'
+
+
+    alerting:
+      alertmanagers:
+        - scheme: http
+          static_configs:
+            - targets: ['orc8r-alertmanager:9093']
+kind: ConfigMap
+metadata:
+  name: prometheus-config-file
+---
+apiVersion: v1
+data:
+  my.cnf: |-
+    [mysqld]
+    skip-name-resolve
+    explicit_defaults_for_timestamp
+    basedir=/opt/bitnami/mariadb
+    plugin_dir=/opt/bitnami/mariadb/plugin
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    tmpdir=/opt/bitnami/mariadb/tmp
+    max_allowed_packet=16M
+    bind-address=0.0.0.0
+    pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
+    log-error=/opt/bitnami/mariadb/logs/mysqld.log
+    character-set-server=UTF8
+    collation-server=utf8_general_ci
+
+    [client]
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    default-character-set=UTF8
+    plugin_dir=/opt/bitnami/mariadb/plugin
+
+    [manager]
+    port=3306
+    socket=/opt/bitnami/mariadb/tmp/mysql.sock
+    pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
+kind: ConfigMap
+metadata:
+  labels:
+    app: mariadb
+    chart: mariadb-7.3.12
+    component: master
+    heritage: Tiller
+    release: release-name
+  name: release-name-mariadb
+---
+apiVersion: v1
+data:
+  run.sh: |-
+    @test "Testing MariaDB is accessible" {
+      mysql -h release-name-mariadb -uroot -p$MARIADB_ROOT_PASSWORD -e 'show databases;'
+    }
+kind: ConfigMap
+metadata:
+  name: release-name-mariadb-tests
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: magmalte
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: nms
+    app.kubernetes.io/part-of: magma
+    release_group: release-name
+  name: nms-magmalte
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: magmalte
+      app.kubernetes.io/instance: release-name
+      app.kubernetes.io/name: nms
+      release_group: release-name
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: magmalte
+        app.kubernetes.io/instance: release-name
+        app.kubernetes.io/name: nms
+        release_group: release-name
+    spec:
+      containers:
+        - args:
+            - yarn
+            - run
+            - 'start:dev'
+          env:
+            - name: API_CERT_FILENAME
+              value: /usr/src/fbcnms-projects/magmalte/certs/admin_operator.pem
+            - name: API_PRIVATE_KEY_FILENAME
+              value: /usr/src/fbcnms-projects/magmalte/certs/admin_operator.key.pem
+            - name: API_HOST
+              value: 'orc8r-proxy:9443'
+            - name: HOST
+              value: 0.0.0.0
+            - name: PORT
+              value: '8081'
+            - name: MAPBOX_ACCESS_TOKEN
+              value: ''
+            - name: MYSQL_DB
+              value: magma
+            - name: MYSQL_HOST
+              value: mariadb
+            - name: MYSQL_PASS
+              valueFrom:
+                secretKeyRef:
+                  key: MYSQL_PASS
+                  name: magmalte-mysql-secrets
+            - name: MYSQL_USER
+              valueFrom:
+                secretKeyRef:
+                  key: MYSQL_USER
+                  name: magmalte-mysql-secrets
+          image: 'fjvicens/magmalte:latest'
+          imagePullPolicy: Always
+          lifecycle:
+            postStart:
+              exec:
+                command:
+                  - /bin/sh
+                  - '-c'
+                  - >-
+                    screen -dmS config '/bin/sleep 120; yarn setAdminPassword
+                    osm@etsi.org magma'
+          livenessProbe:
+            exec:
+              command:
+                - curl
+                - 'http://localhost:8081/healthz'
+            initialDelaySeconds: 60
+          name: nms
+          ports:
+            - containerPort: 8081
+          volumeMounts:
+            - mountPath: /usr/src/fbcnms-projects/magmalte/certs/admin_operator.pem
+              name: orc8r-secrets-certs
+              subPath: admin_operator.pem
+            - mountPath: /usr/src/fbcnms-projects/magmalte/certs/admin_operator.key.pem
+              name: orc8r-secrets-certs
+              subPath: admin_operator.key.pem
+      serviceAccountName: release-name
+      terminationGracePeriodSeconds: 60
+      volumes:
+        - name: orc8r-secrets-certs
+          secret:
+            defaultMode: 292
+            secretName: orc8r-secrets-certs
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: nginx
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: nms
+    app.kubernetes.io/part-of: magma
+    release_group: release-name
+  name: nms-nginx-proxy
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: nginx
+      app.kubernetes.io/instance: release-name
+      app.kubernetes.io/name: nms
+      release_group: release-name
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: nginx
+        app.kubernetes.io/instance: release-name
+        app.kubernetes.io/name: nms
+        release_group: release-name
+    spec:
+      containers:
+        - image: 'nginx:latest'
+          imagePullPolicy: Always
+          name: nms
+          ports:
+            - containerPort: 443
+          volumeMounts:
+            - mountPath: /etc/nginx/conf.d/nginx_proxy_ssl.conf
+              name: nginx-proxy-etc
+              subPath: nginx_proxy_ssl.conf
+            - mountPath: /etc/nginx/conf.d/nms_nginx.pem
+              name: orc8r-secrets-certs
+              readOnly: true
+              subPath: controller.crt
+            - mountPath: /etc/nginx/conf.d/nms_nginx.key.pem
+              name: orc8r-secrets-certs
+              readOnly: true
+              subPath: controller.key
+      restartPolicy: Always
+      serviceAccountName: release-name
+      terminationGracePeriodSeconds: 60
+      volumes:
+        - configMap:
+            defaultMode: 365
+            name: nginx-proxy-etc
+          name: nginx-proxy-etc
+        - name: orc8r-secrets-certs
+          secret:
+            defaultMode: 292
+            secretName: orc8r-secrets-certs
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: configmanager
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: metrics
+    app.kubernetes.io/version: '1.0'
+    helm.sh/chart: metrics-0.1.1
+  name: orc8r-configmanager
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: configmanager
+      app.kubernetes.io/instance: orc8r
+      app.kubernetes.io/name: metrics
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: configmanager
+        app.kubernetes.io/instance: orc8r
+        app.kubernetes.io/name: metrics
+    spec:
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: app.kubernetes.io/component
+                    operator: In
+                    values:
+                      - prometheus
+              topologyKey: kubernetes.io/hostname
+      containers:
+        - env:
+            - name: PROM_ALERTCONFIG_PORT
+              value: '9100'
+            - name: RULES_DIR
+              value: /etc/configs/alert_rules
+            - name: PROMETHEUS_URL
+              value: 'orc8r-prometheus:9090'
+            - name: ALERTMANAGER_CONFIG_PORT
+              value: '9101'
+            - name: ALERTMANAGER_CONF_PATH
+              value: /etc/configs/alertmanager.yml
+            - name: ALERTMANAGER_URL
+              value: 'orc8r-alertmanager:9093'
+          image: 'fjvicens/orc8r_config-manager:latest'
+          imagePullPolicy: IfNotPresent
+          name: config-manager
+          ports:
+            - containerPort: 9100
+            - containerPort: 9101
+          resources: {}
+          volumeMounts:
+            - mountPath: /etc/configs
+              name: prometheus-config
+      volumes:
+        - emptyDir: {}
+          name: prometheus-config
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: orc8r
+    app.kubernetes.io/part-of: magma
+    helm.sh/chart: orc8r-0.1.3
+  name: orc8r-controller
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: controller
+      app.kubernetes.io/instance: orc8r
+      app.kubernetes.io/name: orc8r
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: controller
+        app.kubernetes.io/instance: orc8r
+        app.kubernetes.io/name: orc8r
+    spec:
+      containers:
+        - env:
+            - name: DATABASE_SOURCE
+              valueFrom:
+                secretKeyRef:
+                  key: postgres.connstr
+                  name: orc8r-controller
+            - name: SQL_DRIVER
+              value: postgres
+            - name: SQL_DIALECT
+              value: psql
+            - name: SERVICE_HOST_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: HOST_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: USE_NEW_HANDLERS
+              value: '0'
+            - name: USE_NEW_MCONFIGS
+              value: '0'
+            - name: NEW_MCONFIGS_WHITELIST
+              value: null
+          image: 'fjvicens/orc8r_controller:latest'
+          imagePullPolicy: IfNotPresent
+          lifecycle:
+            postStart:
+              exec:
+                command:
+                  - /bin/sh
+                  - '-c'
+                  - >-
+                    /usr/local/bin/wait-for-it.sh -s -t 30 postgresql:5432 &&
+                    /var/opt/magma/bin/accessc add-existing -admin -cert
+                    /var/opt/magma/certs/admin_operator.pem admin_operator
+          livenessProbe:
+            initialDelaySeconds: 10
+            periodSeconds: 30
+            tcpSocket:
+              port: 9081
+          name: orc8r-controller
+          ports:
+            - containerPort: 8080
+            - containerPort: 9079
+            - containerPort: 9080
+            - containerPort: 9081
+            - containerPort: 9082
+            - containerPort: 9083
+            - containerPort: 9084
+            - containerPort: 9085
+            - containerPort: 9086
+            - containerPort: 9087
+            - containerPort: 9088
+            - containerPort: 9089
+            - containerPort: 9090
+            - containerPort: 9091
+            - containerPort: 9092
+            - containerPort: 9093
+            - containerPort: 9094
+            - containerPort: 9095
+            - containerPort: 9096
+            - containerPort: 9097
+            - containerPort: 9098
+            - containerPort: 9099
+            - containerPort: 9100
+            - containerPort: 9101
+            - containerPort: 9102
+            - containerPort: 9103
+            - containerPort: 9104
+            - containerPort: 9105
+            - containerPort: 9106
+            - containerPort: 9107
+            - containerPort: 9108
+          readinessProbe:
+            initialDelaySeconds: 5
+            periodSeconds: 10
+            tcpSocket:
+              port: 9081
+          resources: {}
+          volumeMounts:
+            - mountPath: /var/opt/magma/certs
+              name: certs
+              readOnly: true
+            - mountPath: /var/opt/magma/envdir
+              name: envdir
+              readOnly: true
+            - mountPath: /var/opt/magma/configs/orc8r
+              name: orc8r-secrets-configs-orc8r
+              readOnly: true
+      volumes:
+        - name: certs
+          secret:
+            secretName: orc8r-secrets-certs
+        - name: envdir
+          secret:
+            secretName: orc8r-secrets-envdir
+        - name: orc8r-secrets-configs-orc8r
+          secret:
+            secretName: orc8r-secrets-configs-orc8r
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: grafana
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: metrics
+    app.kubernetes.io/version: '1.0'
+    helm.sh/chart: metrics-0.1.1
+  name: orc8r-grafana
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: grafana
+      app.kubernetes.io/instance: orc8r
+      app.kubernetes.io/name: metrics
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: grafana
+        app.kubernetes.io/instance: orc8r
+        app.kubernetes.io/name: metrics
+    spec:
+      containers:
+        - env:
+            - name: PROMETHEUS_HOST
+              value: orc8r-prometheus
+            - name: PROMETHEUS_PORT
+              value: '9090'
+          image: 'fjvicens/orc8r_grafana:latest'
+          imagePullPolicy: IfNotPresent
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 3000
+            initialDelaySeconds: 10
+            periodSeconds: 30
+          name: grafana
+          ports:
+            - containerPort: 3000
+          resources: {}
+          volumeMounts:
+            - mountPath: /var/lib/grafana
+              name: grafana-data
+      initContainers:
+        - command:
+            - sh
+            - '-c'
+            - chmod -R 777 /grafanaData
+          image: busybox
+          name: volume-mount
+          volumeMounts:
+            - mountPath: /grafanaData
+              name: grafana-data
+      volumes:
+        - emptyDir: {}
+          name: grafana-data
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: prometheus
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: metrics
+    app.kubernetes.io/version: '1.0'
+    helm.sh/chart: metrics-0.1.1
+  name: orc8r-prometheus
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: prometheus
+      app.kubernetes.io/instance: orc8r
+      app.kubernetes.io/name: metrics
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: prometheus
+        app.kubernetes.io/instance: orc8r
+        app.kubernetes.io/name: metrics
+    spec:
+      containers:
+        - args:
+            - '--config.file=/prometheus/prometheus.yml'
+            - '--storage.tsdb.retention.time=30d'
+            - '--storage.tsdb.path=/data'
+            - '--web.enable-lifecycle'
+          image: 'docker.io/prom/prometheus:v2.12.0'
+          imagePullPolicy: IfNotPresent
+          livenessProbe:
+            httpGet:
+              path: /graph
+              port: 9090
+            initialDelaySeconds: 10
+            periodSeconds: 30
+          name: prometheus
+          ports:
+            - containerPort: 9090
+          resources: {}
+          volumeMounts:
+            - mountPath: /etc/prometheus
+              name: prometheus-config
+              readOnly: true
+            - mountPath: /data
+              name: prometheus-data
+            - mountPath: /prometheus
+              name: prometheus-config-file
+      volumes:
+        - emptyDir: {}
+          name: prometheus-config
+        - emptyDir: {}
+          name: prometheus-data
+        - configMap:
+            name: prometheus-config-file
+          name: prometheus-config-file
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: prometheus-cache
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: metrics
+    app.kubernetes.io/version: '1.0'
+    helm.sh/chart: metrics-0.1.1
+  name: orc8r-prometheus-cache
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: prometheus-cache
+      app.kubernetes.io/instance: orc8r
+      app.kubernetes.io/name: metrics
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: prometheus-cache
+        app.kubernetes.io/instance: orc8r
+        app.kubernetes.io/name: metrics
+    spec:
+      containers:
+        - args:
+            - '-limit=0'
+          image: 'fjvicens/orc8r_prometheus-cache:latest'
+          imagePullPolicy: IfNotPresent
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 9091
+            initialDelaySeconds: 10
+            periodSeconds: 30
+          name: prometheus-cache
+          ports:
+            - containerPort: 9091
+          resources: {}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: proxy
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: orc8r
+    app.kubernetes.io/part-of: magma
+    helm.sh/chart: orc8r-0.1.3
+  name: orc8r-proxy
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: proxy
+      app.kubernetes.io/instance: orc8r
+      app.kubernetes.io/name: orc8r
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: proxy
+        app.kubernetes.io/instance: orc8r
+        app.kubernetes.io/name: orc8r
+    spec:
+      containers:
+        - env:
+            - name: PROXY_BACKENDS
+              value: orc8r-controller
+            - name: CONTROLLER_HOSTNAME
+              value: controller.magma.test
+            - name: HTTP_PROXY_HOSTNAME
+              value: null
+            - name: HTTP_PROXY_BACKEND
+              value: orc8r-controller
+            - name: HTTP_PROXY_DOCKER_HOSTNAME
+              value: null
+            - name: HTTP_PROXY_GITHUB_HOSTNAME
+              value: null
+            - name: HOST_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+          image: 'fjvicens/orc8r_proxy:latest'
+          imagePullPolicy: IfNotPresent
+          livenessProbe:
+            initialDelaySeconds: 10
+            periodSeconds: 30
+            tcpSocket:
+              port: clientcert
+          name: orc8r-proxy
+          ports:
+            - containerPort: 9443
+              name: clientcert
+            - containerPort: 9444
+              name: open
+          readinessProbe:
+            initialDelaySeconds: 5
+            periodSeconds: 10
+            tcpSocket:
+              port: clientcert
+          resources: {}
+          volumeMounts:
+            - mountPath: /var/opt/magma/certs
+              name: certs
+              readOnly: true
+            - mountPath: /var/opt/magma/envdir
+              name: envdir
+              readOnly: true
+      volumes:
+        - name: certs
+          secret:
+            secretName: orc8r-secrets-certs
+        - name: envdir
+          secret:
+            secretName: orc8r-secrets-envdir
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  annotations:
+    helm.sh/hook: test-success
+  name: release-name-mariadb-test-mhow6
+spec:
+  containers:
+    - command:
+        - /tools/bats/bats
+        - '-t'
+        - /tests/run.sh
+      env:
+        - name: MARIADB_ROOT_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: mariadb-root-password
+              name: release-name-mariadb
+      image: 'docker.io/bitnami/mariadb:10.3.22-debian-10-r27'
+      imagePullPolicy: IfNotPresent
+      name: mariadb-test
+      volumeMounts:
+        - mountPath: /tests
+          name: tests
+          readOnly: true
+        - mountPath: /tools
+          name: tools
+  initContainers:
+    - command:
+        - bash
+        - '-c'
+        - |
+          set -ex
+          # copy bats to tools dir
+          cp -R /usr/local/libexec/ /tools/bats/
+      image: 'docker.io/dduportal/bats:0.4.0'
+      name: test-framework
+      volumeMounts:
+        - mountPath: /tools
+          name: tools
+  restartPolicy: Never
+  volumes:
+    - configMap:
+        name: release-name-mariadb-tests
+      name: tests
+    - emptyDir: {}
+      name: tools
+---
+apiVersion: v1
+data:
+  MYSQL_PASS: cGFzc3dvcmQ=
+  MYSQL_USER: bWFnbWE=
+kind: Secret
+metadata:
+  labels:
+    app.kubernetes.io/component: magmalte
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: nms
+    app.kubernetes.io/part-of: magma
+    release_group: release-name
+  name: magmalte-mysql-secrets
+  namespace: default
+type: Opaque
+---
+apiVersion: v1
+data:
+  postgres.connstr: >-
+    ZGJuYW1lPW1hZ21hIHVzZXI9cG9zdGdyZXMgcGFzc3dvcmQ9cG9zdGdyZXMgaG9zdD1wb3N0Z3Jlc3FsIHBvcnQ9NTQzMiBzc2xtb2RlPWRpc2FibGU=
+kind: Secret
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: orc8r
+    app.kubernetes.io/part-of: magma
+    helm.sh/chart: orc8r-0.1.3
+  name: orc8r-controller
+type: Opaque
+---
+apiVersion: v1
+data:
+  admin_operator.key.pem: >-
+    LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBdERyNW9xT0pvcEdQRCtpZnZIT0dJSFNTVjZwNVpCSHU2UHRtdm00UEZqajJHUDBBCm5WRFA0RWdnWksvUnVWTnEyOGtyNi9ycTB1dTRocDVWV1EzNi9oV0ZRRGkwdUppMmVxVGo5TnVsSEdyUG50N20KN0FwRlM1MFNrcFNyb2ZVUUJHK1VZa3VqS0pyUUZMOGRJSjdzSkZMQ3Ixb0dZTU4yRW5jNDA4Y09DME5YbTV1cgpUSHY5eHlwVk94c2srZTAzVTFKOGNOSmVlbEYzK2o3TG5BTk5NVmJhbVVRaUJNRVJIR29KOWRlcStaQjdKbVRrClpGT2FwcGREYjJYZHJmRmV6bEs5eEhJc05FM1k5QXErWEJKbGRCVkQ4eDRidG51SkFjdHZJaS96OGN4Y0ZmQ3AKMWdGODVKNHlQdUhDU0FmWUYxS2FuanYybitCVXBLYkliVEN4YlFJREFRQUJBb0lCQUhJUnpZUHhhNkEzN2tzTQpXV1ZGM01OWDVIT1YwdVRTTU5yR214MjF2Tmk4em8yOE81SlYzbXUrV3JvL1NVYTVsQzF0SXQ1bFhoQ0czckJkCkwvbUFUclpYMnBGdUVudXZNL2RsdTExelV3b3NWQ0hpUkZkcW5MY2h2K3FFTENrQ1dOUGw1dzFiZi9Xb0hrQ3oKUVBVdmdKZnd4WVdFUGZzcVd1V1BEYW1FRjlCcUMraXpDU1RHd25wdVpITHRsL0x5ajVOdzVvVEpNanF4YTVnbQo2eEFwdEt6T1NDWEpDMjhHSFlMNEtYMjh3TCsyOEtnQndkL25qQ1JLNTFVU3VkOVpUQnBnSUpjN3NFYkUwa3lBCmNmdE5VdVc2aG9Jd0I5WGxCUmhlcm5xeVJRL2x3b1lQTnNFOGZJV0htRGdBczlvNStObU1saTZTdXRaMFNTYWEKTTlZOUpvRUNnWUVBMG9CV05zZnZnZElWN3NuREwwNmpjZjFhY0EwTEN4NUxGZFFHVlNzbmdxOXArTmhDNWNVNQpLYzJiTFpUcFhVVVdzM0dUVUJ3Sk9HSFhGOGdFTDdxNXY1S3RDUUl4U01qa1F1N2IydmdOV2pPaDdPYlV2ejJUCkF2c3RYdGxrbVNRd2x5Lzg5Z1RzMEIxUlpwRkFyRGxBNnp2UHFFT2l2ZTRSdGdIN2JROUtBczBDZ1lFQTJ5K28KTjV3RlRUOTgyS00ySWYzWjhOalRuZFNDSFcvcG9pVzJHQzJ4T3poTHlTNy9WdGtqS2daQ3RYVzhCLzl3dGlFZQphemszWjhHYkdVNGpFcmR2cWxIUERSbUZYaE0zZzRpaHRpaStibUlDbXNFZmdwYjcvdUVzclNBOEh3RHFiUlN5CjR5aGwycVFia0pMTGRObk9PMjcvQzNEM05aQjNYeFExc2U0QnFTRUNnWUF4VnJWZWQ3UnlxRXhOd09ySDd0V3UKaFNTcWVOUXEwZm5sYnVIaEdwRlROMHhPY0ZvVnd3bG4rL0l3VitQdTRaKzFoWnh5dlcrSDBKNzZ5djM0TmZzTgpwUko3dHhEWUw0WVpEaVZvQ0pZUW0yT0x4SHIvTEM2R0YxdUdETXhnZkxRSzY4dU4ybytySkFRTlYyUmlPYlUyCnJiazVoa2poM2FnM0VmWGRsU1RTelFLQmdRQytGU2RhQ3BsaWM1T093SVFhbUc1Ziszb1IzeEJ6L1BEdGFLengKYlBiTmQ3WHBwRE5XR3ZydTMvME1KeTFJOWxMRjhCVFVRZ3QxbEtZd0hONDN4aE0xN3JxVURyVGxiOTd0MkJqOQp3M25hZW03dHpGdktRYXdLVHpjU2NPa1NyaFdmUVpzZGVwUlNONDJjSkdJRFZUd1B1T1BBQlZpdUFEbzFuMjR0CmYwMjdZUUtCZ0dYWHowR1lEeTE0TTR1LzV3NzlqWTdPeXg5ZTBsbmxtak1wKzRMR2hic3N5RUdyVm1RazJEZzMKMkZaVEIyYmd4TnhaZjJCQ1lXbkV4RTlSd012N0FkbEczN2lJOUVmWHlwUUxESWF3eURrdXlsOFc3cUdoejd2MQp5THJJQks4YW1BWFQ2RVNkQzI4dE93YndtZ2dVSENOdE5rZXpDT3hnTy9SVWJRdnFmK2gyCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
+  admin_operator.pem: >-
+    LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURTRENDQWpDZ0F3SUJBZ0lRVnJZeUQ1YlBSNUhlblhoUUpyZTEvekFOQmdrcWhraUc5dzBCQVFzRkFEQXMKTVFzd0NRWURWUVFHRXdKVlV6RWRNQnNHQTFVRUF3d1VZMlZ5ZEdsbWFXVnlMbTFoWjIxaExuUmxjM1F3SGhjTgpNakF3TXpBeU1qRTBNakU0V2hjTk1qRXdNekF5TWpJME1qRTRXakE4TVFzd0NRWURWUVFHRXdKVlV6RUpNQWNHCkExVUVDaE1BTVFrd0J3WURWUVFMRXdBeEZ6QVZCZ05WQkFNTURtRmtiV2x1WDI5d1pYSmhkRzl5TUlJQklqQU4KQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBdERyNW9xT0pvcEdQRCtpZnZIT0dJSFNTVjZwNQpaQkh1NlB0bXZtNFBGamoyR1AwQW5WRFA0RWdnWksvUnVWTnEyOGtyNi9ycTB1dTRocDVWV1EzNi9oV0ZRRGkwCnVKaTJlcVRqOU51bEhHclBudDdtN0FwRlM1MFNrcFNyb2ZVUUJHK1VZa3VqS0pyUUZMOGRJSjdzSkZMQ3Ixb0cKWU1OMkVuYzQwOGNPQzBOWG01dXJUSHY5eHlwVk94c2srZTAzVTFKOGNOSmVlbEYzK2o3TG5BTk5NVmJhbVVRaQpCTUVSSEdvSjlkZXErWkI3Sm1Ua1pGT2FwcGREYjJYZHJmRmV6bEs5eEhJc05FM1k5QXErWEJKbGRCVkQ4eDRiCnRudUpBY3R2SWkvejhjeGNGZkNwMWdGODVKNHlQdUhDU0FmWUYxS2FuanYybitCVXBLYkliVEN4YlFJREFRQUIKbzFZd1ZEQU9CZ05WSFE4QkFmOEVCQU1DQmFBd0V3WURWUjBsQkF3d0NnWUlLd1lCQlFVSEF3SXdEQVlEVlIwVApBUUgvQkFJd0FEQWZCZ05WSFNNRUdEQVdnQlRlZ1BVME4zWHZrWHpOYVFRWHhFNHZnWjhpUHpBTkJna3Foa2lHCjl3MEJBUXNGQUFPQ0FRRUFBMzRsa0hvbDBSZVkrdUNGVk1lTlpYSEpENlRVYnNPR3NhYVNlZXJzQytWQ2xZamIKaFhXVXFVZzZ3aFFFVmF6R1RpcnNYOFBESTZEWmluc3ljTVlheE1xdkptQVVZK0tBVDVLRXNCRDhVQUVLdE9oegpjV3VKVGM2SFUxMTZtSFRiSW54Z0FkRUJlcks2OWJOMjMxNWQ4RU1KMUlIL1RCQWRNSkRiRkhvSzlMbi9XM1VaCmMzWnFmNit4bVNkUmtmbE9UYmtGdHQrZXEwMktDM213V0RJQk00aXptNkM4dXpGWkF2Q2ErUHlRUEpyZ0VXNnoKNHZKbGpRcEdiVGdlSkt0aUFqS1k1QmNxb0kvTUZOdlNYaWhDWXdUQzU0Q2JhZ3lqdjNwN3BGbWF6b2hVekM2TgowZ0RIMnBJcCtWYmFOa2s5SGp4MldRN281THl0US9BQ0IzUzRDUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+  admin_operator.pfx: >-
+    MIIJiQIBAzCCCU8GCSqGSIb3DQEHAaCCCUAEggk8MIIJODCCA+8GCSqGSIb3DQEHBqCCA+AwggPcAgEAMIID1QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQITDbvoP9XSXkCAggAgIIDqL/1/Zx1eQK+yKN3Q63raicyjo/hQtd2ySAxPY00UEhDwswlUjKHJfYt76ZEjuX1raumnE3pLZWlwcjEzwt5x7W4ynCvFz56RclDh3+2YfcXwPxjeDdO8uNeUph2qxwFLCFkGRX0stIdqNLqGGO7ugUuxXlAtEiXFZl6KB4P4xTpImicH9ZGbI/1QYubXaJAEK41jF6nlZfnVANv4L/9JyLjxeGkP9G2q9Twgvwx0HToRkVk408fQlKNZX1CmUfp3sza145p72rjOW4JhuRWTSaw8SS3nOlSQlsqkC4F0ojeWv7v4k01uMjWHbehX1cKvKnKuT5FsYy1wXsZAt7e2+MlvQl6Mo2Hdwucmcgn2e/qBI2xSj+gko4chPAepCwLWQNbkxdqmO/gMYnDENn7jq1K+Qtqnq0ckLtnaNE5aPzqq0qFf68mKmuJTQdrfpER3fHRk1irkd2H/PEoxx9xLdfHLIZVNd6Be9JshRsHM/LUyX0L1jXwb+dHOsZn8LxSgYFJ7N28McH0WSwcOdyjXf/OGdVDiRzG72LGnDAgglB73nOQd/KlOMG7GNUPy7P3R6XJbSOA+CVEQRBwm5o0NkapZ09B2obhGbX6pA0ddvNHKaS8J0Zr6UGqgdkAV52LXabVA/dPClB5jeRUVKOkqh0bbAnfgHLZSBUcs3VJgpMpoJOjEEtKuSPfw2EElOLRkw2enZhW+To4Dc78epN08vlTVYwbeqH17J4YijXFdp+rHkG9vgn+s4cXhwuJDoEY60nSO1Tkf4FmIM/CxW2Gk7P/erv4wMsu0qLoXI2oGY59YPRXhJeaKYXx30nAWA3TA6zKd9y3H5NxhNqBWxbWLFXuzEdqKHrfLBy8fD/tvmhJOVX4Q8X9ZhJVBe6Y44Rd75X4m2hAkdZXQZE30G+XfD0BLwZasWPK7cHGJDPU5O+SnCdIw+pkjUZ4NC5irEeVLdmDfVr0zLARDP4dko05arLWSKldqYqsNw975mlOtVNTdDSr9CQu4DdH5AMxqijvI27SBGKwS5eEtPacDKGQCLU2mR47H81+ym2Qo/Q+DYAzMXoXorzcxl9kC+GP5vxnSfj9aar/JmWcZ486WvpnVB9hm+Qb69pEiRvm/DWg1nzPjXvMvBLzi8FesXicvXYjn3GEHdpSoJ/cPYUSt+9P+lSn9sFWGvWOt6F8ab7AH2ZhiAwAjfIyz2rE1QWEoK62+XUH3SGDOLRtyWvpJM6OLbJT+YmhDYsFBDCCBUEGCSqGSIb3DQEHAaCCBTIEggUuMIIFKjCCBSYGCyqGSIb3DQEMCgECoIIE7jCCBOowHAYKKoZIhvcNAQwBAzAOBAgOjOiW4PUxEgICCAAEggTIT/oYef8LHyIgh26c9d3oe41M2thSVo59QZ3Pbb0gSI8tyCt50gPsTyEFXIpIViwZdKCj1nJ/uv9UnM0ql8ZWZNdEWioEerGyP4C9vPO167pIPOsRkNnrmh4gc1IyP8T7y0TXEtluUdAwPf1ZvfJ36f5a8M/DHLEtw4CLn6P3zWLrNTAA1sdI7Fpd9ZjcsHV52bQhbSLB7JXXacQtELTVJJQ8KeETYAkeKLaLBAClnb+AUWBI9zFwHg960Wr0a4PdO41b3LUWK5Fwv+GBTuud7LIr7ghVy1do34H14JUIlHerS1RxllYp1ON+/3VXoMcVcpSWNukoDqUxq9eXHnUspN2mP88lWC43oK5qTpRt2d4chsFlj6Qwn+ICFtojez+InXzYOONeHaQLt4DVaZpmvifHXXh2XfJNNZuy/jhsNXJcAqV9Cjfuuwb4wPND4ydIDaeurU9uBuaIx6UrxwLdhLOTNc4ay/J/wCcS4s/ZMWtBsbGo4flCwg8mF5RAIxjcEE/tkyC7loQum5JxyHtNr8Y9rVNATOm2Yrq9Q94c0PWZEhzaQ1fgI5+Ves0VpX4opw86IQa+h0g76XPO9gZBLZyYn0HlLnIZytsn5chGgOHpR8TUbkM4VTFHcNr3mFoUYe/FZZ1fqKXvMxobLkFFHJjPj/c2Ubi34nJ+dcbOYprGkGN728fyB4MDMDsIrSx5Al++nksPfelKuXwtpAHuf4ieotxwOis+R/hak3+IwdJOpB6VW56I78qn+LcuqtaqgdSeTg3VNDr5CWmz6np+ceINL2fJbRp4gc5zgo8HoFxjIuT61ropufZgfbyoEnqTABoU2Ejfwt/dIY4bfyz4+anV6yWJUxgjIzDusWJUzYOTIyf/VUKzIzalXl6sEdBOAoKb/QeTIn30/ZuYBvxPLb2UKBvPY9EKpc9lWMqi0VW+kU2N1bgnrpU13VyKlwPqx5lD+AGBvUDteu6+skktu0fGd7XEriaSFshe4mQJXdpvGJP/0k0qOJtwws4rzIhd9qFwk2hej3ltyLWf2lXHrS9QDJ5vJOey5T1z/z9Qs2MxjCnu+/bT8M7TSrqES0lrMHjixb7PtiWbsLGZXZIXktwfDVKX/p62n2cgR6f3hzamAqSwTkehQk5lNwjwuSMy96C1gZoF0VpBWSRRYUh7mKkNzFfbb9vJQuqxa7D6xwRf2DZyHzLb1ZqWJYTEEONzxFCIkaSiPbgZH7EgVmBMjQwO5rxg4ST5//C8l+m3gFz2YhVC4vyb05ftp+oMSnt6YaIDZnAEsyeOsrsBVcXAZYkRD5bq94cObvdviwJIkt7h/+h2tcUUu0xwQYIdK4PtXmpQzvfzkv8igOSddc91oortXtD1rMtR8XP8HRhaeJiGj/j8AoRgPnliF698yIE3JhFqOgRQFbOYw+Qwvo3j/RPticTJXmY449DtBM7U/uQrU0Nss8O3vEoieDtftaWKUlLh64pZ+68QjHLrIbsjZy3fqi9MTZzB840tiy8e6m3FRNv/qfxeXWsU/wWs+uYMrlW16gu9bJ/qiwxkOMuGuwWV5Vfyey1A94pr3UjfsngNRC2yKA46k/NK50NUE4C2n1B/HzbBWTMZceic5fkxM8TD8m47k8cjMSUwIwYJKoZIhvcNAQkVMRYEFCpd3MUqThL8/z2agIRxn6ao+CGzMDEwITAJBgUrDgMCGgUABBREZuH2bA43RiDgs1wtunP4Vx+nLAQInDsgg6O6l7ACAggA
+  bootstrapper.key: >-
+    LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBNGlQekZZcVV2UG1CSDNpNnJXTEdmY25IaEJTZm5FL2QzZ3dic1Y3b0lzMVZRWG5GCmx1ZnUyRlV5ajQ3cEFDWmJFVVRRQjZVbWpEZU10Z3ZzNVhiQjdmNG9XOWRiQUs0Z3NFUmluckJnZS9GS3c4UnkKeGsyRVZVWXplemVmaTJFNW0ydk4yZEhCZ1BqR2l2T0Q3ZHQxR3BJMXd5RHhQYVJwbWZtVHlTb0ZGNW16SzJTZAp3eGlNVG55VUUxaWJNbU03RjRGVHcrN2hQWUtsaTZ5UStpL0hHR3lELzEzaVNuK3FQaCtLenNXRXRlYnZzWEU4Ck5Oa1FqUGxwcm1Jc1JpLzVkeCtiQm04VXlUTm5GakMwLy9DOE9UekkwOFBXY0pNVmo1cFpVUTVxODJRKzJYZW4KWS9rVFpnM3I0dWJlbGpickdmYUxWbzhKNDAzQXpaankwcENuT1FJREFRQUJBb0lCQVFDejFXelpJNVIyMTEvRQp2RWlQMjY0SG1EQU9yQ3ZscldtOXpCazFxMGlsYkc2eEcvcHlzRXl6UXNWcmZuVnlSZzVEcEZwZXlnbm1sY0pUCmZ4Wkx3RzRtS2VqRWFIVVpER0E0YkptVW9xU0h5L0h0enNxTFFsZkxUSUZpS25DNDhYOVRScDZ6Nm1lY2ZibSsKQkR0Vkt5RnNHUHVpQ2c5dU90SXp2VksyTmJGSSt0WFlpbURDYzJKYjZpNHhyS244aWVoajJsS213bnpzdXZsbwo3eWdZNEtKeVN5dW1nU0l1QU1sU3hhTThEZjdVR0VaSzZremZiRTdJWFJFSWIxWkdFai9HcUoxMjVwZFZBWSs3CmZFWE02ZmQyUU01V3ZicXUrZ1hlWG1yWXlNSHQ3MjBZanM4TjlGNnFtU2RrOHZRbVg4QkJqVVp4Q1VKbmlLaE4KdjJtOEtlZTFBb0dCQVBOcTdvdHRIclQ3UlJJVWhiOE9NN0JLb0ZJNi80UW15QzNJeEYvd0lJSHJUTG9ENTNNaQowMlJ5NVZRejNIL1VuWkJ2NXU2cUNNVVY2RWVVUWIvQi84N3UzRkZtbWxadEJQR1QvNmQxaUl1cGVLSTdOOTJzCjFYR0R2Qk1PZmNmb1hRZ2pCT0RETTMxelBXd2FSMEE1em02cUhxeXlxeFIwcG5qcjg4UjJzUXY3QW9HQkFPM1UKWktNcThPUndUdCt1NUJmTlExYUhHRjh5YmJ5aHFsN1VEOW5oVWhUOVdnazdLYTl6NUp0bkhaaUhJTjFNYVphUgp3L09UTUJHRkFndmpMYzVBK3JDT3JSQUNOL2NoWFl3R2FkbG5UQWIzS2J2QzlqWTY3L3JoRkFWUk1LWEN6TTMvCmkyNW1QaktNaGJ6NDV1K1FvTno3TXg3UytBSG5wcXJtcEdTT0toOWJBb0dBRjM3ODQ2eDJ5RlZ3eDF2L3hQOWoKOGVKaU0wM0ttRUQrRloxSmgxRXdjaG42WUFJOGR4cW5lUXkySWppWFVpZDl4aEZuSXlaNmpqdWRIanVyVlEwdQoyaFNvWTVzWnpybmJQazVnNFJNeFNQbmswUlFTUW0yS2ROaVljT1ozTWJLMk9ERFpLYkR0NlhBVVA3a1JvNXR3CjE3SElJRGRtMkNTaVpRMnhqQWRBODcwQ2dZRUFuM3o0UkFldTViSis0amdaVS9EZHdHLzJJeGpoU0VjdHhrdjEKbVVvbHpsZWNBbWEvYko2T1pyeCt0Mk9lNFdpMXdqaGNMTUsrMEhEZXozUDRxc0VlbkRvQnlxT0NQbU1NcGJORApWbnlVR25PemMrdXBTdks1TGdlMGNtQmcvRGduT2RtdCtrbnNXZCtzYSs2S2g0cjRwVmg3anFjeGs2MXlNbGRiClZPZVZUZE1DZ1lBSHd3TkJZMkRicjk3MXd0RDdEUzVwY1NKSHpsSTZ3T2FiU1JtVHExK2Nxa1dlbGdEcDFDcW4KbU1XNi9TM0JLV0t6MUE3ejN6bU1VWkZsSGlmRi80ZGRGT3MxWXBydlJSeHVKRlBpcEt5dnZ5T1RiUGpTOW5YNQpCaktZWDFwWWREZ2Z0NGxFMFM1V0s0dkozaGRJeHFJcUhYMzZBVXZCbSs0RXlwT1ExY1BESXc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+  certifier.key: >-
+    LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBdWNrRGtpR1plUmNmWGUxbVgyUHZlQ1BqRGRvMloreXRQUWpqdVdrMUxOamdMeHErCkJWNTY3TlI1ZFQ0Qk00OTRoTjdQZTRieGhmMEphTEJZVkY1cVRaUjc0YUtrTkZkdGE1Qlo0Qm85Rnl1cmxLS0EKdktNc1QxMEYwTlZJOVRlM1V5NllLSkRES3JnQVNMdW5NTHprYjZMMlpaYVF3aTVWZlg1dXFMNEJoSXJuU1R0bApKNlM2TmNYTHZoTFVFdDJoNFBpazRnYzVlZkM3dkJaSGdkd3o1cG5qNEZ6ZTZkYzk1VE1zQnMxWnVSeEwrKzIyCkJxZEliaFBHMExlRVNkaVV6TGhXNEdLRUVIZHhUc3Z2SzBkU2habHdlTkp1Y01TaEJkNDk4dWxpNXExdEk5M1IKUG16dE1KSTloaXVMTjBGZlcxYjBqVGFFZVdNR3BlR0FBczQ3Z3dJREFRQUJBb0lCQVFDMWJ3dWZzRlJ6SHhPdwo1T0R2RTJlUHltdzQ0UHYwN2Z3WStROTd5TFQzZ1MwZWsxMHpYUnRySWUwamhGUWtDRjdJVTlnSWFMYUNCYVVrCnFlTDVNZU5hdEVGdkR5aVJQVGhNcllJNEN5ZlI4d0h6ZStlQlVWRTZpRHZmd0FzcC95bDNnSzkwSGp1YkFtcTAKblI0ZnlMakdGVDNQNUFTbXZoMGJHMWZ5VHV5b2hGd0ZkSmdPVHBDVnJoMU8xQXJudndzY0NEemk4cWFLeTRQTgpVMVVzQkxFcUtMdXZBek13ejkyM3NmL05BQWtKWHdEanZYeWFGWkFLMmpuQmx2QlpVcUtQcUR3RGZrOElLV01xCmJrdTJYSmFkN2g1USt5MnVncktQRE94bG5nbmZaYWlOd2NsUllwczJPcndDclJhdmZvMFdmcWpHWE5EWHgrcmEKQ3prL3NBenhBb0dCQU9SZEJ3NW04V1JHekpQOTZZOEhFUlVIdmxXNHp4Z1l4ZG9NN2RzdzN2a3IwQkYzUEx6RgpqR0g0U3UwYkpSNHlQRnJyNUI2LzBMWGh0RzBTTHEwSjAvTmZ1NkI4bHZpTTNnRkZYWmFVd1BYN2dncWRDQ3AzCk1rbkZ6NXc2bytGS1NjVlp5cGQ5MWh2V2NaWktFRHVyZXNSeklhSU5nL2xRVEllMnhRWmg4M3RYQW9HQkFOQkUKM1B2S3Z1aGlTWC9UR1dZMndnVGpkRDFmY1lPL0tBWDFyK215OUdTWTBGZWp0ay9XRnpQY1JOUXpLdVo1MDdlTQpxZ0FqbjJQQmtkbTlzeVRNY1JkMSs5Tm44QXUxU3Nsck5NVnlLaTg0QU1ZTEMvRFp5WUM0ME1HQUt1S2FKS3BrClFMOTBsNERjL05odGQvK1dEdndKTFNBY3dBclhsVmhvU29oUit0RzFBb0dBRmJnSFNNWmZwUExhMkNScEJ6SmIKM0kwcy9BZ2tvaDBSRENqNG9rVW1uN29jQXQwOVNKTGRSQ0FTT0RUQnRmcC9KUUtVWXB4SnBGTEFEek9RZnVLVgpadXN1OUJlRllFUTloUTlzMURwM2s2MkU4NjkxckZ4RHl5Sm1HV3kyVTJIMlhDK3JCZmR3MnBydG1LYVlucVF6CmUrV2JTRWRTeXU1cEtPc29GL0JPOE9jQ2dZRUF0VHpuN1RtZTdrengxd21XRmN2YkJUUUdhSTRSRTJ3YTRTelAKVzVoK2NyaEV2YTlhckprSzhmZGg4aU5nMXRYM2RzZ3kvQklEMTJTUWpxSTFMZlczQ0lxRWpaRHFaTlhyOGVHWQpONlpFclhpWHU3L0xNVm5rcjE2bFUyNDhZNXR1QXRWaFB2cXdDTlRHTjNUenN2Z2JyQm8wS2JpN0tmUTNJNHNHCktTRG1HdTBDZ1lCcEVFWTUxczFjM2NHNkRIekZYeURjcGUwTXZoMTV5Sit5UU4zb0hFajFibmlSaGtqTFlsTDgKU1JaWkoxcnRsRWxEWGxxS00zVVZiYzdqMGxIS2NpbVZxQWdRaUNJYVBoaTBFaXl0S0I4ckQ3NERJMzM5QkxlYgpPS3ZFVWZIeFUzUm13WDMvYmJITnI3NjAvWXkzS1U0TzExa2RiV2ZjTnQ2V1FwczVwUTVCRUE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+  certifier.pem: >-
+    LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMVENDQWhXZ0F3SUJBZ0lKQUxiQ3ZZQithNE5TTUEwR0NTcUdTSWIzRFFFQkN3VUFNQ3d4Q3pBSkJnTlYKQkFZVEFsVlRNUjB3R3dZRFZRUUREQlJqWlhKMGFXWnBaWEl1YldGbmJXRXVkR1Z6ZERBZ0Z3MHlNREF6TURJeQpNalF5TURsYUdBOHpNREU1TURjd05ESXlOREl3T1Zvd0xERUxNQWtHQTFVRUJoTUNWVk14SFRBYkJnTlZCQU1NCkZHTmxjblJwWm1sbGNpNXRZV2R0WVM1MFpYTjBNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUIKQ2dLQ0FRRUF1Y2tEa2lHWmVSY2ZYZTFtWDJQdmVDUGpEZG8yWit5dFBRamp1V2sxTE5qZ0x4cStCVjU2N05SNQpkVDRCTTQ5NGhON1BlNGJ4aGYwSmFMQllWRjVxVFpSNzRhS2tORmR0YTVCWjRCbzlGeXVybEtLQXZLTXNUMTBGCjBOVkk5VGUzVXk2WUtKRERLcmdBU0x1bk1MemtiNkwyWlphUXdpNVZmWDV1cUw0QmhJcm5TVHRsSjZTNk5jWEwKdmhMVUV0Mmg0UGlrNGdjNWVmQzd2QlpIZ2R3ejVwbmo0RnplNmRjOTVUTXNCczFadVJ4TCsrMjJCcWRJYmhQRwowTGVFU2RpVXpMaFc0R0tFRUhkeFRzdnZLMGRTaFpsd2VOSnVjTVNoQmQ0OTh1bGk1cTF0STkzUlBtenRNSkk5CmhpdUxOMEZmVzFiMGpUYUVlV01HcGVHQUFzNDdnd0lEQVFBQm8xQXdUakFkQmdOVkhRNEVGZ1FVM29EMU5EZDEKNzVGOHpXa0VGOFJPTDRHZklqOHdId1lEVlIwakJCZ3dGb0FVM29EMU5EZDE3NUY4eldrRUY4Uk9MNEdmSWo4dwpEQVlEVlIwVEJBVXdBd0VCL3pBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQWJpWGRIdjdEc0lyLzh1NDROVmVUCmg3ZHNnZm9QRGkrUGdyYXJMbU9CcVpvMUJmdEplcis1c2F5T2tIRFdpKzdCdXBUVi9uT1d3YXA5cEZ1eFBya3UKM2xpcHVKK09zVk9OdFhCd1AzZUdJd2VJbVhHcisvb2JYS2NwU2pwcG5hOWxqTmw1ZjlVLzNiL0RyRHBjbytadwp4RWNNWmcyZHdnSXVWQ0hyZ2R4L3Qzam1NcnlvWTVBQndrSXd2MngvWmZwTFhHQ3dkUXRxRzJNVlU2R2w2MkxQCmZmKzhIVWpPTWVYZEd6c2czYkhqMFhpR0x3MTJkZ0l4VHBlV0ZseXJxQnNDMkxsOUsyZ0w4dldqVkhsM01Fd0QKVlR3QUU3UzBWVlllTGZsRTJuWmxEZzE4bXZhcUhHWEgrT2p2UGwyNWhlYU5mNUNRbTZUb1NuR0NkZ3M3ckNnTwp0Zz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+  controller.crt: >-
+    LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5ekNDQWJNQ0NRRDNqc3BmQ0pUNVJ6QU5CZ2txaGtpRzl3MEJBUXNGQURBcE1Rc3dDUVlEVlFRR0V3SlYKVXpFYU1CZ0dBMVVFQXd3UmNtOXZkR05oTG0xaFoyMWhMblJsYzNRd0lCY05NakF3TXpBeU1qSTBNakE1V2hnUApNakV4T1RFd016QXlNalF5TURsYU1DUXhDekFKQmdOVkJBWVRBbFZUTVJVd0V3WURWUVFEREF3cUxtMWhaMjFoCkxuUmxjM1F3Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQ2oxbUZYRzVUQkl5djAKS0kvYVI4RXp1MUEzdVBjeGs1dmg3ZVhNd1Fhb0VuWm5BaGhJTmFEQUJseTRQdjI0VjRqRU50MTQxSGVzakFrNwppUG9wQ1RwN1hQWm81QUpiWHFyS3hydmZJcnBMdkFsbm90KzdjQ1VPQ1N5dTk0eE1ac1R5N2cxbjJSQVVyTHM5Ck1jdHB5Nkl3RXg1V3Q5UUNxWWZFYWc1TWtRMUtrTThyeGl2SndCTlhsYkp5cHQzSytBNjJVVHpWaWpEaVdyeFUKR0k4RDdvWmY4NkQ4alJGWExRdlhmU2NsNmRpSHFQS04xakw0dnMyd3lzK3MyTUVSVksvbVZVY0hreEs0bEg3TwpXN044QmpEajhldEhvMCtsaVY0cGFJY001alV3R3hvWldBWU9FcmpzbGRyWkFFU25SSXBleU1mbFYvL2FjcTNNCkEvRklRKzh2QWdNQkFBRXdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRU1rMUNTejlsNjA2Ry9CeFpOZVFpU2MKUk5FQ3QyVkNkYTlKTExtSGttUDRNWWZJbTVqWncySnNzRlEwL2VqclA1by9ic09najJLWXF1VjRPbDNHaW5Gegpld2FDMXRFOXNWYmEwY0kra0IzR1RiSkYvbnBQd3lPRE5WVEVjWldzR2lYQ3E3dEE0U0w3RjhPK256NW5EOUNZCmVYTHg0dmtOcSthU0hQOTJUaUM5RlNPam1JM2ZUWlMwRjg1dmNZLzZVN25kc1lHVjBkWGZ2cXZEZ3lvRlhsVTUKaW1RMzFKNmhneWNtZFZFUmhtSHgvOFF1MVRoaHJUaVBKWjJZL3NwSTl1Y24wZWNSclRJaE5aK2ZnQ0pqc3ZIcgozUkRxLzQ1RU5pZlJuc2tEdWt3c3M3NE9ONzJRazg1MEhTaEJ2ZktWbXpyZVhoZTgyZThjR0s5WVNuaFk0U289Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+  controller.csr: >-
+    LS0tLS1CRUdJTiBDRVJUSUZJQ0FURSBSRVFVRVNULS0tLS0KTUlJQ2FUQ0NBVkVDQVFBd0pERUxNQWtHQTFVRUJoTUNWVk14RlRBVEJnTlZCQU1NRENvdWJXRm5iV0V1ZEdWegpkRENDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFLUFdZVmNibE1FaksvUW9qOXBICndUTzdVRGU0OXpHVG0rSHQ1Y3pCQnFnU2RtY0NHRWcxb01BR1hMZysvYmhYaU1RMjNYalVkNnlNQ1R1SStpa0oKT250YzltamtBbHRlcXNyR3U5OGl1a3U4Q1dlaTM3dHdKUTRKTEs3M2pFeG14UEx1RFdmWkVCU3N1ejB4eTJuTApvakFUSGxhMzFBS3BoOFJxRGt5UkRVcVF6eXZHSzhuQUUxZVZzbkttM2NyNERyWlJQTldLTU9KYXZGUVlqd1B1CmhsL3pvUHlORVZjdEM5ZDlKeVhwMkllbzhvM1dNdmkremJES3o2ell3UkZVcitaVlJ3ZVRFcmlVZnM1YnMzd0cKTU9QeDYwZWpUNldKWGlsb2h3em1OVEFiR2hsWUJnNFN1T3lWMnRrQVJLZEVpbDdJeCtWWC85cHlyY3dEOFVoRAo3eThDQXdFQUFhQUFNQTBHQ1NxR1NJYjNEUUVCQ3dVQUE0SUJBUUFobjVPTmU3WjN0TFFienYxMW1IVTAxSmZpCnY4dU9pOU5uMjUzZld6aVlXUlVaK2d2aXBvUEZzcGgrajZQZkR3Y3oxZTJhbDR4Z3IwdzVtYU04MThmSTZEN0wKVkdqWWNGSW9Gc205ZHY0TmZVbU9FYVZsNUNPMld6cEpUOEQwODF3L0g4WG94blQvRDlDSE93ZjlZWEF5VS9GZAo5NnBNSVRFUmtSNWpvQkhMZVd2TzhVRzZ6MmJZTnRQNno5K2c2aU1xN0I4UUx4UUZaZTlVU2lNRkc3aXdpbzI1CjNuaXlwQlZZamluMERuSWN2S01OOFAzYWFQbWxTZExZS21BOExwaWVxa3lzVW9Qc2Fjd21INzh0K1BkV1hhUUgKUXBGaUVua1BzekFkSTdoVWtaZjNKN2lJT2VPcnZHclVhNDlQVmJjOCthWHJmTE5EMExCQnlBV29JVStTCi0tLS0tRU5EIENFUlRJRklDQVRFIFJFUVVFU1QtLS0tLQo=
+  controller.key: >-
+    LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBbzlaaFZ4dVV3U01yOUNpUDJrZkJNN3RRTjdqM01aT2I0ZTNsek1FR3FCSjJad0lZClNEV2d3QVpjdUQ3OXVGZUl4RGJkZU5SM3JJd0pPNGo2S1FrNmUxejJhT1FDVzE2cXlzYTczeUs2Uzd3Slo2TGYKdTNBbERna3NydmVNVEdiRTh1NE5aOWtRRkt5N1BUSExhY3VpTUJNZVZyZlVBcW1IeEdvT1RKRU5TcERQSzhZcgp5Y0FUVjVXeWNxYmR5dmdPdGxFODFZb3c0bHE4VkJpUEErNkdYL09nL0kwUlZ5MEwxMzBuSmVuWWg2anlqZFl5CitMN05zTXJQck5qQkVWU3Y1bFZIQjVNU3VKUit6bHV6ZkFZdzQvSHJSNk5QcFlsZUtXaUhET1kxTUJzYUdWZ0cKRGhLNDdKWGEyUUJFcDBTS1hzakg1VmYvMm5LdHpBUHhTRVB2THdJREFRQUJBb0lCQUJFOEJmVlIwMjRWc3hQMgpDRnZmM0hVQ3FVZVRUMzJKbDRaR3JqdkJ1bCtId2FqSVVhR1c4cGdBazFSV1cvNCtSd2JNOXJNMU5ubVNLWTUzCnRFa0l6WHdZcFZzWFVTQW5ielB4ZitYVEUySFFIL1VrN3dBYXBlczZEOWMvOXlRNlUxRnl0VHBOWFNHdm9lcW8KQ0V2U3ZmYnNxKzVYWEJnRG1XS1IvWHNVYng5K3ZSWC9WQWJZZ1crUDMzdVpNRFBzcW5TRFIrdVdybi9LcysrSApCc0wzeVlxTTZTK3Q5YSszNmFJNWd2RmxMVmRrYmlnQVoya1Jjc29EcEk4SmtjdXFUSlhJaUlsaHlEdnNkTkZVCldhN2tFdjI4MEdjZ1FSRmR5TkY2dUF1SUpSVzlSeEY2V0pMNE5sS2tlTDdxSHdPa09tNUNLZm96NUk0T20vdkgKZFBaTERZRUNnWUVBek9EK0IvWEhubzVjYTQ1b1RtdmRYVXVVdGhUMEhKSUw3UFZmc3BIN3BTb2UwY04vYlF1bwpoekE3MFpHeHpsd3JGbEhaTlpNNlozeUJCcjVOYjlkV2FxT1hxeFFiOXNtWWxzc1IwakJNQTkzM1BVaUtaa01MCjR4VlY5cWRwRXJ5KzNibFJha2FxQ0kxbnErNm00NU1HTGdOb0psaXJHalpFQTB1bFFjMHdUSThDZ1lFQXpMZksKZy85NHRLZFBKYU91VndrUi9WbExHcFlvUEFkN0tHaDlYTFNMMmhGc1ppL05NMzZnNlpQbk5Ga0Y5TUo4WkVhOAplU1ZSZFFEaEMrVlVqUjFTamdvdWU5N2huM2pmZ2pNNDFkQUJzeWhNUzE4Wnk3RWJsdUc4Z1hXWkNVYzdZUzhICjhZSlBuT0hKa3RQMllpQ3NwVEg5QjVSVWFwVDlEY2hiRjlYNncyRUNnWUIyWEFERnpucXRJZWRJaDdQQW9sWDMKUU9PL3NTazVuREhoaWZ2b0tLZnRTZ0VXQTlBSXlqUnBMVGRSb2M3THZibHlvb1JPakNpd2dsL3o2bHJJSXVvYwpuemZPc01aYTh5b0E2MzMzSk1tMWJqVVlKV0UzSk1Lb1JMb3R6WmRKS050SE1ubFRZVkYzc1dGVUZZSTZkTVNjCkxvR3JyWXZqajdnSkExbU1ReU1GQndLQmdHSGN4a25kZVhWYXVjSXpnZWNIWmZzbmtYaVBLWUt3ek5ZZlJUWm8KOUtYMVNFMTlNbW9ZY1pIWGEySWg0SEFGL1BMdXdiQmovNUdnTHZUQjEyNXlBd0gxcWd6N0dmNWpDTzJ6ME1xZApXZ0tzRS9TLzdKUHNBVlZhYWdPMUZNaFRyZllpUm5qVUkzektqdExLMHZCTDBGeFVEakp1WFFCcVlxSVJFa0xOCnZzZGhBb0dCQUovSytCa0V4c3hRQjRDR3REYXYxc0hmVTRkZUhHQUN6WGZOakU5U1RPSS95WlJsZlp1am5GOWQKRXNaRVZOQVlJL3QrM3NxaUZzZGZpeXhRNUNoWUpiaW9OQkFGTFp3clVTaWFxanUrbThqcjhnVERyQUpNdjk4bApZcS9JQ2JjSjZ1S3Rlc2Z2cDd6enNoUHVQaE5hNlhqdzIrZkhZMDh6RnNmcVBtSFhJeU5hCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
+  nms_controller.key: >-
+    LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcGdJQkFBS0NBUUVBMU9VUExURGwrRVdJZnQrZlNxUWd3UmZHdzZmYjBuRkJidndVd05qUHJLRDRnend3CnJHQ245ZmlQSWtRUnNOSGtJa2VxQWFOc01wVC9Ed2hPdUhySCt6M0poSFo2WVBqaHVUN0hzclpOekluMHVwcGkKZmduMjVVcGVUanE0TnpRSWV3aHdBTWlJY3lMNGQ5U1ZHV2EycnEwTHI3ZG1WN28vWnNLNlNEMkFiZDBwT2MvbwowdUVEMTkwL004RlQxcEdTYkFZTHlsWVZSWEI0a2dPdlJpVG9aUUlTSXJTSXFENGR0RDhGT1h4bFlRSXJaNUFLCnVNL0l0OFBveXpVUDNCeXFJMEFRNTRDL3QwWGJwS2pwOUpvQzl2TDF3dEtQYnlJUjE5Z2VLWHlhVDN2VUVFSHAKa1ZsdGZ0SU9sV3J2dmc3dmRhWWhIVDZZNGxkbEZGVi8yaDI0QlFJREFRQUJBb0lCQVFDYXpXdzVxZ0t1Z3JENwp3Rk10alNhY0FWUHdWUkJNZHpuakg3MWZkTWVkZVBiN1Jqc0dQTW9rMnZZSkxvSEdsdmhSek5aYmxwOUlNSHMrClRRWWdzbmJUdzF2U3krdTBzNFErbE4zVW55YjNBYUZJUnBZem03OUJmdEFRQmphSlBYYWxMNzl4Y2w5MWlRb3UKNkE3NmgydHluRFdSTWNSaktmU01IakFoODBaOW15MWsrMzVMckd0c0g0OWZRWDViOFJ4a0FYYjhscjJjb2pvUgorZmx3NEpITEVrcVNUSDVOaHFrT1E4UnMvL09xM3FWOWtuOER6U3lpWm5IVG9wZGtNdmRzaWpHbFhldE12d3BXCjJRSU1QMVhST0dlaEoyS000dkFFVXI3NmF0RXVSb3J1dWsyOHczU0VQV1ZMOTcxNUxCYzluMnducGw1Qyt1ejEKci9ZTkR3ckpBb0dCQVBMN1grWStYdEJxdjcxc0k5ZCs3ak01QmVXZ2Nwci9nSlFVU1AwNUhJNnpTWGZ1SEJlRwpyYURYdU52T3lvRjdRODZ1b0g3ZlBXczQ5a2orbFN1QVo1VUlPWnlSZEc2czVZT1dVSU0wNml2TmFlbkRFbUdlCkFoT3Y3enAyMDRXcjNwbEc5Um5kZnRXZGs3b1JESWx0Q0h2dUh4NUJpLzFhc1QwcTlOWlRNYWhmQW9HQkFPQk4KQmZWMGpVQXRORGtFSjFMeXc3aDZFQndJR1kwNnF0amFxbVphb3lYZ2xpTWRVV2pMSjdLQWRzNERNZDdhb2V1cgo4amZxVDErU084aExINStQTm5SUDB1YzI3THhzbytMcDMxLzJaak14ZnR0YzRBN3YxWnMvNHZEaXFwRENqd2U1Ck5aOS9ySThCd1hGc0VodlZXaC9OVkEyVE53KzdJT0xnbmI1d3Vzb2JBb0dCQU1aUktUcVJHVzNlVXRUV0dJTGcKVktaMkdqd0xNcjhUWHV4OWlmMHp5ZjBtbEFaUXo1amNFWWEveTErTWJuZzBGV254MllqengvdGxxSTUzUzJVUQpEbnJ6RmFLV2pZTnZsbnhLQ1RpdHpac21zeFZhWS94TXJNRkl6V2JZYVZnbXFTNU5YZXRZZnhiMjRBWHp1Rm5LCkppeVFjOUdNQ2lnbEI1ZzNJVkowNElqZEFvR0JBS3FzY1RoUXM1cDl5eHNIZWhTMy9RM0djN09neGpDY3o1dXEKNTdaeWlXb3M5cEZKb2NTbnNWRTJSekNEWmRNNWNiUXVabVQ5dWQvekdlSlNwNEYySysxZFFCSUh6U09qVnlFMgo3RzNNdy85NFRoc0ZGTWpJM2pULzYrTjMxbW5JWWFWeTNNYTlFOFROaFRDVkYwSnVtZUZSRUFBMFlOVnJncDZnClkrZWhSOEM1QW9HQkFLQm5yWFA4UU8wTlRJclpZUjk2UVBNS3ZrTGI3SjNHaHBob3JJVGFQWjZ1T0FiS29INDIKNHhiZEVlaEYybG4zbE9waFNTaXdmbTFxVS9KdmRCVHhYYUVCTWh0MEw1bmo1RkNxWVJHaHBma3o0MWRCOStKUQplS05LUDljU0hCZm5idW81Q0lNUVI3OWs0VlNBU0FLVEY0YytHL3RWekxHN3RyanZjYzFnZm5MTwotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+  nms_controller.pem: >-
+    LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURTVENDQWpHZ0F3SUJBZ0lSQUtvdnBuclVSWVdKYm5HUFdpRW12Umt3RFFZSktvWklodmNOQVFFTEJRQXcKTERFTE1Ba0dBMVVFQmhNQ1ZWTXhIVEFiQmdOVkJBTU1GR05sY25ScFptbGxjaTV0WVdkdFlTNTBaWE4wTUI0WApEVEl3TURNd09ESXlNekV6TjFvWERUSXhNRE13T0RJek16RXpOMW93UERFTE1Ba0dBMVVFQmhNQ1ZWTXhDVEFICkJnTlZCQW9UQURFSk1BY0dBMVVFQ3hNQU1SY3dGUVlEVlFRRERBNWhaRzFwYmw5dmNHVnlZWFJ2Y2pDQ0FTSXcKRFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQU5UbER5MHc1ZmhGaUg3Zm4wcWtJTUVYeHNPbgoyOUp4UVc3OEZNRFl6NnlnK0lNOE1LeGdwL1g0anlKRUViRFI1Q0pIcWdHamJES1UvdzhJVHJoNngvczl5WVIyCmVtRDQ0YmsreDdLMlRjeUo5THFhWW40Sjl1VktYazQ2dURjMENIc0ljQURJaUhNaStIZlVsUmxtdHE2dEM2KzMKWmxlNlAyYkN1a2c5Z0czZEtUblA2TkxoQTlmZFB6UEJVOWFSa213R0M4cFdGVVZ3ZUpJRHIwWWs2R1VDRWlLMAppS2crSGJRL0JUbDhaV0VDSzJlUUNyalB5TGZENk1zMUQ5d2NxaU5BRU9lQXY3ZEYyNlNvNmZTYUF2Ynk5Y0xTCmoyOGlFZGZZSGlsOG1rOTcxQkJCNlpGWmJYN1NEcFZxNzc0TzczV21JUjArbU9KWFpSUlZmOW9kdUFVQ0F3RUEKQWFOV01GUXdEZ1lEVlIwUEFRSC9CQVFEQWdXZ01CTUdBMVVkSlFRTU1Bb0dDQ3NHQVFVRkJ3TUNNQXdHQTFVZApFd0VCL3dRQ01BQXdId1lEVlIwakJCZ3dGb0FVM29EMU5EZDE3NUY4eldrRUY4Uk9MNEdmSWo4d0RRWUpLb1pJCmh2Y05BUUVMQlFBRGdnRUJBR3VxSGI5bllwWjJCbnVJckp4VnN6Nkk3SG5mQVVWdDJzSWpwQ0hzeTBKQmEyR2MKMGN0Y0gyQ1J0ZE1xUkJCTTJFcm1tZ0Z6OHRLUzJmbVBWVU5Wem0wVlh0OVhLUUI0S1ZUaGlveS9kRkNVd1BWdwp4T0hnQmpFS2xZanQySk8rY1JMMG9yUXVKYjJ0MzRidnNHdjEvQ2Y4WkJwQzBlK1BuRCtTSUFVNnUyVDAzMnh4CmoyT0EvaDVnODZDTDBIbnRONXdUdlhoL2VZYjNTTHJlQThTT3h1dW5UejZIeGh2SklHZ21jSEd4dG1wdGpRUzgKdEFkVGFLSDhxYXA1TTdFWE1mTTBlOS9kNGFYTWl6am5iUUxEYU0yWENFVnNXbzlnYm9zN1cySnNVamxhVmZvWgpydUJNNTdpRkVtOWp4b2Q0TThhK3lRdFRLTmQ1T2lvVzMya1UxZDA9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+  rootCA.key: >-
+    LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBdEtzZXk0WWxhQU1TcitERklZZUQycDNkL2FOUWJrWkZ4Z0ExbVAwWFcrZTkyMUNnCkxRaFlHcGxlMEFNNGpKbTZubDhTS0lCdXlzUk9NdGlnYmxmc2pSem1QTjhUUTFOQmZ2V09MT0F3NjRBRkRuUW0KOWJ2cnRPQU5mdkMzZmdVdDlBQ1V1c1ZndHAxNWtUQXkzaXZEN0N3UGNpTzNTaUFQd2VlSituTTZUNjl6NlBjawpuSlp0Qk9uMC9HSzFYaCtTSnExSHNNcGpySElYRC9sSmVBaEdJanZhVC9GVVJLM3dBUU05ZjlTWHJVMkVaSFY4Cm5vTGJFRTBSYVd4SVgwQ0tDeGg3UDgyN21WUkJOQTl3OWlIRzh2UUVjcTFPcDVlbU1jQ3B5UFJRblhUcHB6ajEKMlBHTEUyTlFaN091dythRThtY01CYWloUmdTZnhvV3l0eHA3T3dJREFRQUJBb0lCQUdMczgvN0RKRVpRc0hISApaSW1ZZDFWRWJlSk5BMlJ1YkJRZjF6ay9GQVJKMzBad1hsUnFKanZpVU8wYlptSnVacVlETHFFb3VnR2kvYUtQCnhVREdPZ3VHa0hjeU9vejUwSG9oSU1sbnRNR3VwcFlrZVpUQ1lpejNKY3lsS0FRRCtBYU1MdVFaNFh2OHZDMEkKdEVHOHV4bmRnbE9nUk9OOHJNUWk4UVZIQk4zT0tvb2ZzcU1HSkJKazRpcDJ4OG5mRFljRkhqa3UvWnV2WWxKVgpETmJMY1gxRk9ER0RpclhyTjVVU285UXhnZ3JSY2psOVlTbTRpZlp3b3UwL29waU1SOHhMZ0czUTRmNHQ0SGw0CjV3dFUwQ21sVXo1WUJhQ0Q5RFlISU1haUJXeS9ObEVvSFBpblM5bS9ia1dlRER5ZzJ4SWVFb0ZKS2toQ0Y4d2cKK2V4d2Fta0NnWUVBNzRMTDhpeElYYnNsMDZ5dlZmeGhMb1FTeEdBcy9rNE52QzRpWjNGZFljd20vUW5ycERXUAp3ekVZcHZsbnVKMGRlVmlqV2FOYVBJNHViK1RHZ2VxaGNrdnphNlBvK2d2T3ZEa3NqZkhrNEp2cW5uT0VHK0Z6CldlVXU3ZmJFWUkzb0xza0JkRnYzOFo2NXdMeUM1VTJ2cUpXSS91U1lRdUZ1dVNSZGhuN0pOQWNDZ1lFQXdSdEUKcXJDUHdVK1ErZDltTWoyd3F2bEJJMEU1dVB6TERmbEFETFdURWQrOVE0M2N5MnZoWjZoYmQraFh3TmxObDJuSwptVDB4TWtYY3lpQUl2ck1mVi9LWmRhdmc0R2dQK0RKNGp6aFlUQ3hTbENtYzVXai9XSzB5RGlJNVUxWjJtYUs5CkNZaUhyb1dVK3RITjJSS3o3em1ZcTI5YWpOTU85bm5xakx0SGVpMENnWUFRa2VYMkxTWWNoZlFKL3VwcWNubHUKdEdoditZOWpVSmNXcThKcGthZzZPZHVBcWcwSllVTSs1OGlpMUtKZVhWQktzdDBxT0dqbnc1Wm0yMWI0YWZrZApaUy9FQktUN2w1R0g2QlN6QlVjbVd1TVNiejkyaGxScXBiWm5kQ2tGM1F0eElTcmVsL1pCV3cvU3k3ZnFrVU5UCjBIU1gzY3pDNDhHN1FVN1BIVHBpUlFLQmdBdkdPZDJlZm1WdkVJdnJ6ek5wQjRpbFFnK0FQcURFNlN5azhmN1UKWTI5SGtTYTVVNmtqbnM3UE9TU0tpaTg4RUxzV3ZEK3p0M2cxUWswZ3Z1ZkJ6RHQwazE3VmFCVEd3NUtDb1U4NgpSRWdBdTloRTRVZ3Jxc1loYVZmclJrdUtqaGk0RDRheFNIU2Z1SUhDb1NhSE9XbHd2WnBXWTlNS1czTXo0OVZJCjVnYlJBb0dBWWNrVk96aE1oVEZKaGhXYU9QOVRLdnpXY0NUY1hTWERpU2dVRitoWVpzSXdiTjliNXd4QTBuWkQKVGxjVjQwQk5MSmU4R3RsTXZLUzFxUlJISlNDRjVtSklLV1ZFSGRwcTAwZDVDUWhxOVdOVGZkOHNnWjdhZlFKawphOVZWMjIyU08xd1lyMzBDeUlSSUxCZTlqYmhxY0daeFk5UkFjL3RmblBEdDU4Z3U1MW89Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
+  rootCA.pem: >-
+    LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURKekNDQWcrZ0F3SUJBZ0lKQUpSWXZTMFB3aWlrTUEwR0NTcUdTSWIzRFFFQkN3VUFNQ2t4Q3pBSkJnTlYKQkFZVEFsVlRNUm93R0FZRFZRUUREQkZ5YjI5MFkyRXViV0ZuYldFdWRHVnpkREFnRncweU1EQXpNREl5TWpReQpNRGxhR0E4ek1ERTVNRGN3TkRJeU5ESXdPVm93S1RFTE1Ba0dBMVVFQmhNQ1ZWTXhHakFZQmdOVkJBTU1FWEp2CmIzUmpZUzV0WVdkdFlTNTBaWE4wTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEKdEtzZXk0WWxhQU1TcitERklZZUQycDNkL2FOUWJrWkZ4Z0ExbVAwWFcrZTkyMUNnTFFoWUdwbGUwQU00akptNgpubDhTS0lCdXlzUk9NdGlnYmxmc2pSem1QTjhUUTFOQmZ2V09MT0F3NjRBRkRuUW05YnZydE9BTmZ2QzNmZ1V0CjlBQ1V1c1ZndHAxNWtUQXkzaXZEN0N3UGNpTzNTaUFQd2VlSituTTZUNjl6NlBja25KWnRCT24wL0dLMVhoK1MKSnExSHNNcGpySElYRC9sSmVBaEdJanZhVC9GVVJLM3dBUU05ZjlTWHJVMkVaSFY4bm9MYkVFMFJhV3hJWDBDSwpDeGg3UDgyN21WUkJOQTl3OWlIRzh2UUVjcTFPcDVlbU1jQ3B5UFJRblhUcHB6ajEyUEdMRTJOUVo3T3V3K2FFCjhtY01CYWloUmdTZnhvV3l0eHA3T3dJREFRQUJvMUF3VGpBZEJnTlZIUTRFRmdRVVg3RWRCdUtIL3ZSNEgyeUoKVXd3TmEyNzJ1R1V3SHdZRFZSMGpCQmd3Rm9BVVg3RWRCdUtIL3ZSNEgyeUpVd3dOYTI3MnVHVXdEQVlEVlIwVApCQVV3QXdFQi96QU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUFSbVkyNTZQamltSnhEa3lFWHZqdC9Xb0NZMmM1CmVhYkRPRURkVThLS0tJLzQ4OUhQQ2JyRnN6bVNxQ1ZFUUI0ZnJJMEptQVFTbUtySDZPQ1MzVEZRejlaY3F5aEoKQUpXYzF6UFoya2o0Q0dKanJ3bmg0VHhZU2REOW5EVGtJb1pKRkpFMVFOWk9MYVZoMnV1dmg3Uk5jSHo0RWk1YgpObGcxT0VMaUxaeWdKWUhnM3pHandRT0pudXNxU0NLVk9LTU5aaU91S0ZrRjAvZnhmQVhTOWFOKzdBbjFpQTBTCjduMEc2MEFhN2ROaHdUczFJYVA3bDNzYjNjbUpYcGwvOUllS2UyNEIrTzlSK1NFZHBPbDIrSU0zdmVHUjhKdlgKVHU1RDNUYmQ2b1VZRC9QeUxRclppYW9YY2FDVVhYYy93SktSeElTdzJnVUtpZjlCeFBOR0RXQ2l4UT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+  rootCA.srl: Rjc4RUNBNUYwODk0Rjk0Nwo=
+  vpn_ca.crt: >-
+    LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURJVENDQWdtZ0F3SUJBZ0lKQUtMU04vbnd0SVM2TUEwR0NTcUdTSWIzRFFFQkN3VUFNQ1l4Q3pBSkJnTlYKQkFZVEFsVlRNUmN3RlFZRFZRUUREQTUyY0c0dWJXRm5iV0V1ZEdWemREQWdGdzB5TURBek1ESXlNalF5TVRkYQpHQTh6TURFNU1EY3dOREl5TkRJeE4xb3dKakVMTUFrR0ExVUVCaE1DVlZNeEZ6QVZCZ05WQkFNTURuWndiaTV0CllXZHRZUzUwWlhOME1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBNFF3d25wUEEKYm1iYmNicEZHdEk2b1hibXl1d3VKcEs0bE4rK0ZQZ2crdTdMeXpPc1pBQTFxbEEvYTd2bTJicUVVejNYYlVxYgpIVy9RMTMzMFI0VzhHTmtUQklNMi9LSU9aaE1oNUIxOTkyM1JHajdmMzI4NWNIaWRwcmsrSXU5ZGRKVU0ycFIwCnZTd2kwRFJNOVcyZysvRy9aZTJmcnVkR241SnErNFVaaHJYUG8rdUt3OWZmRW5xa2NlTy96K1M0R1l6VmpyZjgKUVBQTUNtSlNpQ2hFUWpPczBoMit0QUVCRGllbitWVnl2d0xWR0Q1R3NSQ3JKQlpwYklIOXg1dk85cE82ZkgzQgpGeXdsck9aQ3llTm56Ukd5RTgrelZvTHRyQ1hHYitha2hmYnVCdWZCbXdzcmZFS0dRMnVEZVN1OUxWR3NRTlUwCjJyOFNmaWwySnVKNkN3SURBUUFCbzFBd1RqQWRCZ05WSFE0RUZnUVVSREFVSnpzU0pkbmZvMUxpKzBLN2pnczcKSFQ4d0h3WURWUjBqQkJnd0ZvQVVSREFVSnpzU0pkbmZvMUxpKzBLN2pnczdIVDh3REFZRFZSMFRCQVV3QXdFQgovekFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBWXlQdlUrck14ZitYbXNzaG5xSjhFV3hhVGdXY3pqekQva204CnRsY21KNVBMMVpyS1N4Q1ZvVCtESVNrRGdQOWhLY3RhU3cxWTRQclpya0J6c0FVbGlDQ1IyUXRCOWR3TFYrYU4KT05Ma09paHJIUWZhMTJGc1NnMERFNFh2NmlyTGZuVzhuRkZWQzc0UkhnRjlUbS8rY09TangzLzRKMzJWWmRmaApGUVZxeDhzZWlWVWRZeVlwTC9iRDlMekJUQ2VzenlFdVVuWXMzLzl5ZUs2ejhLVVZQeERxOFBwRXVhYzZKdThLCjZkcHJKb25JYWFwZExIL3hHVVRxRis3RVc2TllhUkRsME1MRisrTFZzWmtlK1B6b0tQTUk4SE8wamFOT2hHZnIKWkJneHpRcHprOGlQV3paNGVwVGpGMUNLQTYwUWsrSEQ0UjVKVGEyWWNZT2tGSTUyaWc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+  vpn_ca.key: >-
+    LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBNFF3d25wUEFibWJiY2JwRkd0STZvWGJteXV3dUpwSzRsTisrRlBnZyt1N0x5ek9zClpBQTFxbEEvYTd2bTJicUVVejNYYlVxYkhXL1ExMzMwUjRXOEdOa1RCSU0yL0tJT1poTWg1QjE5OTIzUkdqN2YKMzI4NWNIaWRwcmsrSXU5ZGRKVU0ycFIwdlN3aTBEUk05VzJnKy9HL1plMmZydWRHbjVKcSs0VVpoclhQbyt1Swp3OWZmRW5xa2NlTy96K1M0R1l6VmpyZjhRUFBNQ21KU2lDaEVRak9zMGgyK3RBRUJEaWVuK1ZWeXZ3TFZHRDVHCnNSQ3JKQlpwYklIOXg1dk85cE82ZkgzQkZ5d2xyT1pDeWVObnpSR3lFOCt6Vm9MdHJDWEdiK2FraGZidUJ1ZkIKbXdzcmZFS0dRMnVEZVN1OUxWR3NRTlUwMnI4U2ZpbDJKdUo2Q3dJREFRQUJBb0lCQVFDa3BURnc0dkgzRTROYQoyZ2N5enptYjVZeUdTM0tjUDkyUTlYeHdoUFJFQWE3UmRIV2NGOWNyU2xpTDdrVy9aMGptU2FreFNWTGduMnl3CkszTXJYSGszeUtDMFBYZGVMd1hQd2hHYWZjVXAzNHNLNDVNUU9hUlJWNzBuUEFGc3Q2aXM0VnN0RTAyeEZQaEgKVU93NDVzTFBjSmN4OEQ1U1ROd0xaS2ltYVVNNm5Ld0FnWFF6eFNjaGVoU09FdEdwc0VGaEJlOFdteExKNjlHRwpwQmd0RzE3VnZHYnFvRTkrbjNITXNBRjlkRTBSVlJCdEdEMmlaRmZjd1VXMkZFTlRJK2xIQVVXQXVzZVdGRHlCClk4R2FPTnFMTXpCKzVPbkVSZFgyZ0UyYUw1NWlOVUxMaXRXQmpHUUlBVkppdzZ3TVNoaDJpMC9nSTlmN1FwbEIKMmlObHpuMFJBb0dCQVBZNkpIcDEyYWUzU0ZtYXZ1TFZSSnMreWd3RjhhRGdEcG5xOFFnYVpXeGdYMWdNOU9vaApNdjdpdHM1d3ZSbWU0ekMvK2xVRlNQUXQrY0F2cXA5ZWNlb2QvK3RiT3NGekxkenRwRzdoUkhPZnFvMFNlRGF6Ckx0aFZyWDRwWTN2c0oxMmx6QnpPOTUrSm8vWXU0dW83K1lXYkdYYVVveHZiVDZGTllwWERQSStaQW9HQkFPbjYKMk90czU3L1JkdTdzdlRyczVMU1dyY0FGc01qTG0zS3VyTHBldFBlSnNZbUlRbEJaQ2pqWHVtUXVJamhqSlcreQordzNvSlVSdDFvMzFLWXJ1dG1kNGZyb2tNNzRqd3hHcURiMEE1VjBNMmQ3RWFlTTlzQXVEQk5wZFk4Ympka2FxCnY2U3F2OXRENUNoV3FqczhubWJma2ZjVzBQWGRlQ25uY2g3S0F5MURBb0dCQU90SldneFBTMEp4Nk1mL0VFTXYKcWxSekpwMWduS212RVNUUmxhdTVsWXQvZC94cXZTcHh1UXBKV0loaXdNQ1h6TitMdzhtMHVDYmxQQkFEUEpiMwpxQUVnMDZseVR1NEdneC9uVWtiR0tpUVd3ZUgyY1R0TDlBcXpySXF2UUNwdDJwd3BUNmVEdXFvUDI4Ym12TjA1Cm5GR29pU2VBRjNFS0c4aTJhdXRUV2k2WkFvR0FZT0Y4Ny80bjkwVEQraW9NTUZubVdPQUxFWGRKdTlxU2d1blEKbTFxYmsrTnZuNExMOG5qcndwMlFqK3FLUU03TXNYTnFnRmVmRnJaa0lHTmkwQ1FIWXRDQnFKRlUyMlh6WDEwSwpVemdMd0h1UnVxdVpMSDVlWm1YWm5KRU92MHR2cmRNRmh5a3NSNTNVMnQ4SG5YOThGeHg3VTlRZXNhOENFbGZDCjZQeThWQUVDZ1lFQXBoSVJwTDVQVGVYUEUwZDIxOUt6UzFONVFtcytod1NidmZZMGREWE5hNTk4T0lPYkNSbGcKcTg1TEx3QUtLUnZOb0VyQTFXRkxyRllVNWU4RVZBejVLTWZCblhDV2pRT2JudURGSWljakVkbWtBR2tjT3Nwcgo0WkZ2cFIrbXBvR0w2aG1sSmQxTERjd3lybTZWVXY5cGpHMi8zcVptRkljQ1pMcS9RaHpheitnPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+kind: Secret
+metadata:
+  labels:
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: secrets
+    app.kubernetes.io/part-of: magma
+    helm.sh/chart: secrets-0.1.3
+  name: orc8r-secrets-certs
+  namespace: default
+---
+apiVersion: v1
+data:
+  metricsd.yml: >-
+    cHJvZmlsZTogInByb21ldGhldXMiCgpwcm9tZXRoZXVzUXVlcnlBZGRyZXNzOiAiaHR0cDovL29yYzhyLXByb21ldGhldXM6OTA5MCIKcHJvbWV0aGV1c1B1c2hBZGRyZXNzZXM6CiAgLSAiaHR0cDovL29yYzhyLXByb21ldGhldXMtY2FjaGU6OTA5MS9tZXRyaWNzIgoKYWxlcnRtYW5hZ2VyQXBpVVJMOiAiaHR0cDovL29yYzhyLWFsZXJ0bWFuYWdlcjo5MDkzL2FwaS92Mi9hbGVydHMiCnByb21ldGhldXNDb25maWdTZXJ2aWNlVVJMOiAiaHR0cDovL29yYzhyLWNvbmZpZy1tYW5hZ2VyOjkxMDAiCmFsZXJ0bWFuYWdlckNvbmZpZ1NlcnZpY2VVUkw6ICJodHRwOi8vb3JjOHItY29uZmlnLW1hbmFnZXI6OTEwMSIK
+kind: Secret
+metadata:
+  labels:
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: secrets
+    app.kubernetes.io/part-of: magma
+    helm.sh/chart: secrets-0.1.3
+  name: orc8r-secrets-configs-orc8r
+  namespace: default
+---
+apiVersion: v1
+data: {}
+kind: Secret
+metadata:
+  labels:
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: secrets
+    app.kubernetes.io/part-of: magma
+    helm.sh/chart: secrets-0.1.3
+  name: orc8r-secrets-envdir
+  namespace: default
+---
+apiVersion: v1
+data:
+  .dockerconfigjson: eyJhdXRocyI6IHsiJSFzKDxuaWw+KSI6IHsiYXV0aCI6ICJQRzVwYkQ0NlBHNXBiRDQ9In19fQ==
+kind: Secret
+metadata:
+  labels:
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: secrets
+    app.kubernetes.io/part-of: magma
+    helm.sh/chart: secrets-0.1.3
+  name: orc8r-secrets-registry
+  namespace: default
+type: kubernetes.io/dockerconfigjson
+---
+apiVersion: v1
+data:
+  postgresql-password: cG9zdGdyZXM=
+kind: Secret
+metadata:
+  labels:
+    app: postgresql
+    chart: postgresql-8.5.0
+    heritage: Tiller
+    release: release-name
+  name: postgresql
+type: Opaque
+---
+apiVersion: v1
+data:
+  mariadb-password: cGFzc3dvcmQ=
+  mariadb-root-password: cDd0c3ZZQ1lKQw==
+kind: Secret
+metadata:
+  labels:
+    app: mariadb
+    chart: mariadb-7.3.12
+    heritage: Tiller
+    release: release-name
+  name: release-name-mariadb
+type: Opaque
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: proxy
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: orc8r
+    app.kubernetes.io/part-of: magma
+    helm.sh/chart: orc8r-0.1.3
+  name: bootstrapper-orc8r-proxy
+spec:
+  ports:
+    - name: open
+      port: 443
+      targetPort: 9444
+  selector:
+    app.kubernetes.io/component: proxy
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/name: orc8r
+  type: LoadBalancer
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: magmalte
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: nms
+    app.kubernetes.io/part-of: magma
+    release_group: release-name
+  name: magmalte
+spec:
+  ports:
+    - name: http
+      port: 8081
+      protocol: TCP
+      targetPort: null
+  selector:
+    app.kubernetes.io/component: magmalte
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/name: nms
+    release_group: release-name
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: mariadb
+    chart: mariadb-7.3.12
+    component: master
+    heritage: Tiller
+    release: release-name
+  name: mariadb
+spec:
+  ports:
+    - name: mysql
+      port: 3306
+      targetPort: mysql
+  selector:
+    app: mariadb
+    component: master
+    release: orc8r
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: nginx
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: nms
+    app.kubernetes.io/part-of: magma
+    release_group: release-name
+  name: nginx-proxy
+spec:
+  ports:
+    - name: https
+      port: 443
+      protocol: TCP
+      targetPort: null
+  selector:
+    app.kubernetes.io/component: nginx
+    app.kubernetes.io/instance: release-name
+    app.kubernetes.io/name: nms
+    release_group: release-name
+  type: LoadBalancer
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: proxy
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: orc8r
+    app.kubernetes.io/part-of: magma
+    helm.sh/chart: orc8r-0.1.3
+  name: orc8r-clientcert-legacy
+spec:
+  ports:
+    - name: clientcert
+      port: 443
+      targetPort: 9443
+  selector:
+    app.kubernetes.io/component: proxy
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/name: orc8r
+  type: LoadBalancer
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: configmanager
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: metrics
+    app.kubernetes.io/version: '1.0'
+    helm.sh/chart: metrics-0.1.1
+  name: orc8r-configmanager
+spec:
+  ports:
+    - name: prom-configmanager
+      port: 9100
+      targetPort: 9100
+    - name: alertmanager-config
+      port: 9101
+      targetPort: 9101
+  selector:
+    app.kubernetes.io/component: configmanager
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/name: metrics
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: orc8r
+    app.kubernetes.io/part-of: magma
+    helm.sh/chart: orc8r-0.1.3
+  name: orc8r-controller
+spec:
+  ports:
+    - name: web
+      port: 8080
+      targetPort: 8080
+    - name: port-0
+      port: 9079
+      targetPort: 9079
+    - name: port-1
+      port: 9080
+      targetPort: 9080
+    - name: port-2
+      port: 9081
+      targetPort: 9081
+    - name: port-3
+      port: 9082
+      targetPort: 9082
+    - name: port-4
+      port: 9083
+      targetPort: 9083
+    - name: port-5
+      port: 9084
+      targetPort: 9084
+    - name: port-6
+      port: 9085
+      targetPort: 9085
+    - name: port-7
+      port: 9086
+      targetPort: 9086
+    - name: port-8
+      port: 9087
+      targetPort: 9087
+    - name: port-9
+      port: 9088
+      targetPort: 9088
+    - name: port-10
+      port: 9089
+      targetPort: 9089
+    - name: port-11
+      port: 9090
+      targetPort: 9090
+    - name: port-12
+      port: 9091
+      targetPort: 9091
+    - name: port-13
+      port: 9092
+      targetPort: 9092
+    - name: port-14
+      port: 9093
+      targetPort: 9093
+    - name: port-15
+      port: 9094
+      targetPort: 9094
+    - name: port-16
+      port: 9095
+      targetPort: 9095
+    - name: port-17
+      port: 9096
+      targetPort: 9096
+    - name: port-18
+      port: 9097
+      targetPort: 9097
+    - name: port-19
+      port: 9098
+      targetPort: 9098
+    - name: port-20
+      port: 9099
+      targetPort: 9099
+    - name: port-21
+      port: 9100
+      targetPort: 9100
+    - name: port-22
+      port: 9101
+      targetPort: 9101
+    - name: port-23
+      port: 9102
+      targetPort: 9102
+    - name: port-24
+      port: 9103
+      targetPort: 9103
+    - name: port-25
+      port: 9104
+      targetPort: 9104
+    - name: port-26
+      port: 9105
+      targetPort: 9105
+    - name: port-27
+      port: 9106
+      targetPort: 9106
+    - name: port-28
+      port: 9107
+      targetPort: 9107
+    - name: port-29
+      port: 9108
+      targetPort: 9108
+  selector:
+    app.kubernetes.io/component: controller
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/name: orc8r
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: grafana
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: metrics
+    app.kubernetes.io/version: '1.0'
+    helm.sh/chart: metrics-0.1.1
+  name: orc8r-grafana
+spec:
+  ports:
+    - name: grafana
+      port: 3000
+      targetPort: 3000
+  selector:
+    app.kubernetes.io/component: grafana
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/name: metrics
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: prometheus
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: metrics
+    app.kubernetes.io/version: '1.0'
+    helm.sh/chart: metrics-0.1.1
+  name: orc8r-prometheus
+spec:
+  ports:
+    - name: prometheus
+      port: 9090
+      targetPort: 9090
+  selector:
+    app.kubernetes.io/component: prometheus
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/name: metrics
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: prometheus-cache
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/name: metrics
+    app.kubernetes.io/version: '1.0'
+    helm.sh/chart: metrics-0.1.1
+  name: orc8r-prometheus-cache
+spec:
+  ports:
+    - name: orc8r-prometheus-cache
+      port: 9091
+      targetPort: 9091
+  selector:
+    app.kubernetes.io/component: prometheus-cache
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/name: metrics
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: proxy
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/managed-by: helm
+    app.kubernetes.io/name: orc8r
+    app.kubernetes.io/part-of: magma
+    helm.sh/chart: orc8r-0.1.3
+  name: orc8r-proxy
+spec:
+  ports:
+    - name: clientcert
+      port: 9443
+      targetPort: 9443
+    - name: open
+      port: 9444
+      targetPort: 9444
+  selector:
+    app.kubernetes.io/component: proxy
+    app.kubernetes.io/instance: orc8r
+    app.kubernetes.io/name: orc8r
+  type: LoadBalancer
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: postgresql
+    chart: postgresql-8.5.0
+    heritage: Tiller
+    release: release-name
+  name: postgresql
+spec:
+  ports:
+    - name: tcp-postgresql
+      port: 5432
+      targetPort: tcp-postgresql
+  selector:
+    app: postgresql
+    release: release-name
+    role: master
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app:
+      '[object Object]': null
+    chart:
+      '[object Object]': null
+    heritage:
+      '[object Object]': null
+    release:
+      '[object Object]': null
+  name: postgresql-headless
+spec:
+  clusterIP: None
+  ports:
+    - name: tcp-postgresql
+      port:
+        '[object Object]': null
+      targetPort: tcp-postgresql
+  selector:
+    app:
+      '[object Object]': null
+    release:
+      '[object Object]': null
+  type: ClusterIP
+---
+apiVersion: apps/v1beta2
+kind: StatefulSet
+metadata:
+  labels:
+    app: postgresql
+    chart: postgresql-8.5.0
+    heritage: Tiller
+    release: release-name
+  name: postgresql
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: postgresql
+      release: release-name
+      role: master
+  serviceName: postgresql-headless
+  template:
+    metadata:
+      labels:
+        app: postgresql
+        chart: postgresql-8.5.0
+        heritage: Tiller
+        release: release-name
+        role: master
+      name: postgresql
+    spec:
+      containers:
+        - env:
+            - name: BITNAMI_DEBUG
+              value: 'false'
+            - name: POSTGRESQL_PORT_NUMBER
+              value: '5432'
+            - name: POSTGRESQL_VOLUME_DIR
+              value: /bitnami/postgresql
+            - name: PGDATA
+              value: /bitnami/postgresql/data
+            - name: POSTGRES_USER
+              value: postgres
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  key: postgresql-password
+                  name: postgresql
+            - name: POSTGRES_DB
+              value: magma
+            - name: POSTGRESQL_ENABLE_LDAP
+              value: no
+          image: 'docker.io/bitnami/postgresql:11.7.0-debian-10-r9'
+          imagePullPolicy: IfNotPresent
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - '-c'
+                - exec pg_isready -U "postgres" -d "magma" -h 127.0.0.1 -p 5432
+            failureThreshold: 6
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 5
+          name: postgresql
+          ports:
+            - containerPort: 5432
+              name: tcp-postgresql
+          readinessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - '-c'
+                - '-e'
+                - >
+                  exec pg_isready -U "postgres" -d "magma" -h 127.0.0.1 -p 5432
+
+                  [ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f
+                  /bitnami/postgresql/.initialized ]
+            failureThreshold: 6
+            initialDelaySeconds: 5
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 5
+          resources:
+            requests:
+              cpu: 250m
+              memory: 256Mi
+          securityContext:
+            runAsUser: 1001
+          volumeMounts:
+            - mountPath: /dev/shm
+              name: dshm
+      initContainers: null
+      securityContext:
+        fsGroup: 1001
+      volumes:
+        - emptyDir:
+            medium: Memory
+            sizeLimit: 1Gi
+          name: dshm
+        - emptyDir: {}
+          name: data
+  updateStrategy:
+    type: RollingUpdate
+---
+apiVersion: apps/v1beta1
+kind: StatefulSet
+metadata:
+  labels:
+    app: mariadb
+    chart: mariadb-7.3.12
+    component: master
+    heritage: Tiller
+    release: orc8r
+  name: release-name-mariadb
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: mariadb
+      component: master
+      release: orc8r
+  serviceName: release-name-mariadb
+  template:
+    metadata:
+      labels:
+        app: mariadb
+        chart: mariadb-7.3.12
+        component: master
+        release: orc8r
+    spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    app: mariadb
+                    release: orc8r
+                topologyKey: kubernetes.io/hostname
+              weight: 1
+      containers:
+        - env:
+            - name: MARIADB_ROOT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  key: mariadb-root-password
+                  name: release-name-mariadb
+            - name: MARIADB_USER
+              value: magma
+            - name: MARIADB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  key: mariadb-password
+                  name: release-name-mariadb
+            - name: MARIADB_DATABASE
+              value: magma
+          image: 'docker.io/bitnami/mariadb:10.3.22-debian-10-r27'
+          imagePullPolicy: IfNotPresent
+          livenessProbe:
+            exec:
+              command:
+                - sh
+                - '-c'
+                - |
+                  password_aux="${MARIADB_ROOT_PASSWORD:-}"
+                  if [ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]; then
+                      password_aux=$(cat $MARIADB_ROOT_PASSWORD_FILE)
+                  fi
+                  mysqladmin status -uroot -p$password_aux
+            failureThreshold: 3
+            initialDelaySeconds: 120
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
+          name: mariadb
+          ports:
+            - containerPort: 3306
+              name: mysql
+          readinessProbe:
+            exec:
+              command:
+                - sh
+                - '-c'
+                - |
+                  password_aux="${MARIADB_ROOT_PASSWORD:-}"
+                  if [ -f "${MARIADB_ROOT_PASSWORD_FILE:-}" ]; then
+                      password_aux=$(cat $MARIADB_ROOT_PASSWORD_FILE)
+                  fi
+                  mysqladmin status -uroot -p$password_aux
+            failureThreshold: 3
+            initialDelaySeconds: 30
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
+          volumeMounts:
+            - mountPath: /bitnami/mariadb
+              name: data
+            - mountPath: /opt/bitnami/mariadb/conf/my.cnf
+              name: config
+              subPath: my.cnf
+      initContainers: null
+      securityContext:
+        fsGroup: 1001
+        runAsUser: 1001
+      serviceAccountName: default
+      volumes:
+        - configMap:
+            name: release-name-mariadb
+          name: config
+        - emptyDir: {}
+          name: data
+  updateStrategy:
+    type: RollingUpdate
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/_helpers.tpl b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/_helpers.tpl
new file mode 100644
index 00000000..2c35c1c2
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/_helpers.tpl
@@ -0,0 +1,22 @@
+{{/*
+Copyright (c) 2018-present, Facebook, Inc.
+All rights reserved.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree. An additional grant
+of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+{{/* Generate basic labels */}}
+{{- define "labels" -}}
+app.kubernetes.io/name: {{ .Chart.Name }}
+app.kubernetes.io/instance: orc8r
+app.kubernetes.io/managed-by: helm
+app.kubernetes.io/part-of: magma
+helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+{{- end -}}
+
+{{/* Generate selector labels */}}
+{{- define "selector-labels" -}}
+app.kubernetes.io/name: {{ .Chart.Name }}
+app.kubernetes.io/instance: orc8r
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/bootstrap-legacy.service.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/bootstrap-legacy.service.yaml
new file mode 100644
index 00000000..a807fb1f
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/bootstrap-legacy.service.yaml
@@ -0,0 +1,42 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+{{/*
+  Chart for a legacy open service for gateway bootstrapping.
+  We need this in place because old gateways are configured to connect to
+  cloud boostrap controller via port 443, not 9444. This service can go away
+  after all gateways in the field have been upgraded to talk to ports 9443/9444
+*/}}
+{{ $serviceType := .Values.proxy.service.type }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ required "Bootstrapping name is required" .Values.proxy.service.name }}
+  labels:
+    app.kubernetes.io/component: proxy
+{{ include "labels" . | indent 4 }}
+    {{- with .Values.proxy.service.labels }}
+{{ toYaml . | indent 4 }}
+    {{- end }}
+  {{- with .Values.proxy.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+  {{- end }}
+spec:
+  selector:
+    app.kubernetes.io/component: proxy
+{{ include "selector-labels" . | indent 4 }}
+  type: {{ .Values.proxy.service.type }}
+  ports:
+    {{- with .Values.proxy.service.port.open }}
+    - name: open
+      port: 443
+      targetPort: {{ .targetPort }}
+      {{- if (and (eq $serviceType "NodePort") (not (empty .nodePort))) }}
+      nodePort: {{ .nodePort }}
+      {{- end }}
+    {{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/clientcert-legacy.service.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/clientcert-legacy.service.yaml
new file mode 100644
index 00000000..fd6d1bb5
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/clientcert-legacy.service.yaml
@@ -0,0 +1,42 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+{{/*
+  Chart for a legacy clientcert-secured service. We need this in place because
+  old gateways are configured to connect to cloud via port 443, not 9443. This
+  service can go away after all gateways in the field have been upgraded to
+  talk to ports 9443/9444.
+*/}}
+{{ $serviceType := .Values.proxy.service.type }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: orc8r-clientcert-legacy
+  labels:
+    app.kubernetes.io/component: proxy
+{{ include "labels" . | indent 4 }}
+    {{- with .Values.proxy.service.labels }}
+{{ toYaml . | indent 4 }}
+    {{- end }}
+  {{- with .Values.proxy.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+  {{- end }}
+spec:
+  selector:
+    app.kubernetes.io/component: proxy
+{{ include "selector-labels" . | indent 4 }}
+  type: {{ .Values.proxy.service.type }}
+  ports:
+    {{- with .Values.proxy.service.port.clientcert }}
+    - name: clientcert
+      port: 443
+      targetPort: {{ .targetPort }}
+      {{- if (and (eq $serviceType "NodePort") (not (empty .nodePort))) }}
+      nodePort: {{ .nodePort }}
+      {{- end }}
+    {{- end }}
\ No newline at end of file
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/cloudwatch-agent.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/cloudwatch-agent.yaml
new file mode 100644
index 00000000..9ceee2af
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/cloudwatch-agent.yaml
@@ -0,0 +1,166 @@
+{{/*
+Copyright (c) 2018-present, Facebook, Inc.
+All rights reserved.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree. An additional grant
+of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+
+# Documentation and template from: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Container-Insights-setup-metrics.html
+# One of the pods tend to crashloop due to the node running out of available
+# inotify watchers (https://github.com/kubernetes/kubernetes/issues/70324)
+
+{{- if .Values.cloudwatch.create }}
+# create cwagent service account and role binding
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: orc8r-cloudwatch
+  namespace: {{ .Release.Namespace }}
+
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: orc8r-cloudwatch-role
+rules:
+  - apiGroups: [""]
+    resources: ["pods", "nodes", "endpoints"]
+    verbs: ["list", "watch"]
+  - apiGroups: ["apps"]
+    resources: ["replicasets"]
+    verbs: ["list", "watch"]
+  - apiGroups: ["batch"]
+    resources: ["jobs"]
+    verbs: ["list", "watch"]
+  - apiGroups: [""]
+    resources: ["nodes/proxy"]
+    verbs: ["get"]
+  - apiGroups: [""]
+    resources: ["nodes/stats", "configmaps", "events"]
+    verbs: ["create"]
+  - apiGroups: [""]
+    resources: ["configmaps"]
+    resourceNames: ["cwagent-clusterleader"]
+    verbs: ["get","update"]
+
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: orc8r-cloudwatch-role-binding
+subjects:
+  - kind: ServiceAccount
+    name: orc8r-cloudwatch
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: orc8r-cloudwatch-role
+  apiGroup: rbac.authorization.k8s.io
+
+---
+# create configmap for cwagent config
+apiVersion: v1
+data:
+  # Configuration is in Json format. No matter what configure change you make,
+  # please keep the Json blob valid.
+  cwagentconfig.json: |
+    {
+      "logs": {
+        "metrics_collected": {
+          "kubernetes": {
+            "metrics_collection_interval": 60
+          }
+        }
+      },
+      "force_flush_interval": 5
+    }
+kind: ConfigMap
+metadata:
+  name: cwagentconfig
+  namespace: {{ .Release.Namespace }}
+
+---
+# deploy cwagent as daemonset
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: orc8r-cloudwatch
+  namespace: {{ .Release.Namespace }}
+spec:
+  selector:
+    matchLabels:
+      name: orc8r-cloudwatch
+  template:
+    metadata:
+      labels:
+        name: orc8r-cloudwatch
+    spec:
+      containers:
+        - name: orc8r-cloudwatch
+          image: amazon/cloudwatch-agent:1.226589.0
+          resources:
+            limits:
+              cpu:  200m
+              memory: 200Mi
+            requests:
+              cpu: 200m
+              memory: 200Mi
+          # Please don't change below envs
+          env:
+            - name: HOST_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.hostIP
+            - name: HOST_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            - name: K8S_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: CI_VERSION
+              value: "k8s/1.0.0"
+          # Please don't change the mountPath
+          volumeMounts:
+            - name: cwagentconfig
+              mountPath: /etc/cwagentconfig
+            - name: rootfs
+              mountPath: /rootfs
+              readOnly: true
+            - name: dockersock
+              mountPath: /var/run/docker.sock
+              readOnly: true
+            - name: varlibdocker
+              mountPath: /var/lib/docker
+              readOnly: true
+            - name: sys
+              mountPath: /sys
+              readOnly: true
+            - name: devdisk
+              mountPath: /dev/disk
+              readOnly: true
+      volumes:
+        - name: cwagentconfig
+          configMap:
+            name: cwagentconfig
+        - name: rootfs
+          hostPath:
+            path: /
+        - name: dockersock
+          hostPath:
+            path: /var/run/docker.sock
+        - name: varlibdocker
+          hostPath:
+            path: /var/lib/docker
+        - name: sys
+          hostPath:
+            path: /sys
+        - name: devdisk
+          hostPath:
+            path: /dev/disk/
+      terminationGracePeriodSeconds: 60
+      serviceAccountName: orc8r-cloudwatch
+{{- end }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/controller.deployment.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/controller.deployment.yaml
new file mode 100644
index 00000000..43845bb0
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/controller.deployment.yaml
@@ -0,0 +1,133 @@
+{{/*
+Copyright (c) 2018-present, Facebook, Inc.
+All rights reserved.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree. An additional grant
+of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+{{- $serviceName := "orc8r-controller" -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $serviceName }}
+  labels:
+    app.kubernetes.io/component: controller
+{{ include "labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.controller.replicas }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: controller
+{{ include "selector-labels" . | indent 6 }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: controller
+{{ include "selector-labels" . | indent 8 }}
+    spec:
+      {{- with .Values.controller.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.controller.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.controller.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml . | trimSuffix "\n" | indent 8 }}
+      {{- end }}
+      volumes:
+        - name: certs
+          secret:
+            secretName: {{ required "secret.certs must be provided" .Values.secret.certs }}
+        - name: envdir
+          secret:
+            secretName: {{ required "secret.envdir must be provided" .Values.secret.envdir }}
+        {{- if .Values.secret.configs }}
+        {{- range $module, $secretName := .Values.secret.configs }}
+        - name: {{ $secretName }}
+          secret:
+            secretName: {{ $secretName }}
+        {{- end }}
+        {{- else }}
+        - name: "empty-configs"
+          emptyDir: {}
+        {{- end }}
+      containers:
+        - name: {{ $serviceName }}
+          image: {{ required "controller.image.repository must be provided" .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}
+          imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
+          #command: ["/bin/sh", "-c", "/usr/bin/supervisord && echo SLEEPING && /bin/sleep 120 && echo CONFIGURING && /var/opt/magma/bin/accessc add-existing -admin -cert /var/opt/magma/certs/admin_operator.pem admin_operator"]
+          #command: ["/bin/sh", "-c", "/usr/local/bin/wait-for-it.sh -s -t 30 postgresql:5432 && /var/opt/magma/bin/accessc add-existing -admin -cert /var/opt/magma/certs/admin_operator.pem admin_operator && /usr/bin/supervisord"]
+          lifecycle:
+            postStart:
+              exec: 
+                command: ["/bin/sh", "-c", "/usr/local/bin/wait-for-it.sh -s -t 30 postgresql:5432 && /var/opt/magma/bin/accessc add-existing -admin -cert /var/opt/magma/certs/admin_operator.pem admin_operator"]
+          volumeMounts:
+            {{- range tuple "certs" "envdir" }}
+            - name: {{ . }}
+              mountPath: /var/opt/magma/{{ . }}
+              readOnly: true
+            {{- end }}
+            {{- if .Values.secret.configs }}
+            {{- range $module, $secretName := .Values.secret.configs }}
+            - name: {{ $secretName }}
+              mountPath: {{ print "/var/opt/magma/configs/" $module }}
+              readOnly: true
+            {{- end }}
+            {{- else }}
+            - name: "empty-configs"
+              mountPath: /var/opt/magma/configs
+              readOnly: true
+            {{- end }}
+          ports:
+            {{- with .Values.controller.service }}
+            - containerPort: {{ .targetPort }}
+            {{- range $_, $port := untilStep (.portStart | int) (.portEnd | add1 | int) 1 }}
+            - containerPort: {{ $port }}
+            {{- end }}
+            {{- end }}
+          env:
+            - name: DATABASE_SOURCE
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $serviceName }}
+                  key: {{ .Values.controller.spec.database.driver }}.connstr
+            - name: SQL_DRIVER
+              value: {{ .Values.controller.spec.database.driver }}
+            - name: SQL_DIALECT
+              value: {{ .Values.controller.spec.database.sql_dialect }}
+            # Hostname override for dispatcher
+            - name: SERVICE_HOST_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            # Hostname override for metricsd
+            - name: HOST_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: USE_NEW_HANDLERS
+              value: "{{ .Values.controller.migration.new_handlers }}"
+            - name: USE_NEW_MCONFIGS
+              value: "{{ .Values.controller.migration.new_mconfigs }}"
+            - name: NEW_MCONFIGS_WHITELIST
+              value: {{ .Values.controller.migration.mconfig_whitelist }}
+          livenessProbe:
+            tcpSocket:
+              port: 9081
+            initialDelaySeconds: 10
+            periodSeconds: 30
+          readinessProbe:
+            tcpSocket:
+              port: 9081
+            initialDelaySeconds: 5
+            periodSeconds: 10
+          resources:
+{{ toYaml .Values.proxy.resources | indent 12 }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/controller.secret.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/controller.secret.yaml
new file mode 100644
index 00000000..f0264171
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/controller.secret.yaml
@@ -0,0 +1,25 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: orc8r-controller
+  labels:
+    app.kubernetes.io/component: controller
+{{ include "labels" . | indent 4 }}
+type: Opaque
+data:
+  {{- with .Values.controller.spec.database }}
+  {{ if eq .driver "postgres" }}
+  {{ .driver }}.connstr: {{ printf "dbname=%s user=%s password=%s host=%s port=%d sslmode=disable" .db .user .pass .host (.port | int) | b64enc | quote }}
+  {{- end }}
+  {{ if eq .driver "mysql" }}
+  {{ .driver }}.connstr: {{ printf "%s:%s@%s(%s:%d)/%s" .user .pass .protocol .host (.port | int) .db | b64enc | quote }}
+  {{- end }}
+  {{- end }}
+
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/controller.service.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/controller.service.yaml
new file mode 100644
index 00000000..28a30c89
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/controller.service.yaml
@@ -0,0 +1,37 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: orc8r-controller
+  labels:
+    app.kubernetes.io/component: controller
+{{ include "labels" . | indent 4 }}
+    {{- with .Values.controller.service.labels }}
+{{ toYaml . | indent 4}}
+    {{- end}}
+  {{- with .Values.controller.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4}}
+  {{- end }}
+spec:
+  selector:
+    app.kubernetes.io/component: controller
+{{ include "selector-labels" . | indent 4 }}
+  type: {{ .Values.controller.service.type }}
+  ports:
+    {{- with .Values.controller.service }}
+    - name: web
+      port: {{ .port }}
+      targetPort: {{ .targetPort }}
+    {{- range $i, $port := untilStep (.portStart | int) (.portEnd | add1 | int) 1 }}
+    - name: port-{{ $i }}
+      port: {{ $port }}
+      targetPort: {{ $port }}
+    {{- end }}
+    {{- end }}
\ No newline at end of file
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/proxy.deployment.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/proxy.deployment.yaml
new file mode 100644
index 00000000..8e751550
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/proxy.deployment.yaml
@@ -0,0 +1,96 @@
+{{/*
+Copyright (c) 2018-present, Facebook, Inc.
+All rights reserved.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree. An additional grant
+of patent rights can be found in the PATENTS file in the same directory.
+*/}}
+{{- $serviceName := "orc8r-proxy" -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ $serviceName }}
+  labels:
+    app.kubernetes.io/component: proxy
+{{ include "labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.proxy.replicas }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: proxy
+{{ include "selector-labels" . | indent 6 }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: proxy
+{{ include "selector-labels" . | indent 8 }}
+    spec:
+      {{- with .Values.proxy.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.proxy.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.proxy.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml . | trimSuffix "\n" | indent 8 }}
+      {{- end }}
+      volumes:
+        - name: certs
+          secret:
+            secretName: {{ required "secret.certs must be provided" .Values.secret.certs }}
+        - name: envdir
+          secret:
+            secretName: {{ required "secret.envdir must be provided" .Values.secret.envdir }}
+      containers:
+        - name: {{ $serviceName }}
+          image: {{ required "proxy.image.repository must be provided" .Values.proxy.image.repository }}:{{ .Values.proxy.image.tag }}
+          imagePullPolicy: {{ .Values.proxy.image.pullPolicy }}
+          volumeMounts:
+            {{- range tuple "certs" "envdir" }}
+            - name: {{ . }}
+              mountPath: /var/opt/magma/{{ . }}
+              readOnly: true
+            {{- end }}
+          ports:
+            - name: clientcert
+              containerPort: {{ .Values.proxy.service.port.clientcert.targetPort }}
+            - name: open
+              containerPort: {{ .Values.proxy.service.port.open.targetPort }}
+          env:
+            - name: PROXY_BACKENDS
+              value: "orc8r-controller"
+            - name: CONTROLLER_HOSTNAME
+              value: {{ required "proxy.spec.hostname must be provided" .Values.proxy.spec.hostname | quote }}
+            - name: HTTP_PROXY_HOSTNAME
+              value: {{ .Values.proxy.spec.http_proxy_hostname | quote }}
+            - name: HTTP_PROXY_BACKEND
+              value: {{ .Values.proxy.spec.http_proxy_backend | quote }}
+            - name: HTTP_PROXY_DOCKER_HOSTNAME
+              value: {{ .Values.proxy.spec.http_proxy_docker_hostname | quote }}
+            - name: HTTP_PROXY_GITHUB_HOSTNAME
+              value: {{ .Values.proxy.spec.http_proxy_github_hostname | quote }}
+            # Hostname override for metricsd
+            - name: HOST_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+          livenessProbe:
+            tcpSocket:
+              port: clientcert
+            initialDelaySeconds: 10
+            periodSeconds: 30
+          readinessProbe:
+            tcpSocket:
+              port: clientcert
+            initialDelaySeconds: 5
+            periodSeconds: 10
+          resources:
+{{ toYaml .Values.proxy.resources | indent 12 }}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/proxy.service.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/proxy.service.yaml
new file mode 100644
index 00000000..a2c106a2
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/templates/proxy.service.yaml
@@ -0,0 +1,55 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+{{ $serviceType := .Values.proxy.service.type }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: orc8r-proxy
+  labels:
+    app.kubernetes.io/component: proxy
+{{ include "labels" . | indent 4 }}
+    {{- with .Values.proxy.service.labels }}
+{{ toYaml . | indent 4 }}
+    {{- end }}
+  {{- with .Values.proxy.service.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+  {{- end }}
+spec:
+  selector:
+    app.kubernetes.io/component: proxy
+{{ include "selector-labels" . | indent 4 }}
+  type: {{ .Values.proxy.service.type }}
+  ports:
+    {{- with .Values.proxy.service.port.clientcert }}
+    - name: clientcert
+      port: {{ .port }}
+      targetPort: {{ .targetPort }}
+      {{- if (and (eq $serviceType "NodePort") (not (empty .nodePort))) }}
+      nodePort: {{ .nodePort }}
+      {{- end }}
+    {{- end }}
+    {{- with .Values.proxy.service.port.open }}
+    - name: open
+      port: {{ .port }}
+      targetPort: {{ .targetPort }}
+      {{- if (and (eq $serviceType "NodePort") (not (empty .nodePort))) }}
+      nodePort: {{ .nodePort }}
+      {{- end }}
+    {{- end }}
+{{- if eq .Values.proxy.service.type "LoadBalancer" }}
+  {{- if .Values.proxyserviceloadBalancerIP }}
+  loadBalancerIP: {{ .Values.proxyserviceloadBalancerIP }}
+  {{- end -}}
+  {{- if .Values.proxy.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- range .Values.proxy.service.loadBalancerSourceRanges }}
+  - {{ . }}
+  {{- end }}
+  {{- end -}}
+{{- end -}}
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/tiller-rbac-config.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/tiller-rbac-config.yaml
new file mode 100644
index 00000000..4839e7ed
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/tiller-rbac-config.yaml
@@ -0,0 +1,22 @@
+# RBAC config for tiller. We grant cluster-admin to tiller so it can manage
+# all namespaces. For a new cluster, kubectl apply this after installing
+# tiller.
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: tiller
+  namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: tiller
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+  - kind: ServiceAccount
+    name: tiller
+    namespace: kube-system
diff --git a/magma/fb_magma_knf/helm-chart-v3s/orc8r/values.yaml b/magma/fb_magma_knf/helm-chart-v3s/orc8r/values.yaml
new file mode 100644
index 00000000..91b738a3
--- /dev/null
+++ b/magma/fb_magma_knf/helm-chart-v3s/orc8r/values.yaml
@@ -0,0 +1,184 @@
+# Copyright (c) 2018-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+## Global values for NMS chart
+nms:
+  magmalte:
+    manifests:
+      secrets: true
+      deployment: true
+      service: true
+      rbac: true
+    image:
+      repository: fjvicens/magmalte
+      tag: latest
+  nginx:
+    manifests:
+      configmap: true
+      secrets: true
+      deployment: true
+      service: true
+      rbac: true
+
+# Reference to one or more secrets to be used when pulling images
+# ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+imagePullSecrets: []
+# - name: orc8r-secrets-registry
+
+## metrics subchart configuration.
+metrics:
+  metrics:
+    create: true
+  prometheus:
+    create: true
+  prometheusCache:
+    create: true
+  alertmanager:
+    create: false
+  configmanager:
+    create: true
+
+# secrets subchart configuration.
+secrets:
+  create: true
+
+# Define which secrets should be mounted by pods.
+secret:
+  certs: orc8r-secrets-certs
+  configs:
+    orc8r: orc8r-secrets-configs-orc8r
+  envdir: orc8r-secrets-envdir
+
+proxyserviceloadBalancerIP: ""
+nginxserviceloadBalancerIP: ""
+
+proxy:
+  # Service configuration.
+  service:
+    name: bootstrapper-orc8r-proxy
+    annotations: {}
+    labels: {}
+    type: LoadBalancer
+    port:
+      clientcert:
+        port: 9443
+        targetPort: 9443
+        nodePort: ""
+      open:
+        port: 9444
+        targetPort: 9444
+        nodePort: ""
+    loadBalancerIP: ""
+    loadBalancerSourceRanges: []
+
+  # proxy image
+  image:
+    repository: fjvicens/orc8r_proxy
+    tag: latest
+    pullPolicy: IfNotPresent
+
+  # Settings affecting proxy application
+  spec:
+    # magma controller domain name
+    hostname: "controller.magma.test"
+    http_proxy_backend: "orc8r-controller"
+    #http_proxy_hostname: ""
+    #http_proxy_docker_hostname: ""
+    #http_proxy_github_hostname: ""
+
+  # Number of proxy replicas desired
+  replicas: 1
+
+  # Resource limits & requestss
+  resources: {}
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+  # Define which Nodes the Pods are scheduled on.
+  # ref: https://kubernetes.io/docs/user-guide/node-selection/
+  nodeSelector: {}
+
+  # Tolerations for use with node taints
+  # ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
+
+  # Assign proxy to run on specific nodes
+  # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  affinity: {}
+
+controller:
+  # Service configuration.
+  service:
+    annotations: {}
+    labels: {}
+    type: ClusterIP
+    port: 8080
+    targetPort: 8080
+    # port range exposed by controller
+    portStart: 9079
+    portEnd: 9108
+
+  # controller image
+  image:
+    repository: fjvicens/orc8r_controller
+    tag: latest
+    pullPolicy: IfNotPresent
+
+  spec:
+    # Postgres/mysql configuration
+    database:
+      driver: postgres      # mysql/postgres
+      sql_dialect: psql # maria/psql
+      db: magma          # DB Name
+      protocol: tcp
+      host: postgresql
+      port: 5432
+      user: postgres
+      pass: postgres
+
+  migration:
+    new_handlers: 0
+    new_mconfigs: 0
+    mconfig_whitelist: ""
+
+  # Number of controller replicas desired
+  replicas: 1
+
+  # Resource limits & requests
+  resources: {}
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+  # Define which Nodes the Pods are scheduled on.
+  # ref: https://kubernetes.io/docs/user-guide/node-selection/
+  nodeSelector: {}
+
+  # Tolerations for use with node taints
+  # ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
+
+  # Assign proxy to run on specific nodes
+  # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  affinity: {}
+
+# Set True to create a CloudWatch agent to monitor metrics 
+cloudwatch:
+  create: false
+
+mariadb:
+  create: true
+
+postgresql:
+  create: true
\ No newline at end of file
-- 
GitLab