Use staging release image as default

Also, remove zmq based cpiface

Change-Id: I18b8d2d41317cfad1fb6e129d21e3e8229711b5d
diff --git a/omec/omec-user-plane/Chart.yaml b/omec/omec-user-plane/Chart.yaml
index 1eb313e..4a10cb1 100644
--- a/omec/omec-user-plane/Chart.yaml
+++ b/omec/omec-user-plane/Chart.yaml
@@ -7,4 +7,4 @@
 name: omec-user-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.3.14
+version: 0.3.15
diff --git a/omec/omec-user-plane/templates/statefulset-upf.yaml b/omec/omec-user-plane/templates/statefulset-upf.yaml
index ceabaa2..28cf0e4 100644
--- a/omec/omec-user-plane/templates/statefulset-upf.yaml
+++ b/omec/omec-user-plane/templates/statefulset-upf.yaml
@@ -157,24 +157,12 @@
 {{ toYaml .Values.resources.web | indent 10 }}
       {{- end }}
       - name: cpiface
-      {{- if eq .Values.config.upf.cpiface.mode "zmq" }}
-        image: {{ .Values.images.tags.zmqiface | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
-        env:
-          - name: GLOG_v
-            value: "1"
-        command: ["zmq-cpiface"]
-        args:
-          - --json_config
-          - /tmp/conf/upf.json
-      {{- else }}
         image: {{ .Values.images.tags.pfcpiface | quote }}
         imagePullPolicy: {{ .Values.images.pullPolicy | quote }}
         command: ["pfcpiface"]
         args:
           - -config
           - /tmp/conf/upf.json
-      {{- end }}
       {{- if .Values.resources.enabled }}
         resources:
 {{ toYaml .Values.resources.cpiface | indent 10 }}
diff --git a/omec/omec-user-plane/values.yaml b/omec/omec-user-plane/values.yaml
index ea376a3..00cd2d1 100644
--- a/omec/omec-user-plane/values.yaml
+++ b/omec/omec-user-plane/values.yaml
@@ -5,14 +5,12 @@
 images:
   tags:
     init: docker.io/omecproject/pod-init:1.0.0
-    bess: docker.io/omecproject/upf-epc-bess:master-latest
-    pfcpiface: docker.io/omecproject/upf-epc-pfcpiface:master-latest
-    zmqiface: docker.io/omecproject/upf-epc-cpiface:master-latest
+    bess: registry.aetherproject.org/proxy/omecproject/upf-epc-bess:master-e3f53d5
+    pfcpiface: registry.aetherproject.org/proxy/omecproject/upf-epc-pfcpiface:master-e3f53d5
   pullPolicy: IfNotPresent
-  # Optionally specify an array of imagePullSecrets.
   # Secrets must be manually created in the namespace.
-  #pullSecrets:
-  #  - name: aether.registry
+  pullSecrets:
+    - name: aether.registry
 
 nodeSelectors:
   enabled: false
@@ -90,9 +88,6 @@
     bess:
       web:
         nodePort: 32001
-    cpiface:
-      # pfcp or zmq
-      mode: pfcp
 
 servicemonitor:
   enabled: false