diff --git a/aether-roc-api/.helmignore b/aether-roc-api/.helmignore
new file mode 100644
index 0000000..f7a328e
--- /dev/null
+++ b/aether-roc-api/.helmignore
@@ -0,0 +1,26 @@
+# 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
+.vscode/
diff --git a/aether-roc-api/Chart.yaml b/aether-roc-api/Chart.yaml
new file mode 100644
index 0000000..c426ff3
--- /dev/null
+++ b/aether-roc-api/Chart.yaml
@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: v2
+name: aether-roc-api
+description: Aether ROC API
+kubeVersion: ">=1.15.0"
+type: application
+version: 1.1.14
+appVersion: v0.7.14
+keywords:
+  - aether
+  - config
+  - roc
+  - openapi3
+  - gnmi
+home: https://www.opennetworking.org/aether/
+maintainers:
+  - name: Aether Ops team
+    email: support@opennetworking.org
diff --git a/aether-roc-api/README.md b/aether-roc-api/README.md
new file mode 100644
index 0000000..c0b24a6
--- /dev/null
+++ b/aether-roc-api/README.md
@@ -0,0 +1,10 @@
+<!--
+SPDX-FileCopyrightText: 2021 Open Networking Foundation
+
+SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+-->
+
+## Aether ROC API
+
+Provides a [Helm] chart for deploying µONOS Aether ROC API micro service on [Kubernetes].
+See the [documentation](https://docs.onosproject.org/onos-docs/docs/content/developers/deploy_with_helm/) for more info.
diff --git a/aether-roc-api/files/certs/README.md b/aether-roc-api/files/certs/README.md
new file mode 100644
index 0000000..e33ad8d
--- /dev/null
+++ b/aether-roc-api/files/certs/README.md
@@ -0,0 +1,26 @@
+<!--
+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/gnxi-simulators/blob/master/pkg/certs/generate_certs.sh 
+script as
+```bash
+generate-certs.sh aether-roc-api.opennetworking.org
+```
+
+In this folder they **must** be (re)named
+* tls.cacrt
+* tls.crt
+* tls.key
+
+Use
+```bash
+openssl x509 -in aether-roc-api/files/certs/tls.crt -text -noout
+```
+to verify the contents (especially the subject).
diff --git a/aether-roc-api/files/certs/tls.cacrt b/aether-roc-api/files/certs/tls.cacrt
new file mode 100644
index 0000000..d4440bd
--- /dev/null
+++ b/aether-roc-api/files/certs/tls.cacrt
@@ -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-----
\ No newline at end of file
diff --git a/aether-roc-api/files/certs/tls.crt b/aether-roc-api/files/certs/tls.crt
new file mode 100644
index 0000000..581d9b3
--- /dev/null
+++ b/aether-roc-api/files/certs/tls.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl8CFErBGzsXHo1l8bmZRmDkF+h2bsdVMA0GCSqGSIb3DQEBCwUAMHIx
+CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJTWVubG9QYXJrMQww
+CgYDVQQKDANPTkYxFDASBgNVBAsMC0VuZ2luZWVyaW5nMR4wHAYDVQQDDBVjYS5v
+cGVubmV0d29ya2luZy5vcmcwHhcNMjAwODI3MTExOTQ3WhcNMzAwODI1MTExOTQ3
+WjB+MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCU1lbmxvUGFy
+azEMMAoGA1UECgwDT05GMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEqMCgGA1UEAwwh
+YWV0aGVyLXJvYy1hcGkub3Blbm5ldHdvcmtpbmcub3JnMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA2L0EYwyiLOu2O7MRW1Jmpkrqwm5ug7jGuHzyjjae
+zXLttozuqyIX2PlQpdW4s8DiebRnwc/FnkQV6cSqYImdRtn67UcA0gAhnn3UVQmP
+ZHI0806M7fTZtoiPustqg2I4CpQGA4DeclSUCtAMUsVFoM5CUpk6u+06s0ItJQaF
+VNTtS3uOLknhhxxzrlmzuMRTT7/oE/ZVeFauVYySLruBKm2I4ttM/N35aixEo1AQ
+bOX/ywqDJIzABdeVIsDMujsKFMaH00RgafGErHLMrx5McBNGvBPZ/VOWLfvaVeuu
+DI3tW17M/zJDNFFJFSRhGHwHZltcCTDxQlIEehJWxySF1wIDAQABMA0GCSqGSIb3
+DQEBCwUAA4IBAQCEb3m72twEJldJskK3966rVr/53KUo6LVqBpfoWo0AlakGex73
+MP6gd8c2qvSCf6Aw0/LzAnFM67t8e9jprtdOMRxytqSEaR0xkMhOTWEA8VoE8Iee
+iaDUc7UMftp9cZbGHTFmmuTNpZ6RYpQ3kuzoOzXvoMBz7ny5SzuYNHKoHDapEkoD
+JZOpVrsF/n7joxXP6YwJU7xKPXnKkTZ5s1lDd3RTUdZL0BFJdHt2UfFyZN6telGK
+nSav9mtmByg5J9O7yRL8h5i/dF7nbQ8+bl1xPCPV91g41/S+3kGqoqSZZJQ1vMnb
+gOwXDoTcZ2qRqvcHCLZFUWtAC1MTIkKTQN7X
+-----END CERTIFICATE-----
diff --git a/aether-roc-api/files/certs/tls.key b/aether-roc-api/files/certs/tls.key
new file mode 100644
index 0000000..c35b95b
--- /dev/null
+++ b/aether-roc-api/files/certs/tls.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYvQRjDKIs67Y7
+sxFbUmamSurCbm6DuMa4fPKONp7Ncu22jO6rIhfY+VCl1bizwOJ5tGfBz8WeRBXp
+xKpgiZ1G2frtRwDSACGefdRVCY9kcjTzTozt9Nm2iI+6y2qDYjgKlAYDgN5yVJQK
+0AxSxUWgzkJSmTq77TqzQi0lBoVU1O1Le44uSeGHHHOuWbO4xFNPv+gT9lV4Vq5V
+jJIuu4EqbYji20z83flqLESjUBBs5f/LCoMkjMAF15UiwMy6OwoUxofTRGBp8YSs
+csyvHkxwE0a8E9n9U5Yt+9pV664Mje1bXsz/MkM0UUkVJGEYfAdmW1wJMPFCUgR6
+ElbHJIXXAgMBAAECggEATyBCl76m/mtXblgjgAmHPDKhnjYe1qwAsJ29F7pNI4hP
+zJOLFqMtvaLXlJOACO/kPrZkItett+f3cA7CfNgAuTsfZrzDSeeOXoRlnl4NIYio
+WCNXRBBd40vb3UAiNLEI8KO1xlWn4GmMWp41wYoPr3NdtzYFwVIMWiFQxfGpf5xI
+tiEPIvoFBf/m9su0HFY+wyUe8UcCJRYKGix3IWiReOH+O9SvisLuLS+h5Gbdv7Fz
+5KRg1VXIDre5d8WF/ZL6P0Irr22y9MapdVGkWeBIGaqt5e0olOSbn3ipVFZqogpa
+j3rTtGLnmOmVAaZe9toW7EeWf08KiQtv19h5ZhC5UQKBgQDwfEcKXwxVeD7DTzUl
+U3ZKDH6KlAato7xLmZIxohckplfr8vaqRN6gDo2F9SiGkqqCJmzVjfhxlqLKWmzH
+XVCgIzZcnp2xnyV5kMRXAX7stPZLOtAKYrCYHpy2I9yTqHC13xqL6dQqRv9QHZUP
+dW2OIOiFRCjfP7+9W4gL3WiZfQKBgQDmuIu0G37Fr6wCxd+u/Ieslrw9Oa7Hb66S
+7FsWjUmIhNFWV7Z2bZZEtNCCE7qXzICoZdlNW8nwh2PIdJUDYemqsgYtB2XsoZCN
+AI6JEjbGO/M8rkcZ2+9GhGxAJ1yvxlkK9ImNzvUR2Idi1nC7kmWHTicTugmG9NVV
+cXAQrgHc4wKBgE0tFP9XEXY8aKf1O3EHH+cTq2h9qMcAzOTWG/yhsBuq5nxqNI7g
+GzHyeaiLzL2jQ+UQv8ypCxoo5YVbD53LbJx3sHJ41NKz6CrjMp9Zc4ozaPcroKg0
+k8e9yz0ItTkNzV4Qg0xzdgs7TaRAWh3j6Yy7MuPRw+whYT87qKVmILNhAoGAP1Y0
+C8psf8pc9xno8PmkKS3sGQanw1oWW4EE9Gju4cpMSV6k2Vf2I4BbqQnPdHKQcyoa
+gFENW7lfHB1c9uO/KLvcVCouwcoMi5i2iEx2uu6kNGlHXYLx6bLaoLXtjNdvhEFj
+LYm93xtI90oVAnkK5B0BPzoX+XNmySDt+bY7Dq8CgYEAwzuUC1jindvkWHZ1cmq8
+KS+YgGh8OecczKD4x5yaSnG4IXoUYTWhUCQ5w3whJithRaSlsChBIgCIdkFNlD+4
+N3bFj2HBY1ZK6lzAN4q0THv0SWZbi0lJxukXVhxoh+uJpFalB+ZGC4svsDptqcdG
+i4fJoTsOmAzak+D9VJmvHNU=
+-----END PRIVATE KEY-----
diff --git a/aether-roc-api/templates/NOTES.txt b/aether-roc-api/templates/NOTES.txt
new file mode 100644
index 0000000..4e34ee7
--- /dev/null
+++ b/aether-roc-api/templates/NOTES.txt
@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: 2021 Open Networking Foundation
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+Thank you for installing {{ .Chart.Name }} Helm chart.
+
+Your release is named {{ .Release.Name }} in namespace {{.Release.Namespace}}.
+See https://docs.onosproject.org/developers/deploy_with_helm/
+
+To learn more about the release, try:
+  $ helm -n {{.Release.Namespace}} status {{ .Release.Name }}
+  $ helm -n {{.Release.Namespace}} get all {{ .Release.Name }}
+
+{{ .Release.Name }} depends on the "onos-config (with the Aether 2.1.0 and 3.0.0 model plugins and onos-topo" micro services.
+
+If you are using KinD as a Kubernetes server you will have to add a "port-forward" to access the aether-roc-api e.g.
+$ kubectl -n {{.Release.Namespace}} port-forward $(kubectl -n {{.Release.Namespace}} get pods -l type=api -o name) 8181
+and then access the API with:
+
+curl http://localhost:8181/aether/v3.0.0/connectivity-service-v3/enterprise
diff --git a/aether-roc-api/templates/_helpers.tpl b/aether-roc-api/templates/_helpers.tpl
new file mode 100644
index 0000000..a7db7ce
--- /dev/null
+++ b/aether-roc-api/templates/_helpers.tpl
@@ -0,0 +1,55 @@
+{{/* 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 "aether-roc-api.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 "aether-roc-api.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 "aether-roc-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "aether-roc-api.labels" -}}
+helm.sh/chart: {{ include "aether-roc-api.chart" . }}
+{{ include "aether-roc-api.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "aether-roc-api.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "aether-roc-api.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
diff --git a/aether-roc-api/templates/configmap.yaml b/aether-roc-api/templates/configmap.yaml
new file mode 100644
index 0000000..20047ea
--- /dev/null
+++ b/aether-roc-api/templates/configmap.yaml
@@ -0,0 +1,16 @@
+# 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 "aether-roc-api.fullname" . }}-config
+  labels:
+    app: {{ template "aether-roc-api.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+data:
+  logging.yaml: |-
+{{ toYaml .Values.logging | indent 4 }}
diff --git a/aether-roc-api/templates/deployment.yaml b/aether-roc-api/templates/deployment.yaml
new file mode 100644
index 0000000..38bd935
--- /dev/null
+++ b/aether-roc-api/templates/deployment.yaml
@@ -0,0 +1,133 @@
+# 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: {{ include "aether-roc-api.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "aether-roc-api.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      name: {{ template "aether-roc-api.fullname" . }}
+      app: aether
+      type: api
+      resource: {{ template "aether-roc-api.fullname" . }}
+      {{- include "aether-roc-api.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        name: {{ template "aether-roc-api.fullname" . }}
+        app: aether
+        type: api
+        resource: {{ template "aether-roc-api.fullname" . }}
+        {{- include "aether-roc-api.selectorLabels" . | nindent 8 }}
+    spec:
+      serviceAccountName: aether-roc-api
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          args:
+            {{- range $key, $corsorigin := .Values.corsOrigins }}
+            - {{ printf "-allowCorsOrigin=%s" $corsorigin }}{{end}}
+          ports:
+            - name: http
+              containerPort: 8181
+          startupProbe:
+            tcpSocket:
+              port: 8181
+            periodSeconds: 5
+            failureThreshold: 60
+          readinessProbe:
+            tcpSocket:
+              port: 8181
+            initialDelaySeconds: 10
+            periodSeconds: 10
+          livenessProbe:
+            tcpSocket:
+              port: 8181
+            initialDelaySeconds: 10
+            periodSeconds: 10
+          volumeMounts:
+            - name: secret
+              mountPath: /etc/aether-roc-api/certs
+              readOnly: true
+            - name: config
+              mountPath: /etc/onos/config
+              readOnly: true
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          # Enable ptrace for debugging
+          securityContext:
+            {{- if .Values.debug }}
+            capabilities:
+              add:
+                - SYS_PTRACE
+            {{- end }}
+        - name: {{ .Chart.Name }}-websocket
+          image: "{{ .Values.image.websocketsidecar.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          args:
+            {{- range $key, $corsorigin := .Values.corsOrigins }}
+            - {{ printf "-allowCorsOrigin=%s" $corsorigin }}{{end}}
+          ports:
+            - name: http
+              containerPort: {{ .Values.websocketsidecar.port }}
+          startupProbe:
+            tcpSocket:
+              port: {{ .Values.websocketsidecar.port }}
+            periodSeconds: 5
+            failureThreshold: 60
+          readinessProbe:
+            tcpSocket:
+              port: {{ .Values.websocketsidecar.port }}
+            initialDelaySeconds: 10
+            periodSeconds: 10
+          livenessProbe:
+            tcpSocket:
+              port: {{ .Values.websocketsidecar.port }}
+            initialDelaySeconds: 10
+            periodSeconds: 10
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          securityContext: {}
+      volumes:
+        - name: secret
+          secret:
+            secretName: {{ template "aether-roc-api.fullname" . }}-secret
+        - name: config
+          configMap:
+            name: {{ template "aether-roc-api.fullname" . }}-config
+      {{- with .Values.nodeSelector }}
+    nodeSelector:
+      {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+    affinity:
+      {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+    tolerations:
+      {{- toYaml . | nindent 8 }}
+    {{- end }}
diff --git a/aether-roc-api/templates/secret.yaml b/aether-roc-api/templates/secret.yaml
new file mode 100644
index 0000000..04e9c5d
--- /dev/null
+++ b/aether-roc-api/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 "aether-roc-api.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/aether-roc-api/templates/service.yaml b/aether-roc-api/templates/service.yaml
new file mode 100644
index 0000000..ac60319
--- /dev/null
+++ b/aether-roc-api/templates/service.yaml
@@ -0,0 +1,48 @@
+# 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: {{ include "aether-roc-api.fullname" . }}
+  labels:
+    app: {{ template "aether-roc-api.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+    {{- include "aether-roc-api.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  selector:
+    name: {{ template "aether-roc-api.fullname" . }}
+    app: aether
+    type: api
+    resource: {{ template "aether-roc-api.fullname" . }}
+    {{- include "aether-roc-api.selectorLabels" . | nindent 4 }}
+  ports:
+    - name: rest
+      port: 8181
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "aether-roc-api.fullname" . }}-websocket
+  labels:
+    app: {{ template "aether-roc-api.fullname" . }}-websocket
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+    {{- include "aether-roc-api.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  selector:
+    name: {{ template "aether-roc-api.fullname" . }}
+    app: aether
+    type: api
+    resource: {{ template "aether-roc-api.fullname" . }}
+    {{- include "aether-roc-api.selectorLabels" . | nindent 4 }}
+  ports:
+    - name: webhook
+      port: 80
+      targetPort: {{ .Values.websocketsidecar.port }}
diff --git a/aether-roc-api/templates/serviceaccount.yaml b/aether-roc-api/templates/serviceaccount.yaml
new file mode 100644
index 0000000..6d0ba2a
--- /dev/null
+++ b/aether-roc-api/templates/serviceaccount.yaml
@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: aether-roc-api
+  namespace: {{ .Release.Namespace }}
diff --git a/aether-roc-api/values.yaml b/aether-roc-api/values.yaml
new file mode 100644
index 0000000..5f4f9d7
--- /dev/null
+++ b/aether-roc-api/values.yaml
@@ -0,0 +1,64 @@
+# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+# Default values for aether-roc-api.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: onosproject/aether-roc-api
+  tag: v0.7.14
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+  websocketsidecar:
+    repository: onosproject/aether-roc-websocket
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: "aether-roc-api"
+
+# Needed for development only - set to blank otherwise
+corsOrigins:
+  - http://localhost:4200
+
+websocketsidecar:
+  enabled: true
+  port: 8120
+
+store: {}
+
+service:
+  type: ClusterIP
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+logging:
+  loggers:
+    root:
+      level: info
+      output:
+        stdout:
+          sink: stdout
+  sinks:
+    stdout:
+      type: stdout
+      stdout: {}