VOL-3280 - move bbsim off beta APIs

- update bbsim deploy manifest to be compatible with
  non-beta APIs

Change-Id: I1ecb323406fc04c70dddf5dc5c2cfacb28033269
diff --git a/VERSION b/VERSION
index a8a1887..d313e2e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.1.2
+7.1.3-dev
diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index e7efd66..d6cc8da 100644
--- a/bbsim/Chart.yaml
+++ b/bbsim/Chart.yaml
@@ -15,6 +15,5 @@
 name: bbsim
 description: Broadband Simulator
 icon: https://guide.opencord.org/logos/cord.svg
-
-version: 3.0.29
+version: 3.1.0
 appVersion: 0.2.6
diff --git a/bbsim/templates/deployment.yaml b/bbsim/templates/deployment.yaml
index 6376eaf..a908207 100644
--- a/bbsim/templates/deployment.yaml
+++ b/bbsim/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 {{- $log_level := tpl .Values.log_level . }}
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "bbsim.fullname" . }}
@@ -93,15 +93,12 @@
           ports:
             - name: "bbsim-{{ .Values.olt_id }}"
               containerPort: {{ .Values.olt_tcp_port }}
-              port: {{ .Values.olt_tcp_port }}
               protocol: TCP
             - name: "bbsim-{{ .Values.olt_id }}-api"
               containerPort: {{ .Values.bbsim_api_port }}
-              port: {{ .Values.bbsim_api_port }}
               protocol: TCP
             - name: "bbsim-{{ .Values.olt_id }}-sadis"
               containerPort: {{ .Values.bbsim_sadis_port }}
-              port: {{ .Values.bbsim_sadis_port }}
               protocol: TCP
           env:
             - name: POD_IP