Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 5g-control-plane/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description: SD-Core 5G control plane services
name: 5g-control-plane
icon: https://guide.opencord.org/logos/cord.svg

version: 3.1.5
version: 3.1.6

dependencies:
- name: mongodb
Expand Down
20 changes: 20 additions & 0 deletions 5g-control-plane/templates/deployment-webui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,26 @@ spec:
stdin: true
tty: true
command: ["/opt/webui-run.sh"]
readinessProbe:
httpGet:
path: /config/v1/
port: {{ .Values.config.webui.urlport.port }}
scheme: HTTP
initialDelaySeconds: 10
periodSeconds: 5
timeoutSeconds: 3
successThreshold: 1
failureThreshold: 3
livenessProbe:
httpGet:
path: /config/v1/
port: {{ .Values.config.webui.urlport.port }}
scheme: HTTP
initialDelaySeconds: 30
periodSeconds: 10
timeoutSeconds: 3
successThreshold: 1
failureThreshold: 3
{{- if .Values.resources.enabled }}
resources:
{{ toYaml .Values.resources.webui | indent 10 }}
Expand Down
2 changes: 1 addition & 1 deletion omec-sub-provision/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ description: Mobile Sim Provisioning services
name: omec-sub-provision
icon: https://guide.opencord.org/logos/cord.svg

version: 2.1.1
version: 2.1.2
22 changes: 20 additions & 2 deletions omec-sub-provision/templates/deployment-simapp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,28 @@ spec:
{{ toYaml .Values.images.pullSecrets | indent 8 }}
{{- end }}
initContainers:
- name: wait-simapp-module2
- name: wait-webui-ready
image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
imagePullPolicy: {{ .Values.images.pullPolicy }}
command: ['sh', '-c', 'until nslookup simapp; do echo waiting for simapp; sleep 4; done;']
command:
- sh
- -c
- |
WEBUI_ADDR={{ index .Values.config.simapp.cfgFiles "simapp.yaml" "configuration" "sub-provision-endpt" "addr" }}
WEBUI_PORT={{ index .Values.config.simapp.cfgFiles "simapp.yaml" "configuration" "sub-provision-endpt" "port" }}
echo "Waiting for ${WEBUI_ADDR} service to be available..."
until nslookup ${WEBUI_ADDR}; do
echo "Waiting for ${WEBUI_ADDR} DNS resolution..."
sleep 2
done
echo "${WEBUI_ADDR} DNS resolved, checking HTTP endpoint readiness..."
until wget --spider --timeout=2 -S http://${WEBUI_ADDR}:${WEBUI_PORT}/config/v1/ 2>&1 | grep -q "HTTP/"; do
echo "Waiting for ${WEBUI_ADDR} HTTP endpoint to be ready..."
echo "Endpoint check failed, response:"
wget --spider --timeout=2 -S http://${WEBUI_ADDR}:${WEBUI_PORT}/config/v1/ 2>&1 | head -n 5 || echo "Connection failed or timed out"
sleep 3
done
echo "${WEBUI_ADDR} is ready, starting simapp..."
{{- if .Values.config.coreDump.enabled }}
{{ tuple "simapp" . | include "omec-sub-provision.coredump_init" | indent 6 }}
{{- end }}
Expand Down
6 changes: 3 additions & 3 deletions sdcore-helm-charts/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: sd-core
description: SD-Core control plane services
icon: https://guide.opencord.org/logos/cord.svg
type: application
version: 3.1.7
version: 3.1.8
home: https://opennetworking.org/sd-core/
maintainers:
- name: SD-Core Support
Expand All @@ -23,12 +23,12 @@ dependencies:
condition: omec-control-plane.enable4G

- name: omec-sub-provision
version: 2.1.1
version: 2.1.2
repository: "file://../omec-sub-provision"
condition: omec-sub-provision.enable

- name: 5g-control-plane
version: 3.1.5
version: 3.1.6
repository: "file://../5g-control-plane"
condition: 5g-control-plane.enable5G

Expand Down
Loading