Cleaning up Kafka config

Cleaning up kafka config and adding kafka config for upf-adapter
omec-project · Oct 20, 2024 · 241efd1 · 241efd1
1 parent 49d83a2
commit 241efd1
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 17 deletions.
diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
@@ -10,7 +10,7 @@ description: SD-Core 5G control plane services
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.1.0
+version: 1.1.1
 
 dependencies:
   - name: mongodb

diff --git a/5g-control-plane/templates/bin/_upf-adapter-run.sh.tpl b/5g-control-plane/templates/bin/_upf-adapter-run.sh.tpl
@@ -14,4 +14,4 @@ cd /aether
 
 cat config/config.yaml
 
-GOTRACEBACK=crash ./upfadapter config/config.yaml
+GOTRACEBACK=crash ./upfadapter -config config/config.yaml
diff --git a/5g-control-plane/templates/configmap-amf.yaml b/5g-control-plane/templates/configmap-amf.yaml
@@ -34,11 +34,6 @@
 {{- $_ := .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 }}
-
 {{- if not (hasKey $amfcfg.configuration.kafkaInfo "enableKafka") -}}
 {{- $_ := .Values.kafka.deploy | set $amfcfg.configuration.kafkaInfo "enableKafka" -}}
 {{- end }}

diff --git a/5g-control-plane/templates/configmap-smf.yaml b/5g-control-plane/templates/configmap-smf.yaml
@@ -24,10 +24,6 @@
 {{- if not (hasKey $smfcfg.configuration "enableUPFAdapter") -}}
 {{- $_ := .Values.config.upfadapter.deploy | set $smfcfg.configuration "enableUPFAdapter" -}}
 {{- end }}
-{{- if not (hasKey $smfcfg.configuration "nfKafka") -}}
-{{- $_ := .Values.kafka.nfKafka | set $smfcfg.configuration "nfKafka" -}}
-{{- $_ := .Values.kafka.deploy | set $smfcfg.configuration.nfKafka "enable" -}}
-{{- end }}
 {{- if not (hasKey $smfcfg.configuration.kafkaInfo "enableKafka") -}}
 {{- $_ := .Values.kafka.deploy | set $smfcfg.configuration.kafkaInfo "enableKafka" -}}
 {{- end }}

diff --git a/5g-control-plane/templates/configmap-upf-adapter.yaml b/5g-control-plane/templates/configmap-upf-adapter.yaml
@@ -13,6 +13,12 @@
 {{- if not (hasKey $upfadaptercfg "mongodb") -}}
 {{- $_ := dict "name" .Values.config.mongodb.name "url" .Values.config.mongodb.url | set $upfadaptercfg "mongodb" -}}
 {{- end }}
+{{- if not (hasKey $upfadaptercfg "logger") -}}
+{{- $_ := .Values.config.logger | set $upfadaptercfg "logger" -}}
+{{- end }}
+{{- if not (hasKey $upfadaptercfg.configuration.kafkaInfo "enableKafka") -}}
+{{- $_ := .Values.kafka.deploy | set $upfadaptercfg.configuration.kafkaInfo "enableKafka" -}}
+{{- end }}
 
 {{- end }}
 

diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
@@ -122,10 +122,6 @@ kafka:
       enabled: false
   persistence:
     enabled: false
-  nfKafka:
-    urls:
-      - "kafka-headless:9092"
-    topic: "sdcore-nf-data-source"
 
 mongodb:
   deploy: true
@@ -748,3 +744,8 @@ config:
           description: UPF Adapter initial local configuration
         logger:
           level: info
+        configuration:
+          kafkaInfo:
+            brokerUri: "kafka-headless"
+            brokerPort: 9092
+            topicName: "sdcore-data-source-smf"
diff --git a/sdcore-helm-charts/Chart.yaml b/sdcore-helm-charts/Chart.yaml
@@ -10,7 +10,7 @@ name: sd-core
 description: SD-Core control plane services
 icon: https://guide.opencord.org/logos/cord.svg
 type: application
-version: 1.1.1
+version: 1.1.2
 home: https://opennetworking.org/sd-core/
 maintainers:
   - name: SD-Core Support
@@ -28,7 +28,7 @@ dependencies:
     condition: omec-sub-provision.enable
 
   - name: 5g-control-plane
-    version: 1.1.0
+    version: 1.1.1
     repository: "file://../5g-control-plane"
     condition: 5g-control-plane.enable5G