integration test updates
Change-Id: I1e65cafce5e764ed071c4ffe6cb2e95284bb9b5a
diff --git a/5g-ran-sim/Chart.yaml b/5g-ran-sim/Chart.yaml
index d9e7f76..c29348f 100644
--- a/5g-ran-sim/Chart.yaml
+++ b/5g-ran-sim/Chart.yaml
@@ -8,4 +8,4 @@
name: 5g-ran-sim
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.6.1
+version: 0.6.2
diff --git a/5g-ran-sim/templates/statefulset-gnbsim.yaml b/5g-ran-sim/templates/statefulset-gnbsim.yaml
index cae9c64..b6c4e6e 100644
--- a/5g-ran-sim/templates/statefulset-gnbsim.yaml
+++ b/5g-ran-sim/templates/statefulset-gnbsim.yaml
@@ -32,7 +32,7 @@
{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
"ips": [ {{ include "gnbiplist" .}} ]
{{- else }}
- "ips": {{ .Values.config.gnbsim.gnb.ip | quote }}
+ "ips": {{ .Values.config.gnbsim.gnb.ips | quote }}
{{- end }}
}
]'
@@ -48,10 +48,12 @@
{{ toYaml .Values.images.pullSecrets | indent 8 }}
{{- end }}
initContainers:
+ {{- if .Values.config.gnbsim.nonStandalone }}
- name: wait-amf-module
image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
- command: ['sh', '-c', 'until nslookup amf; do echo waiting for nrf; sleep 4; done;']
+ command: ['sh', '-c', 'until nslookup amf; do echo waiting for amf; sleep 4; done;']
+ {{- end }}
{{- if .Values.config.coreDump.enabled }}
{{ tuple "gnbsim" . | include "5g-ransim-plane.coredump_init" | indent 6 }}
{{- end }}
@@ -76,9 +78,15 @@
valueFrom:
fieldRef:
fieldPath: status.podIP
- {{- if .Values.resources.enabled }}
+ {{- if or .Values.resources.enabled .Values.config.gnbsim.sriov.enabled }}
resources:
{{ toYaml .Values.resources.gnbsim | indent 10 }}
+{{- if .Values.config.gnbsim.sriov.enabled }}
+ requests:
+ {{ .Values.config.gnbsim.sriov.resourceName }}: 1
+ limits:
+ {{ .Values.config.gnbsim.sriov.resourceName }}: 1
+ {{- end }}
{{- end }}
volumeMounts:
- name: cp-script
diff --git a/5g-ran-sim/values.yaml b/5g-ran-sim/values.yaml
index 874f5ff..afd4534 100644
--- a/5g-ran-sim/values.yaml
+++ b/5g-ran-sim/values.yaml
@@ -33,6 +33,7 @@
path: /tmp/coredump
gnbsim:
deploy: true
+ nonStandalone: true
serviceType: ClusterIP
networkTopo:
- upfAddr: "192.168.252.3/32"