SDFAB-998 Deprecate old sdcore-helm-chart and omec charts

pfcp-agent, omec-user-plane and omec-upf-cni chart has been moved to SD-Fabric repo
Other sd-core charts have been moved to https://gerrit.opencord.org/plugins/gitiles/sdcore-helm-charts

Change-Id: I2b5e013599c29ee99430f6170dbfd98e014c7706
diff --git a/omec/omec-upf-cni/.helmignore b/omec/omec-upf-cni/.helmignore
deleted file mode 100644
index 0d5155a..0000000
--- a/omec/omec-upf-cni/.helmignore
+++ /dev/null
@@ -1,25 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# 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/omec/omec-upf-cni/Chart.yaml b/omec/omec-upf-cni/Chart.yaml
deleted file mode 100644
index 1d25423..0000000
--- a/omec/omec-upf-cni/Chart.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-description: CNI setup for OMEC data plane
-name: omec-upf-cni
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 0.1.4
diff --git a/omec/omec-upf-cni/templates/_helpers.tpl b/omec/omec-upf-cni/templates/_helpers.tpl
deleted file mode 100644
index dcf8fc6..0000000
--- a/omec/omec-upf-cni/templates/_helpers.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{- /*
-
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-{{/*
-Renders a set of standardised labels.
-*/}}
-{{- define "omec-upf-cni.metadata_labels" -}}
-{{- $application := index . 0 -}}
-{{- $context := index . 1 -}}
-tier: node
-release: {{ $context.Release.Name }}
-app: {{ $application }}
-{{- end -}}
diff --git a/omec/omec-upf-cni/templates/configmap-sriov-conf.yaml b/omec/omec-upf-cni/templates/configmap-sriov-conf.yaml
deleted file mode 100644
index 72b9bd6..0000000
--- a/omec/omec-upf-cni/templates/configmap-sriov-conf.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-{{/*
-# Copyright 2018-present Open Networking Foundation
-# Copyright 2018 Intel Corporation
-
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: sriov-config
-data:
-  config.json: |
-    {
-      "resourceList": [
-        {
-          "resourceName": "sriov_vfio_access_net",
-          "selectors": {
-{{- if hasKey .Values.config.sriov.resourceList.vfio "accessPciAddresses" }}
-              "pciAddresses": {{ toJson .Values.config.sriov.resourceList.vfio.accessPciAddresses }}
-{{- else if hasKey .Values.config.sriov.resourceList.vfio "accessPfNames" }}
-              "pfNames": {{ toJson .Values.config.sriov.resourceList.vfio.accessPfNames }},
-              "drivers": ["vfio-pci"]
-{{- end }}
-          }
-        },
-        {
-          "resourceName": "sriov_vfio_core_net",
-          "selectors": {
-{{- if hasKey .Values.config.sriov.resourceList.vfio "corePciAddresses" }}
-              "pciAddresses": {{ toJson .Values.config.sriov.resourceList.vfio.corePciAddresses }}
-{{- else if hasKey .Values.config.sriov.resourceList.vfio "corePfNames" }}
-              "pfNames": {{ toJson .Values.config.sriov.resourceList.vfio.corePfNames }},
-              "drivers": ["vfio-pci"]
-{{- end }}
-          }
-        }
-{{- if hasKey .Values.config.sriov.resourceList "netDevice" }}
-        ,
-        {
-          "resourceName": "sriov_netdevice",
-          "selectors": {
-              "pfNames": {{ toJson .Values.config.sriov.resourceList.netDevice.pfNames }},
-              "drivers": {{ toJson .Values.config.sriov.resourceList.netDevice.drivers }}
-          }
-        }
-{{- end }}
-      ]
-    }
diff --git a/omec/omec-upf-cni/templates/daemonset-sriov-plugin.yaml b/omec/omec-upf-cni/templates/daemonset-sriov-plugin.yaml
deleted file mode 100644
index 0624fb2..0000000
--- a/omec/omec-upf-cni/templates/daemonset-sriov-plugin.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-{{/*
-# Copyright 2018-present Open Networking Foundation
-# Copyright 2018 Intel Corporation
-
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: sriov-plugin
-  labels:
-{{ tuple "sriov-plugin" . | include "omec-upf-cni.metadata_labels" | indent 4 }}
-spec:
-  selector:
-    matchLabels:
-{{ tuple "sriov-plugin" . | include "omec-upf-cni.metadata_labels" | indent 6 }}
-  template:
-    metadata:
-      labels:
-{{ tuple "sriov-plugin" . | include "omec-upf-cni.metadata_labels" | indent 8 }}
-    spec:
-      hostNetwork: true
-      hostPID: true
-      nodeSelector:
-        beta.kubernetes.io/arch: amd64
-    {{- if .Values.images.credentials }}
-      imagePullSecrets:
-        - name: {{ .Release.Name }}.registry
-    {{- end }}
-      initContainers:
-      - name: init-sriov-plugin
-        image: {{ .Values.images.tags.omecCni }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        command: [ "bash", "-c" ]
-        args:
-        - cp /tmp/cni/bin/{sriov,vfioveth,jq,static} /host/opt/cni/bin/
-        volumeMounts:
-        - name: cni-bin
-          mountPath: /host/opt/cni/bin
-      containers:
-      - name: sriov-device-plugin
-        image: {{ .Values.images.tags.sriovPlugin }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        command: [ "/bin/sh", "-c", "--" ]
-        args: [ "sriovdp --logtostderr 10;" ]
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - mountPath: /var/lib/kubelet/
-          name: devicesock
-          readOnly: false
-        - mountPath: /sys
-          name: net
-          readOnly: true
-        - name: sriov-config
-          mountPath: /etc/pcidp
-      volumes:
-      - name: devicesock
-        hostPath:
-          path: /var/lib/kubelet/
-      - name: net
-        hostPath:
-          path: /sys
-      - name: sriov-config
-        configMap:
-          name: sriov-config
-      - name: cni-bin
-        hostPath:
-          path: /opt/cni/bin
diff --git a/omec/omec-upf-cni/templates/secret-registry.yaml b/omec/omec-upf-cni/templates/secret-registry.yaml
deleted file mode 100644
index 1502049..0000000
--- a/omec/omec-upf-cni/templates/secret-registry.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- if .Values.images.credentials }}
----
-kind: Secret
-apiVersion: v1
-metadata:
-  name: {{ .Release.Name }}.registry
-  labels:
-    release: {{ .Release.Name }}
-type: kubernetes.io/dockerconfigjson
-data:
-  .dockerconfigjson: {{ printf `{"auths":{%s:{"auth":"%s"}}}` (.Values.images.credentials.registry | quote) (printf "%s:%s" .Values.images.credentials.username .Values.images.credentials.password | b64enc) | b64enc | quote }}
-{{- end }}
diff --git a/omec/omec-upf-cni/values.yaml b/omec/omec-upf-cni/values.yaml
deleted file mode 100644
index e67a53e..0000000
--- a/omec/omec-upf-cni/values.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-images:
-  tags:
-    omecCni: docker.io/omecproject/omec-cni:1.0.2
-    sriovPlugin: docker.io/nfvpe/sriov-device-plugin:v3.2
-  pullPolicy: IfNotPresent
-  credentials: {}
-  # If specified, use this credential to access the image
-  #   registry:
-  #   username:
-  #   password:
-
-config:
-  sriov:
-    # Provide interface used as a SR-IOV PF
-    # If your cluster has multiple nodes with different interface names,
-    # simply provide the whole list
-    resourceList:
-      # Provide PF name with VF range or PCI address for access and core interfaces.
-      # PCI address has higher precedence when both provided.
-      vfio:
-        accessPfNames:
-          - eno1#0-3
-        corePfNames:
-          - eno1#4-7
-      # Provide PF name with its VFs bounded to PF's driver
-      # The driver name must be specified to prevent one interface is
-      # registered to both vfio and netdevice resource pools
-      #netDevice:
-      #  pfNames:
-      #    - eno1
-      #  drivers:
-      #    - i40evf
-      #    - ixgbevf
diff --git a/omec/omec-upf-pfcp-agent/Chart.yaml b/omec/omec-upf-pfcp-agent/Chart.yaml
deleted file mode 100644
index 578592f..0000000
--- a/omec/omec-upf-pfcp-agent/Chart.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-description: OMEC pfcp agent based on BESS
-name: omec-upf-pfcp-agent
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 0.3.0
diff --git a/omec/omec-upf-pfcp-agent/templates/_helpers.tpl b/omec/omec-upf-pfcp-agent/templates/_helpers.tpl
deleted file mode 100644
index c66a05d..0000000
--- a/omec/omec-upf-pfcp-agent/templates/_helpers.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-{{- /*
-
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-{{/*
-Renders a set of standardised labels.
-*/}}
-{{- define "omec-upf-pfcp-agent.metadata_labels" -}}
-{{- $application := index . 0 -}}
-{{- $context := index . 1 -}}
-release: {{ $context.Release.Name }}
-app: {{ $application }}
-{{- end -}}
-
-{{/*
-Render the given template.
-*/}}
-{{- define "omec-upf-pfcp-agent.template" -}}
-{{- $name := index . 0 -}}
-{{- $context := index . 1 -}}
-{{- $last := base $context.Template.Name }}
-{{- $wtf := $context.Template.Name | replace $last $name -}}
-{{ include $wtf $context }}
-{{- end -}}
-
-{{/*
-Render init container for coredump.
-*/}}
-{{- define "omec-upf-pfcp-agent.coredump_init" -}}
-{{- $pod := index . 0 -}}
-{{- $context := index . 1 -}}
-- name: {{ $pod }}-coredump-init
-  image: {{ $context.Values.images.tags.init | quote }}
-  imagePullPolicy: {{ $context.Values.images.pullPolicy }}
-  securityContext:
-    privileged: true
-    runAsUser: 0
-  command: ["sh", "-xc"]
-  args:
-    - echo '/tmp/coredump/core.%h.%e.%t' > /mnt/host-rootfs/proc/sys/kernel/core_pattern
-  volumeMounts:
-    - name: host-rootfs
-      mountPath: /mnt/host-rootfs
-{{- end -}}
diff --git a/omec/omec-upf-pfcp-agent/templates/configmap-pfcp-agent.yaml b/omec/omec-upf-pfcp-agent/templates/configmap-pfcp-agent.yaml
deleted file mode 100644
index 53f8116..0000000
--- a/omec/omec-upf-pfcp-agent/templates/configmap-pfcp-agent.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: pfcp
-  labels:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
-data:
-{{- range $key, $value := .Values.config.pfcp.cfgFiles }}
-  {{ $key }}: {{ toJson $value | quote }}
-{{- end }}
diff --git a/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml b/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml
deleted file mode 100644
index 2a4f1eb..0000000
--- a/omec/omec-upf-pfcp-agent/templates/service-pfcp-agent.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: pfcp-agent
-  labels:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
-{{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-{{- end }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if .Values.service.externalIp }}
-  externalIPs:
-    - {{ .Values.service.externalIp }}
-{{- end }}
-  selector:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
-  ports:
-  - name: pfcp
-    port: 8805
-    protocol: UDP
diff --git a/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml b/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml
deleted file mode 100644
index 8e0dde2..0000000
--- a/omec/omec-upf-pfcp-agent/templates/statefulset-pfcp-agent.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- $upfConfig := index .Values.config.pfcp.cfgFiles "upf.json" }}
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: pfcp
-  labels:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 4 }}
-spec:
-  replicas: 1
-  serviceName: pfcp-headless
-  selector:
-    matchLabels:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 6 }}
-  template:
-    metadata:
-      labels:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.metadata_labels" | indent 8 }}
-    spec:
-      shareProcessNamespace: true
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.pfcp.label }}: {{ .Values.nodeSelectors.pfcp.value }}
-    {{- end }}
-    {{- if hasKey .Values.images "pullSecrets" }}
-      imagePullSecrets:
-{{ toYaml .Values.images.pullSecrets | indent 8 }}
-    {{- end }}
-    {{- if .Values.config.coreDump.enabled }}
-      initContainers:
-{{ tuple "pfcp" . | include "omec-upf-pfcp-agent.coredump_init" | indent 8 }}
-    {{- end }}
-      containers:
-      - name: pfcp-agent
-        image: {{ .Values.images.tags.pfcpiface | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
-        env:
-        - name: POD_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
-        command: ["pfcpiface"]
-        args:
-          - -config
-          - /tmp/conf/upf.json
-      {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.pfcpiface | indent 10 }}
-      {{- end }}
-        volumeMounts:
-          - name: configs
-            mountPath: /tmp/conf
-      volumes:
-      - name: configs
-        configMap:
-          name: pfcp
-          defaultMode: 493
-    {{- if .Values.config.coreDump.enabled }}
-      - name: host-rootfs
-        hostPath:
-          path: /
-      - name: coredump
-        hostPath:
-          path: {{ .Values.config.coreDump.path }}
-    {{- end }}
diff --git a/omec/omec-upf-pfcp-agent/values.yaml b/omec/omec-upf-pfcp-agent/values.yaml
deleted file mode 100644
index 0a973c6..0000000
--- a/omec/omec-upf-pfcp-agent/values.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-images:
-  tags:
-    init: registry.aetherproject.org/tools/busybox:stable
-    pfcpiface: "registry.aetherproject.org/proxy/omecproject/upf-epc-pfcpiface:master-fcdbc95"
-  pullPolicy: Always
-  # Secrets must be manually created in the namespace.
-  pullSecrets:
-    - name: aether.registry
-
-nodeSelectors:
-  enabled: false
-  pfcp:
-    label: omec-upf
-    value: enabled
-
-resources:
-  enabled: true
-  pfcpiface:
-    requests:
-      cpu: 256m
-      memory: 128Mi
-    limits:
-      cpu: 256m
-      memory: 128Mi
-
-config:
-  coreDump:
-    enabled: false
-    path: /tmp/coredump
-  pfcp:
-    cfgFiles:
-      upf.json:
-        measure: true
-        enable_p4rt: true
-        p4rtciface:
-          access_ip: "172.17.0.1/32"
-          p4rtc_server: "onos-tost-onos-classic-hs.tost"
-          p4rtc_port: "51001"
-service:
-  type: ClusterIP
-  #externalIp:
-  #annotations:
diff --git a/omec/omec-user-plane/.gitignore b/omec/omec-user-plane/.gitignore
deleted file mode 100644
index 894f7fe..0000000
--- a/omec/omec-user-plane/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-charts/
diff --git a/omec/omec-user-plane/.helmignore b/omec/omec-user-plane/.helmignore
deleted file mode 100644
index 0d5155a..0000000
--- a/omec/omec-user-plane/.helmignore
+++ /dev/null
@@ -1,25 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# 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/omec/omec-user-plane/Chart.yaml b/omec/omec-user-plane/Chart.yaml
deleted file mode 100644
index 867efb6..0000000
--- a/omec/omec-user-plane/Chart.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-description: OMEC user plane based on BESS
-name: omec-user-plane
-icon: https://guide.opencord.org/logos/cord.svg
-
-version: 0.7.0
diff --git a/omec/omec-user-plane/templates/_helpers.tpl b/omec/omec-user-plane/templates/_helpers.tpl
deleted file mode 100644
index aa7dfa4..0000000
--- a/omec/omec-user-plane/templates/_helpers.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-{{- /*
-
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-{{/*
-Renders a set of standardised labels.
-*/}}
-{{- define "omec-user-plane.metadata_labels" -}}
-{{- $application := index . 0 -}}
-{{- $context := index . 1 -}}
-release: {{ $context.Release.Name }}
-app: {{ $application }}
-{{- end -}}
-
-{{/*
-Render the given template.
-*/}}
-{{- define "omec-user-plane.template" -}}
-{{- $name := index . 0 -}}
-{{- $context := index . 1 -}}
-{{- $last := base $context.Template.Name }}
-{{- $wtf := $context.Template.Name | replace $last $name -}}
-{{ include $wtf $context }}
-{{- end -}}
-
-{{/*
-Render init container for coredump.
-*/}}
-{{- define "omec-user-plane.coredump_init" -}}
-{{- $pod := index . 0 -}}
-{{- $context := index . 1 -}}
-- name: {{ $pod }}-coredump-init
-  image: {{ $context.Values.images.tags.tools | quote }}
-  imagePullPolicy: {{ $context.Values.images.pullPolicy }}
-  securityContext:
-    privileged: true
-    runAsUser: 0
-  command: ["sh", "-xc"]
-  args:
-    - echo '/tmp/coredump/core.%h.%e.%t' > /mnt/host-rootfs/proc/sys/kernel/core_pattern
-  volumeMounts:
-    - name: host-rootfs
-      mountPath: /mnt/host-rootfs
-{{- end -}}
diff --git a/omec/omec-user-plane/templates/bin/_bessd-poststart.sh.tpl b/omec/omec-user-plane/templates/bin/_bessd-poststart.sh.tpl
deleted file mode 100644
index b9e20fd..0000000
--- a/omec/omec-user-plane/templates/bin/_bessd-poststart.sh.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-set -ex
-
-until bessctl run /opt/bess/bessctl/conf/up4; do
-    sleep 2;
-done;
diff --git a/omec/omec-user-plane/templates/configmap-upf.yaml b/omec/omec-user-plane/templates/configmap-upf.yaml
deleted file mode 100644
index ec88ad4..0000000
--- a/omec/omec-user-plane/templates/configmap-upf.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: upf
-  labels:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
-data:
-{{- range $key, $value := .Values.config.upf.cfgFiles }}
-  {{ $key }}: {{ toJson $value | quote }}
-{{- end }}
-  bessd-poststart.sh: |
-{{ tuple "bin/_bessd-poststart.sh.tpl" . | include "omec-user-plane.template" | indent 4 }}
diff --git a/omec/omec-user-plane/templates/networks.yaml b/omec/omec-user-plane/templates/networks.yaml
deleted file mode 100644
index a5e5d73..0000000
--- a/omec/omec-user-plane/templates/networks.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
----
-apiVersion: "k8s.cni.cncf.io/v1"
-kind: NetworkAttachmentDefinition
-metadata:
-  name: access-net
-{{- if $.Values.config.upf.sriov.enabled }}
-  annotations:
-    k8s.v1.cni.cncf.io/resourceName: {{ .Values.config.upf.access.resourceName }}
-{{- end }}
-spec:
-  config: '{
-    "cniVersion": "0.3.1",
-  {{- if hasKey .Values.config.upf.access "vlan" }}
-    "vlan": {{ .Values.config.upf.access.vlan }},
-  {{- end }}
-    "type": {{ .Values.config.upf.cniPlugin | quote }},
-  {{- if eq .Values.config.upf.cniPlugin "macvlan" }}
-    "master": {{ .Values.config.upf.access.iface | quote }},
-  {{- end }}
-  {{- if eq .Values.config.upf.cniPlugin "host-device" }}
-    "device": {{ .Values.config.upf.access.iface | quote }},
-  {{- end }}
-    "ipam": {
-        "type": {{ .Values.config.upf.ipam | quote }}
-    },
-    "capabilities": { "mac": true}
-  }'
----
-apiVersion: "k8s.cni.cncf.io/v1"
-kind: NetworkAttachmentDefinition
-metadata:
-  name: core-net
-{{- if $.Values.config.upf.sriov.enabled }}
-  annotations:
-    k8s.v1.cni.cncf.io/resourceName: {{ .Values.config.upf.core.resourceName }}
-{{- end }}
-spec:
-  config: '{
-    "cniVersion": "0.3.1",
-  {{- if hasKey .Values.config.upf.core "vlan" }}
-    "vlan": {{ .Values.config.upf.core.vlan }},
-  {{- end }}
-    "type": {{ .Values.config.upf.cniPlugin | quote }},
-  {{- if eq .Values.config.upf.cniPlugin "macvlan" }}
-    "master": {{ .Values.config.upf.core.iface | quote }},
-  {{- end }}
-  {{- if eq .Values.config.upf.cniPlugin "host-device" }}
-    "device": {{ .Values.config.upf.core.iface | quote }},
-  {{- end }}
-    "ipam": {
-        "type": {{ .Values.config.upf.ipam | quote }}
-    },
-    "capabilities": { "mac": true}
-  }'
diff --git a/omec/omec-user-plane/templates/podsecuritypolicy-upf.yaml b/omec/omec-user-plane/templates/podsecuritypolicy-upf.yaml
deleted file mode 100644
index ab8f133..0000000
--- a/omec/omec-user-plane/templates/podsecuritypolicy-upf.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- if .Values.podsecuritypolicy.enabled }}
-apiVersion: policy/v1beta1
-kind: PodSecurityPolicy
-metadata:
-    name: 1-upf
-spec:
-    {{ if or .Values.config.coreDump.enabled  .Values.config.upf.privileged }}
-    privileged: true
-    allowPrivilegeEscalation: true
-    {{ else }}
-    privileged: false
-    allowPrivilegeEscalation: false
-    {{ end }}
-    allowedCapabilities:
-    - IPC_LOCK
-    - NET_ADMIN
-    volumes:
-    - 'configMap'
-    - 'emptyDir'
-    - 'secret'
-    {{- if .Values.config.coreDump.enabled }}
-    - 'hostPath'
-    allowedHostPaths:
-    - pathPrefix: "/"
-    - pathPrefix: "/tmp/coredump"
-    {{- end }}
-    seLinux:
-        rule: RunAsAny
-    supplementalGroups:
-      rule: 'MustRunAs'
-      ranges:
-      # Forbid adding the root group.
-      - min: 1
-        max: 65535
-    runAsUser:
-        rule: RunAsAny
-    fsGroup:
-      rule: 'MustRunAs'
-      ranges:
-      # Forbid adding the root group.
-      - min: 1
-        max: 65535
-{{- end }}
diff --git a/omec/omec-user-plane/templates/pspclusterrole-upf.yaml b/omec/omec-user-plane/templates/pspclusterrole-upf.yaml
deleted file mode 100644
index e9b2af7..0000000
--- a/omec/omec-user-plane/templates/pspclusterrole-upf.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- if .Values.podsecuritypolicy.enabled }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: psp:upf
-rules:
-- apiGroups: ['policy']
-  resources: ['podsecuritypolicies']
-  verbs:     ['use']
-  resourceNames:
-  - 1-upf
-{{- end }}
diff --git a/omec/omec-user-plane/templates/psprolebinding-upf.yaml b/omec/omec-user-plane/templates/psprolebinding-upf.yaml
deleted file mode 100644
index b2d8451..0000000
--- a/omec/omec-user-plane/templates/psprolebinding-upf.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- if .Values.podsecuritypolicy.enabled }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: role:psp:upf
-  namespace: {{ .Release.Namespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: psp:upf
-subjects:
-- kind: Group
-  name: system:serviceaccounts:{{ .Release.Namespace }}
-  namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/omec/omec-user-plane/templates/service-upf.yaml b/omec/omec-user-plane/templates/service-upf.yaml
deleted file mode 100644
index 38ada87..0000000
--- a/omec/omec-user-plane/templates/service-upf.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: upf
-  labels:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
-{{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-{{- end }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if .Values.service.externalIp }}
-  externalIPs:
-    - {{ .Values.service.externalIp }}
-{{- end }}
-  selector:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
-  ports:
-  - name: pfcp
-    protocol: UDP
-    port: 8805
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: upf-http
-  labels:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
-{{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-{{- end }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if .Values.service.externalIp }}
-  externalIPs:
-    - {{ .Values.service.externalIp }}
-{{- end }}
-  selector:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
-  ports:
-  - name: bess-web
-    protocol: TCP
-    port: 8000
-  - name: prometheus-exporter
-    protocol: TCP
-    port: 8080
diff --git a/omec/omec-user-plane/templates/servicemonitor-upf.yaml b/omec/omec-user-plane/templates/servicemonitor-upf.yaml
deleted file mode 100644
index 65f6133..0000000
--- a/omec/omec-user-plane/templates/servicemonitor-upf.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-{{- if .Values.servicemonitor.enabled }}
----
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: upf
-spec:
-  endpoints:
-  - path: /metrics
-    port: prometheus-exporter
-  selector:
-    matchLabels:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 6 }}
-{{- end }}
diff --git a/omec/omec-user-plane/templates/statefulset-upf.yaml b/omec/omec-user-plane/templates/statefulset-upf.yaml
deleted file mode 100644
index ef9194d..0000000
--- a/omec/omec-user-plane/templates/statefulset-upf.yaml
+++ /dev/null
@@ -1,236 +0,0 @@
-{{/*
-# Copyright 2020-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- $upfConfig := index .Values.config.upf.cfgFiles "upf.json" }}
-{{- $accessConfig := index $upfConfig "access" }}
-{{- $coreConfig := index $upfConfig "core" }}
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: upf
-  labels:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 4 }}
-spec:
-  replicas: 1
-  serviceName: upf-headless
-  selector:
-    matchLabels:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 6 }}
-  template:
-    metadata:
-      labels:
-{{ tuple "upf" . | include "omec-user-plane.metadata_labels" | indent 8 }}
-      annotations:
-        k8s.v1.cni.cncf.io/networks: '[
-          {
-            "name": "access-net",
-            "interface": {{ index $accessConfig "ifname" | quote }},
-          {{- if hasKey .Values.config.upf.access "mac" }}
-            "mac": {{ .Values.config.upf.access.mac | quote }},
-          {{- end }}
-            "ips": [{{ .Values.config.upf.access.ip | quote }}]
-          },
-          {
-            "name": "core-net",
-            "interface": {{ index $coreConfig "ifname" | quote }},
-          {{- if hasKey .Values.config.upf.core "mac" }}
-            "mac": {{ .Values.config.upf.core.mac | quote }},
-          {{- end }}
-            "ips": [{{ .Values.config.upf.core.ip | quote }}]
-          }
-        ]'
-    spec:
-      shareProcessNamespace: true
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.upf.label }}: {{ .Values.nodeSelectors.upf.value }}
-    {{- end }}
-    {{- if hasKey .Values.images "pullSecrets" }}
-      imagePullSecrets:
-{{ toYaml .Values.images.pullSecrets | indent 8 }}
-    {{- end }}
-      initContainers:
-      - name: bess-init
-        image: {{ .Values.images.tags.bess | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
-        command: ["sh", "-xec"]
-        args:
-        - ip route replace {{ .Values.config.upf.enb.subnet }} via {{ .Values.config.upf.access.gateway }};
-          ip route replace default via {{ .Values.config.upf.core.gateway }} metric 110;
-          iptables -I OUTPUT -p icmp --icmp-type port-unreachable -j DROP;
-        securityContext:
-          capabilities:
-            add:
-            - NET_ADMIN
-        resources:
-          limits:
-            cpu: 128m
-            memory: 64Mi
-          requests:
-            cpu: 128m
-            memory: 64Mi
-    {{- if .Values.config.coreDump.enabled }}
-{{ tuple "upf" . | include "omec-user-plane.coredump_init" | indent 6 }}
-    {{- end }}
-      containers:
-      - name: bessd
-        image: {{ .Values.images.tags.bess | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
-        securityContext:
-        {{- if .Values.config.upf.privileged }}
-          privileged: true
-        {{- end }}
-          capabilities:
-            add:
-            - IPC_LOCK
-        stdin: true
-        tty: true
-        command: ["/bin/bash", "-xc"]
-        args:
-        {{- if .Values.config.upf.hugepage.enabled }}
-          - bessd -f -grpc-url=0.0.0.0:10514
-        {{- else }}
-          - bessd -m 0 -f -grpc-url=0.0.0.0:10514
-        {{- end }}
-        lifecycle:
-          postStart:
-            exec:
-              command: ["/etc/bess/conf/bessd-poststart.sh"]
-        livenessProbe:
-          tcpSocket:
-            port: 10514
-          initialDelaySeconds: 15
-          periodSeconds: 20
-        resources:
-          requests:
-          {{- if .Values.resources.enabled }}
-{{ toYaml .Values.resources.bess.requests | indent 12 }}
-          {{- end }}
-          {{- if .Values.config.upf.hugepage.enabled }}
-            hugepages-1Gi: 2Gi
-          {{- end }}
-          {{- if .Values.config.upf.sriov.enabled }}
-          {{- if eq .Values.config.upf.access.resourceName .Values.config.upf.core.resourceName }}
-            {{ .Values.config.upf.access.resourceName }}: 2
-          {{- else }}
-            {{ .Values.config.upf.access.resourceName }}: 1
-            {{ .Values.config.upf.core.resourceName }}: 1
-          {{- end }}
-          {{- end }}
-          limits:
-          {{- if .Values.resources.enabled }}
-{{ toYaml .Values.resources.bess.limits | indent 12 }}
-          {{- end }}
-          {{- if .Values.config.upf.hugepage.enabled }}
-            hugepages-1Gi: 2Gi
-          {{- end }}
-          {{- if .Values.config.upf.sriov.enabled }}
-          {{- if eq .Values.config.upf.access.resourceName .Values.config.upf.core.resourceName }}
-            {{ .Values.config.upf.access.resourceName }}: 2
-          {{- else }}
-            {{ .Values.config.upf.access.resourceName }}: 1
-            {{ .Values.config.upf.core.resourceName }}: 1
-          {{- end }}
-          {{- end }}
-        env:
-          - name: CONF_FILE
-            value: /etc/bess/conf/upf.json
-        volumeMounts:
-          - name: shared-app
-            mountPath: /pod-share
-        {{- if .Values.config.upf.hugepage.enabled }}
-          - name: hugepages
-            mountPath: /dev/hugepages
-        {{- end }}
-          - name: configs
-            mountPath: /etc/bess/conf
-        {{- if .Values.config.coreDump.enabled }}
-          - name: coredump
-            mountPath: /tmp/coredump
-        {{- end }}
-      - name: routectl
-        image: {{ .Values.images.tags.bess | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
-        env:
-          - name: PYTHONUNBUFFERED
-            value: "1"
-        command: ["/opt/bess/bessctl/conf/route_control.py"]
-        args:
-          - -i
-          - {{ index $accessConfig "ifname" }}
-          - {{ index $coreConfig "ifname" }}
-      {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.routectl | indent 10 }}
-      {{- end }}
-      - name: web
-        image: {{ .Values.images.tags.bess | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
-        command: ["/bin/bash", "-xc", "bessctl http 0.0.0.0 8000"]
-      {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.web | indent 10 }}
-      {{- end }}
-      - name: pfcp-agent
-        image: {{ .Values.images.tags.pfcpiface | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
-        command: ["pfcpiface"]
-        args:
-          - -config
-          - /tmp/conf/upf.json
-      {{- if .Values.resources.enabled }}
-        resources:
-{{ toYaml .Values.resources.cpiface | indent 10 }}
-      {{- end }}
-        volumeMounts:
-          - name: shared-app
-            mountPath: /pod-share
-          - name: configs
-            mountPath: /tmp/conf
-    {{- if .Values.config.gratuitousArp.enabled }}
-      - name: arping
-        image: {{ .Values.images.tags.tools | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
-        command: ["sh", "-xc"]
-        args:
-          - |
-            while true; do
-              # arping does not work - BESS graph is still disconnected
-              #arping -c 2 -I {{ index $accessConfig "ifname" }} {{ .Values.config.upf.access.gateway }}
-              #arping -c 2 -I {{ index $coreConfig "ifname" }} {{ .Values.config.upf.core.gateway }}
-              ping -c 2 {{ .Values.config.upf.access.gateway }}
-              ping -c 2 {{ .Values.config.upf.core.gateway }}
-              sleep {{ .Values.config.gratuitousArp.interval }}
-            done
-        resources:
-          limits:
-            cpu: 128m
-            memory: 64Mi
-          requests:
-            cpu: 128m
-            memory: 64Mi
-    {{- end }}
-      volumes:
-      - name: configs
-        configMap:
-          name: upf
-          defaultMode: 493
-      - name: shared-app
-        emptyDir: {}
-    {{- if .Values.config.upf.hugepage.enabled }}
-      - name: hugepages
-        emptyDir:
-          medium: HugePages
-    {{- end }}
-    {{- if .Values.config.coreDump.enabled }}
-      - name: host-rootfs
-        hostPath:
-          path: /
-      - name: coredump
-        hostPath:
-          path: {{ .Values.config.coreDump.path }}
-    {{- end }}
diff --git a/omec/omec-user-plane/values.yaml b/omec/omec-user-plane/values.yaml
deleted file mode 100644
index 9233dcc..0000000
--- a/omec/omec-user-plane/values.yaml
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-images:
-  tags:
-    bess: "registry.aetherproject.org/proxy/omecproject/upf-epc-bess:master-ada6849"
-    pfcpiface: "registry.aetherproject.org/proxy/omecproject/upf-epc-pfcpiface:master-ada6849"
-    tools: registry.aetherproject.org/tools/busybox:stable
-  pullPolicy: IfNotPresent
-  # Secrets must be manually created in the namespace.
-  pullSecrets:
-    - name: aether.registry
-
-nodeSelectors:
-  enabled: false
-  upf:
-    label: node-role.aetherproject.org
-    value: omec-upf
-
-resources:
-  enabled: true
-  bess:
-    requests:
-      cpu: 2
-      memory: 512Mi
-    limits:
-      cpu: 2
-      memory: 512Mi
-  routectl:
-    requests:
-      cpu: 256m
-      memory: 128Mi
-    limits:
-      cpu: 256m
-      memory: 128Mi
-  web:
-    requests:
-      cpu: 256m
-      memory: 128Mi
-    limits:
-      cpu: 256m
-      memory: 128Mi
-  cpiface:
-    requests:
-      cpu: 256m
-      memory: 128Mi
-    limits:
-      cpu: 256m
-      memory: 128Mi
-
-config:
-  coreDump:
-    enabled: false
-    path: /tmp/coredump
-  gratuitousArp:
-    enabled: true
-    interval: 10 # seconds
-  upf:
-    # Enable privileged when run from VM with sriov support
-    privileged: false
-    hugepage:
-      enabled: true
-    sriov:
-      enabled: true
-    # Dynamic IP allocation is not supported yet
-    ipam: static
-    cniPlugin: vfioveth
-    enb:
-      subnet: 192.168.251.0/24
-    access:
-      # Provide sriov resource name when sriov is enabled
-      resourceName: "intel.com/intel_sriov_vfio"
-      gateway: 192.168.252.1
-      ip: 192.168.252.3/24
-      #mac:
-      #vlan:
-      #iface:
-    core:
-      # Provide sriov resource name when sriov is enabled
-      resourceName: "intel.com/intel_sriov_vfio"
-      gateway: 192.168.250.1
-      ip: 192.168.250.3/24
-      #mac:
-      #vlan:
-      #iface:
-    cfgFiles:
-      upf.json:
-        mode: dpdk
-        workers: 1
-        max_sessions: 50000
-        table_sizes:
-          pdrLookup: 50000
-          appQERLookup: 200000
-          sessionQERLookup: 100000
-          farLookup: 150000
-        access:
-          ifname: access
-        core:
-          ifname: core
-        measure_upf: true
-        measure_flow: true
-        enable_notify_bess: true
-        notify_sockaddr: "/pod-share/notifycp"
-        cpiface:
-          dnn: "internet"
-          hostname: "upf"
-          http_port: "8080"
-        # Default global rate limits. Can be changed at runtime via BESS gRPC.
-        slice_rate_limit_config:
-          # Uplink
-          n6_bps: 1000000000 # 1Gbps
-          n6_burst_bytes: 12500000 # 10ms * 1Gbps
-          # Downlink
-          n3_bps: 1000000000 # 1Gbps
-          n3_burst_bytes: 12500000 # 10ms * 1Gbps
-        qci_qos_config:
-          - qci: 0 # Fallback QCI
-            cbs: 50000
-            ebs: 50000
-            pbs: 50000
-            burst_duration_ms: 10
-            priority: 7
-
-service:
-  type: ClusterIP
-  #externalIp:
-  #annotations:
-
-servicemonitor:
-  enabled: false
-
-podsecuritypolicy:
-  enabled: false
diff --git a/sdcore-helm-charts/.gitignore b/sdcore-helm-charts/.gitignore
deleted file mode 100644
index ed7d37a..0000000
--- a/sdcore-helm-charts/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-charts/
-requirements.lock
-Chart.lock
diff --git a/sdcore-helm-charts/Chart.yaml b/sdcore-helm-charts/Chart.yaml
deleted file mode 100644
index 9527626..0000000
--- a/sdcore-helm-charts/Chart.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v2
-name: sd-core
-description: SD-Core control plane services
-icon: https://guide.opencord.org/logos/cord.svg
-type: application
-version: 0.7.16
-home: https://opennetworking.org/sd-core/
-maintainers:
-  - name: SD-Core Support
-    email: support@opennetworking.org
-
-dependencies:
-  - name: omec-control-plane
-    version: 0.7.15
-    repository: https://charts.aetherproject.org
-    condition: omec-control-plane.enable4G
-
-  - name: omec-sub-provision
-    version: 0.1.3
-    repository: https://charts.aetherproject.org
-    condition: omec-sub-provision.enable
-
-  - name: 5g-control-plane
-    version: 0.3.14
-    repository: https://charts.aetherproject.org
-    condition: 5g-control-plane.enable5G
-
-  - name: omec-user-plane
-    version: 0.4.8
-    repository: https://charts.aetherproject.org
-    condition: omec-user-plane.enable
diff --git a/sdcore-helm-charts/templates/NOTES.txt b/sdcore-helm-charts/templates/NOTES.txt
deleted file mode 100644
index 6dd4cd0..0000000
--- a/sdcore-helm-charts/templates/NOTES.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-{{- /*
-
-# Copyright 2021-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
-
-Notes - Instructions to use SD-Core application helm charts
diff --git a/sdcore-helm-charts/templates/_helpers.tpl b/sdcore-helm-charts/templates/_helpers.tpl
deleted file mode 100644
index 81c13ff..0000000
--- a/sdcore-helm-charts/templates/_helpers.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{- /*
-
-# Copyright 2020-present Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-*/ -}}
diff --git a/sdcore-helm-charts/values.yaml b/sdcore-helm-charts/values.yaml
deleted file mode 100644
index 0033fd2..0000000
--- a/sdcore-helm-charts/values.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-# Default values for all SD-CORE Helm charts.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-#Images tagged for the release
-omec-control-plane:
-  enable4G: false
-  #images:
-  #  tags:
-      #4G control Plane images
-  #config:
-  #  config4g:
-  #    deploy: true
-
-omec-user-plane:
-  enable: true
-  #images:
-  #  tags:
-      #4G/5G user plane images
-  #config:
-  #  upf:
-  #    cfgFiles:
-  #      upf.json:
-  #        cpiface:
-
-omec-sub-provision:
-  enable: true
-  #images:
-  #  tags:
-
-5g-control-plane:
-  enable5G: true
-  #images:
-  #  tags:
-      #5G NF images