Configurable repository for container images.
Configurable repository for container images. By default
pull the images from docker hub
Change-Id: Iabcf97318be11c20e6fcb7b7766c9325512bb867
diff --git a/omec-control-plane/Chart.yaml b/omec-control-plane/Chart.yaml
index 0d98612..4024900 100644
--- a/omec-control-plane/Chart.yaml
+++ b/omec-control-plane/Chart.yaml
@@ -9,4 +9,4 @@
name: omec-control-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.10.7
+version: 0.10.8
diff --git a/omec-control-plane/templates/statefulset-config4g.yaml b/omec-control-plane/templates/statefulset-config4g.yaml
index df3b8a7..9e3b70f 100644
--- a/omec-control-plane/templates/statefulset-config4g.yaml
+++ b/omec-control-plane/templates/statefulset-config4g.yaml
@@ -35,7 +35,7 @@
{{- end }}
containers:
- name: config-4g
- image: {{ .Values.images.tags.config4g }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.config4g }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
{{- if .Values.config.coreDump.enabled }}
securityContext:
diff --git a/omec-control-plane/templates/statefulset-hss.yaml b/omec-control-plane/templates/statefulset-hss.yaml
index 1dc7e49..d002eda 100644
--- a/omec-control-plane/templates/statefulset-hss.yaml
+++ b/omec-control-plane/templates/statefulset-hss.yaml
@@ -43,7 +43,7 @@
{{- end }}
initContainers:
- name: hss-bootstrap
- image: {{ .Values.images.tags.hssdb }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.hssdb }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
command: ["/opt/c3po/hss/scripts/hss-bootstrap.sh"]
volumeMounts:
@@ -54,7 +54,7 @@
{{- end }}
containers:
- name: hss
- image: {{ .Values.images.tags.hss }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.hss }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
{{- if .Values.config.coreDump.enabled }}
securityContext:
diff --git a/omec-control-plane/templates/statefulset-mme.yaml b/omec-control-plane/templates/statefulset-mme.yaml
index 4c7744e..ac574ce 100644
--- a/omec-control-plane/templates/statefulset-mme.yaml
+++ b/omec-control-plane/templates/statefulset-mme.yaml
@@ -39,7 +39,7 @@
{{- end }}
initContainers:
- name: mme-load-sctp-module
- image: {{ .Values.images.tags.init | quote }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
securityContext:
privileged: true
@@ -86,7 +86,7 @@
[]
{{- end }}
- name: mme-init
- image: {{ .Values.images.tags.mme | quote }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.mme }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
command: ["/opt/mme/scripts/mme-init.sh"]
env:
@@ -106,7 +106,7 @@
{{- end }}
containers:
- name: mme-app
- image: {{ .Values.images.tags.mme | quote }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.mme }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
{{- if .Values.config.coreDump.enabled }}
securityContext:
@@ -145,7 +145,7 @@
mountPath: /tmp/coredump
{{- end }}
- name: s1ap-app
- image: {{ .Values.images.tags.mme | quote }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.mme }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
{{- if .Values.config.coreDump.enabled }}
securityContext:
@@ -180,7 +180,7 @@
mountPath: /tmp/coredump
{{- end }}
- name: s6a-app
- image: {{ .Values.images.tags.mme | quote }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.mme }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
{{- if .Values.config.coreDump.enabled }}
securityContext:
@@ -213,7 +213,7 @@
mountPath: /tmp/coredump
{{- end }}
- name: s11-app
- image: {{ .Values.images.tags.mme | quote }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.mme }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
{{- if .Values.config.coreDump.enabled }}
securityContext:
diff --git a/omec-control-plane/templates/statefulset-pcrf.yaml b/omec-control-plane/templates/statefulset-pcrf.yaml
index 8fa34d8..ac7de7f 100644
--- a/omec-control-plane/templates/statefulset-pcrf.yaml
+++ b/omec-control-plane/templates/statefulset-pcrf.yaml
@@ -39,7 +39,7 @@
serviceAccountName: pcrf
initContainers:
- name: pcrf-bootstrap
- image: {{ .Values.images.tags.pcrfdb }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.pcrfdb }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
command: ["/opt/c3po/pcrf/pcrf-bootstrap.sh"]
volumeMounts:
@@ -50,7 +50,7 @@
{{- end }}
containers:
- name: pcrf
- image: {{ .Values.images.tags.pcrf }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.pcrf }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
{{- if .Values.config.coreDump.enabled }}
securityContext:
diff --git a/omec-control-plane/templates/statefulset-spgwc.yaml b/omec-control-plane/templates/statefulset-spgwc.yaml
index 953bafa..5b8bfc3 100644
--- a/omec-control-plane/templates/statefulset-spgwc.yaml
+++ b/omec-control-plane/templates/statefulset-spgwc.yaml
@@ -43,7 +43,7 @@
{{- end }}
containers:
- name: spgwc
- image: {{ .Values.images.tags.spgwc }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.spgwc }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
{{- if .Values.config.coreDump.enabled }}
securityContext:
@@ -112,7 +112,7 @@
mountPath: /tmp/coredump
{{- end }}
- name: gx-app
- image: {{ .Values.images.tags.spgwc }}
+ image: {{ .Values.images.repository }}{{ .Values.images.tags.spgwc }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
{{- if .Values.config.coreDump.enabled }}
securityContext:
diff --git a/omec-control-plane/values.yaml b/omec-control-plane/values.yaml
index c5f3e48..383a306 100644
--- a/omec-control-plane/values.yaml
+++ b/omec-control-plane/values.yaml
@@ -4,20 +4,18 @@
# SPDX-License-Identifier: Apache-2.0
images:
+ repository: "" # default docker hub
tags:
- init: registry.aetherproject.org/tools/busybox:stable
+ init: omecproject/busybox:stable
depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
- hssdb: registry.aetherproject.org/proxy/omecproject/c3po-hssdb:master-df54425
- hss: registry.aetherproject.org/proxy/omecproject/c3po-hss:master-df54425
- mme: registry.aetherproject.org/proxy/omecproject/nucleus:master-01dc535
- spgwc: registry.aetherproject.org/omecproject/spgw:master-96012d9
- pcrf: registry.aetherproject.org/proxy/omecproject/c3po-pcrf:pcrf-d58dd1c
- pcrfdb: registry.aetherproject.org/proxy/omecproject/c3po-pcrfdb:pcrf-d58dd1c
- config4g: registry.aetherproject.org/omecproject/5gc-webui:master-4a8e10a
+ hssdb: omecproject/c3po-hssdb:master-df54425
+ hss: omecproject/c3po-hss:master-df54425
+ mme: omecproject/nucleus:master-01dc535
+ spgwc: omecproject/spgw:master-96012d9
+ pcrf: omecproject/c3po-pcrf:pcrf-d58dd1c
+ pcrfdb: omecproject/c3po-pcrfdb:pcrf-d58dd1c
+ config4g: omecproject/5gc-webui:master-7f96cfd
pullPolicy: IfNotPresent
- # Secrets must be manually created in the namespace.
- pullSecrets:
- - name: aether.registry
nodeSelectors:
enabled: false
@@ -547,6 +545,12 @@
access-tags:
tag1: ACC
qos-profiles:
+ qos-profile1:
+ qci: 9
+ arp: 1
+ apn-ambr:
+ - 12345678
+ - 12345678
mobile:
qci: 9
arp: 1