Update gnbsim, sctplb images
- Also correcting metricfunction name in the helm charts
- Updating mongoDB helm charts
Change-Id: I9627cd6e819f1c91ad7b8d571c448cb23ab912ee
diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index 7253c06..363ad4c 100644
--- a/5g-control-plane/Chart.yaml
+++ b/5g-control-plane/Chart.yaml
@@ -8,11 +8,11 @@
name: 5g-control-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.7.3
+version: 0.7.4
dependencies:
- name: mongodb
- version: 10.7.1
+ version: 10.31.5
repository: https://charts.bitnami.com/bitnami
condition: mongodb.deploy
- name: kafka
diff --git a/5g-control-plane/templates/bin/_metrics-run.sh.tpl b/5g-control-plane/templates/bin/_metricfunc-run.sh.tpl
similarity index 100%
rename from 5g-control-plane/templates/bin/_metrics-run.sh.tpl
rename to 5g-control-plane/templates/bin/_metricfunc-run.sh.tpl
diff --git a/5g-control-plane/templates/configmap-amf.yaml b/5g-control-plane/templates/configmap-amf.yaml
index 10ecaed..6ebacf7 100644
--- a/5g-control-plane/templates/configmap-amf.yaml
+++ b/5g-control-plane/templates/configmap-amf.yaml
@@ -30,6 +30,10 @@
{{- $_ := .Values.config.sctplb.deploy | set $amfcfg.configuration "enableSctpLb" -}}
{{- end }}
+{{- if not (hasKey $amfcfg.configuration "nfKafka") -}}
+{{- $_ := .Values.kafka.nfKafka | set $amfcfg.configuration "nfKafka" -}}
+{{- $_ := .Values.kafka.deploy | set $amfcfg.configuration.nfKafka "enable" -}}
+{{- end }}
{{- end }}
diff --git a/5g-control-plane/templates/configmap-metricfunc.yaml b/5g-control-plane/templates/configmap-metricfunc.yaml
new file mode 100644
index 0000000..db06cee
--- /dev/null
+++ b/5g-control-plane/templates/configmap-metricfunc.yaml
@@ -0,0 +1,30 @@
+{{/*
+# Copyright 2022-present Open Networking Foundation
+
+# SPDX-License-Identifier: Apache-2.0
+*/}}
+
+{{- if .Values.config.metricfunc.deploy }}
+
+{{- if not .Values.config.useExistingConfigMap -}}
+{{- $metricscfg := index .Values.config.metricfunc.cfgFiles "metricscfg.conf" }}
+
+{{- end }}
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: metricfunc
+ labels:
+{{ tuple "metricfunc" . | include "5g-control-plane.metadata_labels" | indent 4 }}
+data:
+ metricfunc-run.sh: |
+{{ tuple "bin/_metricfunc-run.sh.tpl" . | include "5g-control-plane.template" | indent 4 }}
+{{- if not .Values.config.useExistingConfigMap -}}
+{{- range $key, $value := .Values.config.metricfunc.cfgFiles }}
+ {{ $key }}: |-
+{{ toYaml $value | indent 4 }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/5g-control-plane/templates/configmap-metrics.yaml b/5g-control-plane/templates/configmap-metrics.yaml
deleted file mode 100644
index 7705174..0000000
--- a/5g-control-plane/templates/configmap-metrics.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-{{/*
-# Copyright 2022-present Open Networking Foundation
-
-# SPDX-License-Identifier: Apache-2.0
-*/}}
-
-{{- if .Values.config.metrics.deploy }}
-
-{{- if not .Values.config.useExistingConfigMap -}}
-{{- $metricscfg := index .Values.config.metrics.cfgFiles "metricscfg.conf" }}
-
-{{- end }}
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: metrics
- labels:
-{{ tuple "metrics" . | include "5g-control-plane.metadata_labels" | indent 4 }}
-data:
- metrics-run.sh: |
-{{ tuple "bin/_metrics-run.sh.tpl" . | include "5g-control-plane.template" | indent 4 }}
-{{- if not .Values.config.useExistingConfigMap -}}
-{{- range $key, $value := .Values.config.metrics.cfgFiles }}
- {{ $key }}: |-
-{{ toYaml $value | indent 4 }}
-{{- end }}
-{{- end }}
-{{- end }}
diff --git a/5g-control-plane/templates/configmap-smf.yaml b/5g-control-plane/templates/configmap-smf.yaml
index ba00a36..2a24a4a 100644
--- a/5g-control-plane/templates/configmap-smf.yaml
+++ b/5g-control-plane/templates/configmap-smf.yaml
@@ -16,6 +16,10 @@
{{- if not (hasKey $sbi "port") -}}
{{- $_ := .Values.config.smf.sbi.port | set $sbi "port" -}}
{{- end }}
+{{- if not (hasKey $smfcfg.configuration "nfKafka") -}}
+{{- $_ := .Values.kafka.nfKafka | set $smfcfg.configuration "nfKafka" -}}
+{{- $_ := .Values.kafka.deploy | set $smfcfg.configuration.nfKafka "enable" -}}
+{{- end }}
{{- end }}
---
diff --git a/5g-control-plane/templates/deployment-metrics.yaml b/5g-control-plane/templates/deployment-metricfunc.yaml
similarity index 61%
rename from 5g-control-plane/templates/deployment-metrics.yaml
rename to 5g-control-plane/templates/deployment-metricfunc.yaml
index b19f9c4..271b282 100644
--- a/5g-control-plane/templates/deployment-metrics.yaml
+++ b/5g-control-plane/templates/deployment-metricfunc.yaml
@@ -3,38 +3,38 @@
# SPDX-License-Identifier: Apache-2.0
*/}}
-{{- if .Values.config.metrics.deploy }}
-{{ tuple "metrics" . | include "5g-control-plane.service_account" }}
+{{- if .Values.config.metricfunc.deploy }}
+{{ tuple "metricfunc" . | include "5g-control-plane.service_account" }}
---
apiVersion: apps/v1
kind: Deployment
metadata:
- name: metrics
+ name: metricfunc
labels:
-{{ tuple "metrics" . | include "5g-control-plane.metadata_labels" | indent 4 }}
+{{ tuple "metricfunc" . | include "5g-control-plane.metadata_labels" | indent 4 }}
spec:
replicas: 1
- #serviceName: metrics-headless
+ #serviceName: metricfunc-headless
selector:
matchLabels:
-{{ tuple "metrics" . | include "5g-control-plane.metadata_labels" | indent 6 }}
+{{ tuple "metricfunc" . | include "5g-control-plane.metadata_labels" | indent 6 }}
template:
metadata:
labels:
-{{ tuple "metrics" . | include "5g-control-plane.metadata_labels" | indent 8 }}
- {{- with .Values.config.metrics.podAnnotations }}
+{{ tuple "metricfunc" . | include "5g-control-plane.metadata_labels" | indent 8 }}
+ {{- with .Values.config.metricfunc.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
- serviceAccountName: metrics
+ serviceAccountName: metricfunc
{{- if hasKey .Values.images "pullSecrets" }}
imagePullSecrets:
{{ toYaml .Values.images.pullSecrets | indent 8 }}
{{- end }}
containers:
- - name: metrics
- image: {{ .Values.images.tags.metrics }}
+ - name: metricfunc
+ image: {{ .Values.images.tags.metricfunc }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
{{- if .Values.config.coreDump.enabled }}
securityContext:
@@ -42,7 +42,7 @@
{{- end }}
stdin: true
tty: true
- command: [ "/metricfunc/script/metrics-run.sh" ]
+ command: [ "/metricfunc/script/metricfunc-run.sh" ]
env:
- name: POD_IP
valueFrom:
@@ -50,13 +50,13 @@
fieldPath: status.podIP
{{- if .Values.resources.enabled }}
resources:
-{{ toYaml .Values.resources.metrics | indent 10 }}
+{{ toYaml .Values.resources.metricfunc | indent 10 }}
{{- end }}
volumeMounts:
- name: run-script
- mountPath: /metricfunc/script/metrics-run.sh
- subPath: metrics-run.sh
- - name: metrics-config
+ mountPath: /metricfunc/script/metricfunc-run.sh
+ subPath: metricfunc-run.sh
+ - name: metricfunc-config
mountPath: /metricfunc/config
{{- if .Values.config.coreDump.enabled }}
- name: coredump
@@ -65,11 +65,11 @@
volumes:
- name: run-script
configMap:
- name: metrics
+ name: metricfunc
defaultMode: 493
- - name: metrics-config
+ - name: metricfunc-config
configMap:
- name: metrics
+ name: metricfunc
defaultMode: 493
{{- if .Values.config.coreDump.enabled }}
- name: host-rootfs
diff --git a/5g-control-plane/templates/service-metricfunc.yaml b/5g-control-plane/templates/service-metricfunc.yaml
new file mode 100644
index 0000000..c396d98
--- /dev/null
+++ b/5g-control-plane/templates/service-metricfunc.yaml
@@ -0,0 +1,28 @@
+{{/*
+# Copyright 2022-present Open Networking Foundation
+
+# SPDX-License-Identifier: Apache-2.0
+*/}}
+
+{{- if .Values.config.metricfunc.deploy }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: metricfunc
+ labels:
+{{ tuple "metricfunc" . | include "5g-control-plane.metadata_labels" | indent 4 }}
+spec:
+ type: {{ .Values.config.metricfunc.serviceType }}
+ selector:
+{{ tuple "metricfunc" . | include "5g-control-plane.metadata_labels" | indent 4 }}
+ ports:
+ - name: prometheus-exporter
+ port: {{ .Values.config.metricfunc.prometheus.port }}
+ protocol: TCP
+{{- if eq .Values.config.metricfunc.serviceType "NodePort" }}
+{{- if .Values.config.metricfunc.prometheus.nodePort }}
+ nodePort: {{ .Values.config.metricfunc.prometheus.nodePort }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/5g-control-plane/templates/service-metrics.yaml b/5g-control-plane/templates/service-metrics.yaml
deleted file mode 100644
index 7d8ec89..0000000
--- a/5g-control-plane/templates/service-metrics.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-{{/*
-# Copyright 2022-present Open Networking Foundation
-
-# SPDX-License-Identifier: Apache-2.0
-*/}}
-
-{{- if .Values.config.metrics.deploy }}
----
-apiVersion: v1
-kind: Service
-metadata:
- name: metrics
- labels:
-{{ tuple "metrics" . | include "5g-control-plane.metadata_labels" | indent 4 }}
-spec:
- type: {{ .Values.config.metrics.serviceType }}
- selector:
-{{ tuple "metrics" . | include "5g-control-plane.metadata_labels" | indent 4 }}
- ports:
- - name: prometheus-exporter
- port: {{ .Values.config.metrics.prometheus.port }}
- protocol: TCP
-{{- if eq .Values.config.metrics.serviceType "NodePort" }}
-{{- if .Values.config.metrics.prometheus.nodePort }}
- nodePort: {{ .Values.config.metrics.prometheus.nodePort }}
-{{- end }}
-{{- end }}
-{{- end }}
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index cda9a57..2cc12e0 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -15,8 +15,8 @@
udr: omecproject/5gc-udr:master-c9c04fe
udm: omecproject/5gc-udm:master-5992f3f
webui: omecproject/5gc-webui:master-87adbcc
- sctplb: sctplb:0.0.1-dev-local1
- metrics: metricfunc:0.0.1-dev-local0
+ sctplb: omecproject/sctplb:master-538dad6
+ metricfunc: metricfunc:0.0.1-dev-local0
pullPolicy: IfNotPresent
resources:
@@ -92,7 +92,7 @@
cpu: 1
memory: 1Gi
- metrics:
+ metricfunc:
requests:
cpu: 1
memory: 1Gi
@@ -102,6 +102,10 @@
kafka:
deploy: false
+ nfKafka:
+ urls:
+ - "sd-core-kafka-headless:9092"
+ topic: "sdcore-nf-data-source"
mongodb:
deploy: true
@@ -643,7 +647,7 @@
- mcc: "208"
mnc: "93"
groupId: ausfGroup001
- metrics:
+ metricfunc:
deploy: false
serviceType: ClusterIP
prometheus: