Revert "checking sdcore or free5gc directory exist in a image"
This reverts commit dd579db39550a0d01e5e69429bbe8dc5235ad25e.
Reason for revert: <CI is not picking new helm charts so no use of doing this helm chart change>
Change-Id: Ie5572cc2231795ad1b2f576d699a573b74e012a4
diff --git a/5g-control-plane/templates/deployment-amf.yaml b/5g-control-plane/templates/deployment-amf.yaml
index eeecdc5..a6e7cc5 100644
--- a/5g-control-plane/templates/deployment-amf.yaml
+++ b/5g-control-plane/templates/deployment-amf.yaml
@@ -33,10 +33,10 @@
{{ toYaml .Values.images.pullSecrets | indent 8 }}
{{- end }}
initContainers:
- - name: wait-amf-module
+ - name: wait-nrf-module
image: {{ .Values.images.tags.init | quote }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
- command: ['sh', '-c', 'until nslookup amf; do echo waiting for amf; sleep 4; done;']
+ command: ['sh', '-c', 'until nslookup nrf; do echo waiting for nrf; sleep 4; done;']
{{- if .Values.config.coreDump.enabled }}
{{ tuple "amf" . | include "5g-control-plane.coredump_init" | indent 6 }}
{{- end }}
@@ -50,7 +50,7 @@
{{- end }}
stdin: true
tty: true
- command: ["/free5gc/script/amf-run.sh", "/sdcore/script/amf-run.sh"]
+ command: [ {{ .Values.config.imagePath }}/script/amf-run.sh ]
env:
- name: GRPC_GO_LOG_VERBOSITY_LEVEL
value: {{ .Values.config.grpc.golog_verbosity | quote }}
@@ -73,34 +73,21 @@
{{ toYaml .Values.resources.amf | indent 10 }}
{{- end }}
volumeMounts:
- - name: run-script-tmp
- mountPath: /free5gc/script/amf-run.sh
- subPath: amf-run.sh
- - name: nf-config-tmp
- mountPath: /free5gc/config
- name: run-script
- mountPath: /sdcore/script/amf-run.sh
+ mountPath: {{ .Values.config.imagePath }}/script/amf-run.sh
subPath: amf-run.sh
- - name: nf-config
- mountPath: /sdcore/config
+ - name: amf-config
+ mountPath: {{ .Values.config.imagePath }}/config
{{- if .Values.config.coreDump.enabled }}
- name: coredump
mountPath: /tmp/coredump
{{- end }}
volumes:
- - name: run-script-tmp
- configMap:
- name: amf
- defaultMode: 493
- - name: nf-config-tmp
- configMap:
- name: amf
- defaultMode: 493
- name: run-script
configMap:
name: amf
defaultMode: 493
- - name: nf-config
+ - name: amf-config
configMap:
name: amf
defaultMode: 493