diff --git a/sdcore-adapter/.helmignore b/sdcore-adapter/.helmignore
new file mode 100644
index 0000000..01d4cd9
--- /dev/null
+++ b/sdcore-adapter/.helmignore
@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: 2021 Open Networking Foundation
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+# 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
diff --git a/sdcore-adapter/Chart.yaml b/sdcore-adapter/Chart.yaml
new file mode 100644
index 0000000..b4b7191
--- /dev/null
+++ b/sdcore-adapter/Chart.yaml
@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: v2
+name: sdcore-adapter
+kubeVersion: ">=1.17.0"
+type: application
+version: 3.0.15
+appVersion: v3.0.0
+description: ONOS SD-Core Adapter
+keywords:
+  - onos
+  - sdn
+home: https://onosproject.org
+maintainers:
+  - name: ONOS Support
+    email: support@opennetworking.org
diff --git a/sdcore-adapter/README.md b/sdcore-adapter/README.md
new file mode 100644
index 0000000..c589608
--- /dev/null
+++ b/sdcore-adapter/README.md
@@ -0,0 +1,9 @@
+<!--
+SPDX-FileCopyrightText: 2021 Open Networking Foundation
+
+SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+-->
+
+## ONOS SD-Core Adapter
+
+Provides a [Helm] chart for deploying µONOS SD-Core adapter on [Kubernetes].
diff --git a/sdcore-adapter/files/certs/README.md b/sdcore-adapter/files/certs/README.md
new file mode 100644
index 0000000..ae3f841
--- /dev/null
+++ b/sdcore-adapter/files/certs/README.md
@@ -0,0 +1,32 @@
+<!--
+SPDX-FileCopyrightText: 2021 Open Networking Foundation
+
+SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+-->
+
+This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
+CERTIFICATES IN PRODUCTION!_
+
+The certificates were generated with the
+https://github.com/onosproject/simulators/blob/master/pkg/certs/generate_certs.sh 
+script as
+```bash
+generate_certs.sh sdcore-adapter
+```
+
+In this folder they **must** be (re)named
+* tls.cacrt
+* tls.crt
+* tls.key
+
+Use
+```bash
+openssl x509 -in deployments/helm/onos-config/files/certs/tls.crt -text -noout
+```
+to verify the contents (especially the subject).
+
+There is another Cert for onos-config in test/certs but these were created with:
+```
+generate-certs.sh onos-config
+```
+and are left named onf.cacrt, onos-config.key and onos-config.crt
\ No newline at end of file
diff --git a/sdcore-adapter/files/certs/tls.cacert b/sdcore-adapter/files/certs/tls.cacert
new file mode 100644
index 0000000..879bc06
--- /dev/null
+++ b/sdcore-adapter/files/certs/tls.cacert
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDYDCCAkgCCQDe99fSN9qxSTANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCU1lbmxvUGFyazEMMAoGA1UECgwDT05G
+MRQwEgYDVQQLDAtFbmdpbmVlcmluZzEeMBwGA1UEAwwVY2Eub3Blbm5ldHdvcmtp
+bmcub3JnMB4XDTE5MDQxMTA5MDYxM1oXDTI5MDQwODA5MDYxM1owcjELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgMAkNBMRIwEAYDVQQHDAlNZW5sb1BhcmsxDDAKBgNVBAoM
+A09ORjEUMBIGA1UECwwLRW5naW5lZXJpbmcxHjAcBgNVBAMMFWNhLm9wZW5uZXR3
+b3JraW5nLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEg7CZR
+X8Y+syKHaQCh6mNIL1D065trwX8RnuKM2kBwSu034zefQAPloWugSoJgJnf5fe0j
+nUD8gN3Sm8XRhCkvf67pzfabgw4n8eJmHScyL/ugyExB6Kahwzn37bt3oT3gSqhr
+6PUznWJ8fvfVuCHZZkv/HPRp4eyAcGzbJ4TuB0go4s6VE0WU5OCxCSlAiK3lvpVr
+3DOLdYLVoCa5q8Ctl3wXDrfTLw5/Bpfrg9fF9ED2/YKIdV8KZ2ki/gwEOQqWcKp8
+0LkTlfOWsdGjp4opPuPT7njMBGXMJzJ8/J1e1aJvIsoB7n8XrfvkNiWL5U3fM4N7
+UZN9jfcl7ULmm7cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAIh6FjkQuTfXddmZY
+FYpoTen/VD5iu2Xxc1TexwmKeH+YtaKp1Zk8PTgbCtMEwEiyslfeHTMtODfnpUIk
+DwvtB4W0PAnreRsqh9MBzdU6YZmzGyZ92vSUB3yukkHaYzyjeKM0AwgVl9yRNEZw
+Y/OM070hJXXzJh3eJpLl9dlUbMKzaoAh2bZx6y3ZJIZFs/zrpGfg4lvBAvfO/59i
+mxJ9bQBSN3U2Hwp6ioOQzP0LpllfXtx9N5LanWpB0cu/HN9vAgtp3kRTBZD0M1XI
+Ctit8bXV7Mz+1iGqoyUhfCYcCSjuWTgAxzir+hrdn7uO67Hv4ndCoSj4SQaGka3W
+eEfVeA==
+-----END CERTIFICATE-----
diff --git a/sdcore-adapter/files/certs/tls.crt b/sdcore-adapter/files/certs/tls.crt
new file mode 100644
index 0000000..c724912
--- /dev/null
+++ b/sdcore-adapter/files/certs/tls.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDZDCCAkwCFErBGzsXHo1l8bmZRmDkF+h2bsdWMA0GCSqGSIb3DQEBCwUAMHIx
+CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJTWVubG9QYXJrMQww
+CgYDVQQKDANPTkYxFDASBgNVBAsMC0VuZ2luZWVyaW5nMR4wHAYDVQQDDBVjYS5v
+cGVubmV0d29ya2luZy5vcmcwHhcNMjAwOTIxMjAyNzM3WhcNMzAwOTE5MjAyNzM3
+WjBrMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCU1lbmxvUGFy
+azEMMAoGA1UECgwDT05GMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEXMBUGA1UEAwwO
+c2Rjb3JlLWFkYXB0ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3
+w6n5TzQ3Mx6T7q9WCxEsqpWja9EOV+4GrHLJU/DiIbNTBb7zchOZ56uXoZwpVSeu
+mGz+teCE59S55Iwmx6RJ3Hwqxv+ZVN93sYf7E+91I2ccRj4GvJHz4cVifgug0aG4
+CpqWeBP96Xa0fIJnw6s3sslG27N+KO3Qv5o+V1cz0P3mnYePt+PzTUyKVM5mEsH9
+RjzGSJRuIpB388K+2XW+tMAdB+0IpszKXrUH5bIWCbi/hYMDXI7Gs7TtNQw7ZkIn
+sUQ8FYgJQI1F1hVAsFjsKsN0/resy+YG80ClMV2lXKCr/jUOv0PWwOKwt8TYKDNX
+g4qxn6V/zUGqSttW1KhZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABXfT9THxoEF
+nHfN+7wAJSh/BGvGcDj/aqMSFItWU8L5meixgZMwdLhjBbjpkSaY5xWw/MMSsXEA
+pemjCvuOO/gD9/HNr1e1xh112O9a2QDRtv5WgAx/ugYeV/wGOxQZROzMFVpAzSUU
+yQO5iGPGGaVOZJ6E1iOSP5SJn2XWjOBQEcmUAV8DtdRzsOWRda/YDdqX6KDULwl9
+hym9r96skzS/jMejV/MYaxgaVB5Xqr6k3JT23msBpkzUIzlO0rMOiJ98h36zqynQ
+HnPtpaZ45VgBxNlU39T81C1UjKhw1HTWEuPX5bJyGnNAdKBfHfQVJrdnJYTCZfYZ
+9CeRFCy3P84=
+-----END CERTIFICATE-----
diff --git a/sdcore-adapter/files/certs/tls.key b/sdcore-adapter/files/certs/tls.key
new file mode 100644
index 0000000..58b76b7
--- /dev/null
+++ b/sdcore-adapter/files/certs/tls.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3w6n5TzQ3Mx6T
+7q9WCxEsqpWja9EOV+4GrHLJU/DiIbNTBb7zchOZ56uXoZwpVSeumGz+teCE59S5
+5Iwmx6RJ3Hwqxv+ZVN93sYf7E+91I2ccRj4GvJHz4cVifgug0aG4CpqWeBP96Xa0
+fIJnw6s3sslG27N+KO3Qv5o+V1cz0P3mnYePt+PzTUyKVM5mEsH9RjzGSJRuIpB3
+88K+2XW+tMAdB+0IpszKXrUH5bIWCbi/hYMDXI7Gs7TtNQw7ZkInsUQ8FYgJQI1F
+1hVAsFjsKsN0/resy+YG80ClMV2lXKCr/jUOv0PWwOKwt8TYKDNXg4qxn6V/zUGq
+SttW1KhZAgMBAAECggEAcxbbHGYriKq+at3g+B2ESxonD6uVycruK0XTuh2VTrrW
+iZeeqO94MTqz8ApqOES5zpJuKPQVwodDZo0p7Zu5W/z30v7A0/Ig5uDMDkbFAPME
+P+QKMsPlEP4EVhQlCjpgc1hIyxY3Rx3xl0Ynkf8s+3xArN0qREgz8Toeyw5+cddR
+DM7kh9rdq9euA7lnoyiTP8UgSDzMrzLnGj8CbJHcKLzNwA2zwSJtBhdLoWbYCyCD
+JLPFGsuIHV2kuvHpmOxxS+vypT9bETxf60yevug+ay7K7Bgt+amX30RU/SFkF6Aa
+JJYaMf2VAdg6O1g5jNXZ4KuWvRUFt6jxjOg8MI87tQKBgQDmjZTD3mogD5LbT8uv
+sMe9QMp/xGvRiAiOkalpDrsF9zgob0fH9nTf1o767OjYJwRmBE1vQPRd/KFNJQ/d
+zulyR5rdWKoLen/q+fYJSdf1gl7ZDomFSr1IVBksab4ifQ9bSBn6d2n5PKenlW9M
+aJMj5izeskuRlCsjkBsuU+voowKBgQDMDAnCnxOdI/ryY6wx5WXsMPh0RLkcXPnq
+d00iVjKNhrpBVwvh8VGAuUfpGoEmI2I3WWwrmAp6t8LrdHPQlQDS/dlmY1+CarF7
+soCpw8UjhKiB18jUPewaYNbr5olVdYC/Nt70JJwxvQZNCnCwCfJpgkG83UtXSFsA
+WKILTFkO0wKBgQDEowy24gPxxFak5rH67vPs3k3YG1c6JqPltSagjAfHVst28TJv
+wix8nSrlqRoPAXgm6pSAxw2k+8s3WNzneYpyBdB36R9fGuPvLbJCydB/fOoYhuWT
+4eL+xXuS/b1E/RUT7bL6hM7F3I3ByRpcOPUGMVMjvT3mtFD2y/ni0YDrsQKBgCBf
+sJS+ZIBEGyamBcYM3XTx+BmKZcxIPCalMwnFn1OxEpAXXX1Fqma//tbPK7p/Vq/t
+ciogf1klGrn8yftICM9xEzMZhSfOAcbcdWl59CdEfu/K6sQx5unwf2kCNLvoXrr3
+27vkqxuBICTNCUAE8/8leYSbn76DblzJszwTqvWdAoGBAKscYUC9wyrcersVHFmD
+L8sba/8alQ/orX9/Ex3Fyhe8Hn4877znq2Cixnd6zA13o0mJIMRtKOX3CC6XG1WI
+eC0WgAUnbdWlgIyrAnyYQytSWEItJH7nBIOcB7BvkqVHd1/y0/OMgeDiBI7/mHb9
+EZHA1SMvz1yEKUm53DyCh8Nj
+-----END PRIVATE KEY-----
diff --git a/sdcore-adapter/files/configs/README.md b/sdcore-adapter/files/configs/README.md
new file mode 100644
index 0000000..cade213
--- /dev/null
+++ b/sdcore-adapter/files/configs/README.md
@@ -0,0 +1,10 @@
+<!--
+SPDX-FileCopyrightText: 2021 Open Networking Foundation
+
+SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+-->
+
+This folder contains test configurations that are loaded into the application
+via a `ConfigMap` when deploying via this Helm chart. The root test configurations
+are copied here because Helm does not allow files outside the chart to be accessed
+via templates. Changes to the root test configurations should be reflected here.
diff --git a/sdcore-adapter/files/configs/empty_config.json b/sdcore-adapter/files/configs/empty_config.json
new file mode 100644
index 0000000..2c63c08
--- /dev/null
+++ b/sdcore-adapter/files/configs/empty_config.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/sdcore-adapter/files/configs/typical_aether_config.json b/sdcore-adapter/files/configs/typical_aether_config.json
new file mode 100644
index 0000000..3353206
--- /dev/null
+++ b/sdcore-adapter/files/configs/typical_aether_config.json
@@ -0,0 +1,72 @@
+{
+  "access-profile": {
+    "access-profile": [
+      {
+        "id": "typical-access-profile",
+        "type": "internet-only",
+        "filter": "allow app name",
+        "description": "a typical access profile"
+      }
+    ]
+  },  
+  "apn-profile": {
+    "apn-profile": [
+      {
+        "id": "typical-apn-profile",
+        "apn-name": "internet",
+        "dns-primary": "8.8.8.4",
+        "dns-secondary": "8.8.8.8",
+        "mtu": 1460,
+        "gx-enabled": true,
+        "description": "a typical apn profile"
+      }
+    ]
+  },
+  "qos-profile": {
+    "qos-profile": [
+      {
+        "id": "typical-qos-profile",
+        "apn-ambr": {
+          "uplink": 4096,
+          "downlink": 4096
+        },
+        "description": "a typical qos profile"
+      }
+    ]
+  },
+  "up-profile": {
+    "up-profile": [
+      {
+        "id": "typical-up-profile",
+        "user-plane": "spgwu1.headless",
+        "access-control": "all",
+        "description": "a typical up profile"
+      }
+    ]
+  },    
+  "subscriber": {
+    "ue": [
+      {
+        "ueid": "e150109999111",
+        "serving-plmn": {
+          "mcc": 208,
+          "mnc": 11,
+          "tac": 1
+        },
+        "enabled": true,
+        "requested-apn": "mme-selected-apn",
+        "profiles": {
+          "apn-profile": "typical-apn-profile",
+          "qos-profile": "typical-qos-profile",
+          "up-profile": "typical-up-profile",
+          "access-profile": [
+            {
+              "access-profile": "typical-access-profile",
+              "allowed": true
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/sdcore-adapter/templates/_helpers.tpl b/sdcore-adapter/templates/_helpers.tpl
new file mode 100644
index 0000000..e7d9bab
--- /dev/null
+++ b/sdcore-adapter/templates/_helpers.tpl
@@ -0,0 +1,56 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+Expand the name of the chart.
+*/}}
+{{- define "sdcore-adapter.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 "sdcore-adapter.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 "sdcore-adapter.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{/*
+Common labels
+*/}}
+{{- define "sdcore-adapter.labels" -}}
+helm.sh/chart: {{ include "sdcore-adapter.chart" . }}
+{{ include "sdcore-adapter.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "sdcore-adapter.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "sdcore-adapter.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
diff --git a/sdcore-adapter/templates/configmap.yaml b/sdcore-adapter/templates/configmap.yaml
new file mode 100644
index 0000000..057871f
--- /dev/null
+++ b/sdcore-adapter/templates/configmap.yaml
@@ -0,0 +1,33 @@
+# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "sdcore-adapter.fullname" . }}-targetconfig
+  labels:
+    app: {{ template "sdcore-adapter.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+data:
+  {{ $root := . }}
+  {{ range $path, $bytes := .Files.Glob "files/configs/*.json" }}
+  {{ base $path }}: '{{ $root.Files.Get $path }}'
+  {{ end }}
+
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "sdcore-adapter.fullname" . }}-logconfig
+  labels:
+    app: {{ template "sdcore-adapter.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+data:
+  logging.yaml: |-
+{{ toYaml .Values.logging | indent 4 }}
diff --git a/sdcore-adapter/templates/deployment.yaml b/sdcore-adapter/templates/deployment.yaml
new file mode 100644
index 0000000..e381db6
--- /dev/null
+++ b/sdcore-adapter/templates/deployment.yaml
@@ -0,0 +1,131 @@
+# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "sdcore-adapter.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    name: {{ template "sdcore-adapter.fullname" . }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "sdcore-adapter.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        name: {{ template "sdcore-adapter.fullname" . }}
+        {{- include "sdcore-adapter.selectorLabels" . | nindent 8 }}
+    spec:
+    {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 6 }}
+    {{- end }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+          args:
+            - "/usr/local/bin/sdcore-adapter"
+            - "-bind_address=:{{ .Values.ports.gnmi.secure }}"
+            - "-key=/etc/sdcore-adapter/certs/tls.key"
+            - "-cert=/etc/sdcore-adapter/certs/tls.crt"
+            - "-ca=/etc/sdcore-adapter/certs/tls.cacert"
+            - "-alsologtostderr"
+            - "-hostCheckDisabled"
+            - "-model_version={{ .Values.model.version }}"
+            {{ if .Values.initialConfig }}
+            - "-config={{ .Values.initialConfig }}"
+            {{ end }}
+            {{ if .Values.output }}
+            - "-output={{ .Values.output }}"
+            {{ end }}
+            {{ if .Values.spgwEndpoint }}
+            - "-spgw_endpoint={{ .Values.spgwEndpoint }}"
+            {{ end }}
+          ports:
+            {{- range $key, $port := .Values.ports.gnmi }}
+            - name: gnmi{{ $key }}
+              containerPort: {{ $port }}
+            {{- end}}
+          readinessProbe:
+            tcpSocket:
+              port: {{ .Values.ports.gnmi.secure }}
+            initialDelaySeconds: 5
+            periodSeconds: 10
+          livenessProbe:
+            tcpSocket:
+              port: {{ .Values.ports.gnmi.secure }}
+            initialDelaySeconds: 15
+            periodSeconds: 20
+          volumeMounts:
+            - name: targetconfig
+              mountPath: /etc/sdcore-adapter/configs
+              readOnly: true
+            - name: secret
+              mountPath: /etc/sdcore-adapter/certs
+              readOnly: true              
+            - name: logconfig
+              mountPath: /etc/onos/config
+              readOnly: true
+        - name: {{ .Chart.Name }}-exporter
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+          args:
+            - "/usr/local/bin/sdcore-exporter"
+          ports:
+            - name: metrics
+              containerPort: 2112
+          readinessProbe:
+            httpGet:
+              path: /metrics
+              port: 2112
+            initialDelaySeconds: 5
+            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              path: /metrics
+              port: 2112
+            initialDelaySeconds: 15
+            periodSeconds: 20
+      volumes:
+        - name: logconfig
+          configMap:
+            name: {{ template "sdcore-adapter.fullname" . }}-logconfig
+        - name: targetconfig
+          configMap:
+            name: {{ template "sdcore-adapter.fullname" . }}-targetconfig            
+        - name: secret
+          secret:
+            secretName: {{ template "sdcore-adapter.fullname" . }}-secret
diff --git a/sdcore-adapter/templates/secret.yaml b/sdcore-adapter/templates/secret.yaml
new file mode 100644
index 0000000..f54e403
--- /dev/null
+++ b/sdcore-adapter/templates/secret.yaml
@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "sdcore-adapter.fullname" . }}-secret
+  labels:
+     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+     release: "{{ .Release.Name }}"
+     heritage: "{{ .Release.Service }}"
+data:
+  {{ $root := . }}
+  {{ range $path, $bytes := .Files.Glob "files/certs/tls.*" }}
+  {{ base $path }}: '{{ $root.Files.Get $path | b64enc }}'
+  {{ end }}
+type: Opaque
diff --git a/sdcore-adapter/templates/service.yaml b/sdcore-adapter/templates/service.yaml
new file mode 100644
index 0000000..a266be4
--- /dev/null
+++ b/sdcore-adapter/templates/service.yaml
@@ -0,0 +1,47 @@
+# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "sdcore-adapter.fullname" . }}
+  labels:
+    app: {{ template "sdcore-adapter.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+    {{- include "sdcore-adapter.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  selector:
+    name: {{ template "sdcore-adapter.fullname" . }}
+  ports:
+    {{- range $key, $port := .Values.ports.gnmi }}
+    - name: gnmi{{ $key }}
+      port: {{ $port }}
+    {{- end}}
+    - name: prometheus
+      port: {{ .Values.ports.prometheus }}
+    - name: diag-api
+      port: {{ .Values.ports.diagApi }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "sdcore-adapter.fullname" . }}-exporter
+  labels:
+    app: {{ template "sdcore-adapter.fullname" . }}-exporter
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+    {{- include "sdcore-adapter.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  selector:
+    name: {{ template "sdcore-adapter.fullname" . }}
+  ports:
+  - name: metrics
+    port: 2112
+  - name: exporterui
+    port: 8081
diff --git a/sdcore-adapter/templates/servicemonitor.yaml b/sdcore-adapter/templates/servicemonitor.yaml
new file mode 100644
index 0000000..f3d9c89
--- /dev/null
+++ b/sdcore-adapter/templates/servicemonitor.yaml
@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+{{- if eq .Values.prometheusEnabled true }}
+
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: sdcore-adapter
+  labels:
+    {{- include "sdcore-adapter.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "sdcore-adapter.selectorLabels" . | nindent 6 }}
+  endpoints:
+  - port: prometheus
+    path: /metrics
+    scheme: HTTP
+{{ end }}
diff --git a/sdcore-adapter/values.yaml b/sdcore-adapter/values.yaml
new file mode 100644
index 0000000..eca6754
--- /dev/null
+++ b/sdcore-adapter/values.yaml
@@ -0,0 +1,57 @@
+# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+nameOverride: ""
+fullnameOverride: ""
+
+replicaCount: 1
+annotations: {}
+
+image:
+  repository: onosproject/sdcore-adapter
+  tag: v0.1.36
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+
+resources:
+  requests:
+    cpu: 0.5
+    memory: 512Mi
+
+service:
+  type: ClusterIP
+
+model:
+  version: v3
+
+secure: true
+initialConfig: ""
+output: ""
+spgwEndpoint: ""
+
+ports:
+  gnmi:
+    secure: 5150
+  prometheus: 9851
+  diagApi: 8080
+
+prometheusEnabled: true
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+logging:
+  loggers:
+    root:
+      level: info
+      output:
+        stdout:
+          sink: stdout
+  sinks:
+    stdout:
+      type: stdout
+      stdout: {}