Use the staging release image as default image
Also, clean up some unnecessary default values
Change-Id: I8174a606a4f7da8ec602ed4074edae2630f023ae
diff --git a/omec/omec-control-plane/Chart.yaml b/omec/omec-control-plane/Chart.yaml
index c01a2c1..f328456 100644
--- a/omec/omec-control-plane/Chart.yaml
+++ b/omec/omec-control-plane/Chart.yaml
@@ -10,4 +10,4 @@
name: omec-control-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.6.13
+version: 0.6.14
diff --git a/omec/omec-control-plane/templates/configmap-spgwc.yaml b/omec/omec-control-plane/templates/configmap-spgwc.yaml
index 2c3fe54..8d5d61c 100644
--- a/omec/omec-control-plane/templates/configmap-spgwc.yaml
+++ b/omec/omec-control-plane/templates/configmap-spgwc.yaml
@@ -6,9 +6,9 @@
{{- if .Values.config.spgwc.deploy }}
{{- if not .Values.config.useExistingConfigMap }}
-{{- $cpJson := index .Values.config.spgwc.jsonCfgFiles "cp.json" }}
+{{- $cpJson := index .Values.config.spgwc.cfgFiles "cp.json" }}
{{- $global := index $cpJson "global" }}
-{{- $configJson := index .Values.config.spgwc.jsonCfgFiles "config.json" }}
+{{- $configJson := index .Values.config.spgwc.cfgFiles "config.json" }}
{{- $configJsonSpgwc := index $configJson "spgwc" }}
{{- $configJsonGx := index $configJson "gx" }}
@@ -92,7 +92,7 @@
LoadExtension = "/usr/local/lib/freeDiameter/dict_ts32299_avps.fdx";
LoadExtension = "/usr/local/lib/freeDiameter/dict_CreditControl.fdx";
LoadExtension = "/usr/local/lib/freeDiameter/dict_Gx.fdx";
-{{- range $key, $value := .Values.config.spgwc.jsonCfgFiles }}
+{{- range $key, $value := .Values.config.spgwc.cfgFiles }}
{{ $key }}: |-
{{ toPrettyJson $value | indent 4 }}
{{- end }}
diff --git a/omec/omec-control-plane/values.yaml b/omec/omec-control-plane/values.yaml
index 41a8953..41f3482 100644
--- a/omec/omec-control-plane/values.yaml
+++ b/omec/omec-control-plane/values.yaml
@@ -7,18 +7,17 @@
images:
tags:
init: docker.io/omecproject/pod-init:1.0.0
- hssdb: docker.io/omecproject/c3po-hssdb:master-latest
- hss: docker.io/omecproject/c3po-hss:master-latest
- mme: docker.io/omecproject/nucleus:master-latest
- spgwc: docker.io/omecproject/spgw:master-latest
- pcrf: omecproject/c3po-pcrf:pcrf-latest
- pcrfdb: omecproject/c3po-pcrfdb:pcrf-latest
+ hssdb: "registry.aetherproject.org/proxy/omecproject/c3po-hssdb:master-deaea91"
+ hss: "registry.aetherproject.org/proxy/omecproject/c3po-hss:master-deaea91"
+ mme: "registry.aetherproject.org/proxy/omecproject/nucleus:master-9f86f87"
+ spgwc: "registry.aetherproject.org/omecproject/spgw:master-b9ce120"
+ pcrf: "registry.aetherproject.org/proxy/omecproject/c3po-pcrf:pcrf-7824e6e"
+ pcrfdb: "registry.aetherproject.org/proxy/omecproject/c3po-pcrfdb:pcrf-7824e6e"
depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
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
@@ -372,7 +371,7 @@
name: vmmestandalone
group_id: 1
code: 1
- logging: error
+ logging: debug
mcc:
dig1: 2
dig2: 0
@@ -382,7 +381,7 @@
dig2: 1
dig3: -1
plmnlist:
- #plmn1 - aether common plmn, plmn2 is for comac-in-box
+ #plmn1 is aether common plmn, plmn2 is for aether-in-a-box
plmn1: "mcc=315,mnc=010"
plmn2: "mcc=208,mnc=01"
apnlist:
@@ -432,7 +431,7 @@
nodePort:
enabled: false
port: 30080
- jsonCfgFiles:
+ cfgFiles:
cp.json:
global:
transmitTimerSec: 2