Correcting typos

charts/oai-5g-core/oai-5g-advance/README.md

 # Parent Helm Charts for Deploying Advance OAI-5G Core Network
 
-Slicing deployment contains
+Advance deployment contains
 
 1. OAI-AMF
 2. OAI-SMF
@@ -9,10 +9,10 @@ Slicing deployment contains
 5. OAI-AUSF
 6. OAI-UDM
 7. OAI-NSSF
-8. OAI-SPGWU-TINY
+8. OAI-UPF
 9. MYSQL (Subscriber database)
 
-Infra structure related information is present in `values.yaml` and core network configuration is in `config.yaml`.
+**Disclaimer**: Starting version 2.0.0 of OAI 5G Core network functions their configuration will be in `config.yaml` and `nssf_slice_config.yaml`. All infrastructure related information including image definition will be in `values.yaml`.
 
 If the gNB is in a different cluster or different subnet than pod subnet. Then you need to make sure AMF and SPGWU/UPF is reachable from the gNB host machine. You can use AMF and SPGWU/UPF multus interface. In SPGWU/UPF `n3Interface` should be able to reach gNB host machine/pod/container.
 

charts/oai-5g-core/oai-5g-basic/README.md

@@ -8,12 +8,12 @@ Basic deployment contains
 4. OAI-UDR
 5. OAI-AUSF
 6. OAI-UDM
-7. OAI-SPGWU-TINY
+7. OAI-UPF
 8. MYSQL (Subscriber database)
 
-Infra structure related information is present in `values.yaml` and core network configuration is in `config.yaml`.
+**Disclaimer**: Starting version 2.0.0 of OAI 5G Core network functions their configuration will be in `config.yaml` and all infrastructure related information including image definition will be in `values.yaml`.
 
-If the gNB is in a different cluster or different subnet than pod subnet. Then you need to make sure AMF and SPGWU/UPF is reachable from the gNB host machine. You can use AMF and SPGWU/UPF multus interface. In SPGWU/UPF `n3Interface` should be able to reach gNB host machine/pod/container.
+If the gNB is in a different cluster or different subnet than pod subnet. Then you need to make sure AMF and SPGWU/UPF is reachable from the gNB host machine. You can use AMF and UPF multus interface. In SPGWU/UPF `n3Interface` should be able to reach gNB host machine/pod/container.
 
 Once you are sure with the configuration parameters you can deploy these charts following the below steps. 
 

charts/oai-5g-core/oai-5g-mini/README.md

@@ -5,10 +5,11 @@ Mini deployment contains
 1. OAI-AMF
 2. OAI-SMF
 3. OAI-NRF
-4. OAI-SPGWU-TINY
+4. OAI-UPF
 5. MYSQL (Subscriber database)
 
-Infra structure related information is present in `values.yaml` and core network configuration is in `config.yaml`.
+
+**Disclaimer**: Starting version 2.0.0 of OAI 5G Core network functions their configuration will be in `config.yaml` and all infrastructure related information including image definition will be in `values.yaml`.
 
 If the gNB is in a different cluster or different subnet than pod subnet. Then you need to make sure AMF and SPGWU/UPF is reachable from the gNB host machine. You can use AMF and SPGWU/UPF multus interface. In SPGWU/UPF `n3Interface` should be able to reach gNB host machine/pod/container.
 

charts/oai-5g-core/oai-amf/README.md

 # Helm Chart for OAI Access and Mobility Function (AMF)
 
-The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10 and 4.12. There are no special resource requirements for AMF. 
+The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10, 4.12 and 4.13 There are no special resource requirements for AMF. 
 
-**NOTE**: All the extra interfaces/multus interfaces created inside the pod are using `macvlan` mode. If your environment does not allow using `macvlan` then you need to change the multus definations.
+**NOTE**: All the extra interfaces/multus interfaces created inside the pod are using `macvlan` mode. If your environment does not allow using `macvlan` then you need to change the multus definition.
 
 ## Disclaimer
 
-Starting version 2.0.0 of OAI 5G Core network functions their configuration will be in `config.yaml` and all infrastructure related information include image defination will be in `values.yaml`.
+Starting version 2.0.0 of OAI 5G Core network functions their configuration will be in `config.yaml` and all infrastructure related information including image definition will be in `values.yaml`.
 
 ## Introduction
 

charts/oai-5g-core/oai-ausf/README.md

 # Helm Chart for OAI Authentication Server Function (AUSF)
 
-The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10 and 4.12. There are no special resource requirements for AUSF. 
+The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10, 4.12 and 4.13. There are no special resource requirements for AUSF. 
+
+## Disclaimer
+
+Starting version 2.0.0 of OAI 5G Core network functions their configuration will be in `config.yaml` and all infrastructure related information including image definition will be in `values.yaml`.
 
 ## Introduction
 

charts/oai-5g-core/oai-nrf/README.md

 # Helm Chart for OAI Network Registry Function (NRF)
 
-The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10 and 4.12. There are no special resource requirements for NRF. 
+The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10, 4.12 and 4.13 There are no special resource requirements for NRF. 
+
+## Disclaimer
+
+Starting version 2.0.0 of OAI 5G Core network functions their configuration will be in `config.yaml` and all infrastructure related information including image definition will be in `values.yaml`.
 
 ## Introduction
 

charts/oai-5g-core/oai-smf/README.md

 # Helm Chart for OAI Session Management Function (SMF)
 
-The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10 and 4.12. There are no special resource requirements for SMF.
+The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10, 4.12 and 4.13. There are no special resource requirements for SMF.
 
-**NOTE**: All the extra interfaces/multus interfaces created inside the pod are using `macvlan` mode. If your environment does not allow using `macvlan` then you need to change the multus definations.
+**NOTE**: All the extra interfaces/multus interfaces created inside the pod are using `macvlan` mode. If your environment does not allow using `macvlan` then you need to change the multus definition.
+
+## Disclaimer
+
+Starting version 2.0.0 of OAI 5G Core network functions their configuration will be in `config.yaml` and all infrastructure related information including image definition will be in `values.yaml`.
 
 ## Introduction
 

charts/oai-5g-core/oai-udm/README.md

 # Helm Chart for OAI Unified Data Management (UDM)
 
-The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10 and 4.12. There are no special resource requirements for AMF. 
+The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10, 4.12, 4.13 There are no special resource requirements for AMF. 
+
+# Disclaimer
+
+Starting version 2.0.0 of OAI 5G Core network functions their configuration will be in `config.yaml` and all infrastructure related information including image definition will be in `values.yaml`.
 
 ## Introduction
 

charts/oai-5g-core/oai-udr/README.md

 # Helm Chart for OAI Unified Data Repository (UDR)
 
-The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10 and 4.12. There are no special resource requirements for AUSF. 
+The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10, 4.12 and 4.13. There are no special resource requirements for AUSF. 
+
+# Disclaimer
+
+Starting version 2.0.0 of OAI 5G Core network functions their configuration will be in `config.yaml` and all infrastructure related information including image definition will be in `values.yaml`.
 
 ## Introduction
 

charts/oai-5g-core/oai-upf-vpp/templates/rbac.yaml

----
-{{- if eq .Values.kubernetesType "Openshift" }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ .Chart.Name }}-{{ .Release.Namespace }}-role
-rules:
-- apiGroups:
-  - security.openshift.io
-  resourceNames:
-  - privileged
-  resources:
-  - securitycontextconstraints
-  verbs:
-  - use
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ .Chart.Name }}-{{ .Release.Namespace }}-binding
-subjects:
-- kind: ServiceAccount
-  name: {{ .Values.serviceAccount.name }}
-  namespace: {{ .Release.Namespace }}
-roleRef:
-  kind: Role
-  name: {{ .Chart.Name }}-{{ .Release.Namespace }}-role
-  apiGroup: rbac.authorization.k8s.io
-{{- end }}
\ No newline at end of file

charts/oai-5g-core/oai-upf-vpp/templates/serviceaccount.yaml

-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ .Values.serviceAccount.name }}
-

charts/oai-5g-core/oai-upf/README.md

 # Helm Chart for OAI User Plane Network Function (UPF)
 
-The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10 and 4.12. UPF requires eBPF in the kernel if you want to test it in eBPF mode else it can be used with simple switch. In both the modes UPF requires `privileged` flag to be `true`. UPF needs to create tunnel interface for GTP and it creates NAT rules for packets to go towards internet from N6.
+The helm-chart is tested on [Minikube](https://minikube.sigs.k8s.io/docs/) and [Red Hat Openshift](https://www.redhat.com/fr/technologies/cloud-computing/openshift) 4.10, 4.12 and 4.13. UPF requires eBPF in the kernel if you want to test it in eBPF mode else it can be used with simple switch. In both the modes UPF requires `privileged` flag to be `true`. UPF needs to create tunnel interface for GTP and it creates NAT rules for packets to go towards internet from N6.
 
 **NOTE**: All the extra interfaces/multus interfaces created inside the pod are using `macvlan` mode. If your environment does not allow using `macvlan` then you need to change the multus definations. 
 
+# Disclaimer
+
+Starting version 2.0.0 of OAI 5G Core network functions their configuration will be in `config.yaml` and all infrastructure related information including image definition will be in `values.yaml`.
+
 ## Introduction
 
 [OAI-UPF](https://github.com/OPENAIRINTERFACE/openair-spgwu-tiny) is the 4G CUPS S/PGWU. We modified it to work for 5G deployments with GTP-U extension header.