bug fixes (91cd00dc) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

charts/meep-tinyiot-in-cse/values-template.yaml

+21 −19

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ image:
		repository: meep-docker-registry:30001/meep-tinyiot-in-cse
		tag: latest
		pullPolicy: Always
		# entrypointScript: /entrypoint.sh
		# entrypointScript: /entrypoint.shhelm
		env:
		MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL: 1s
		NR_MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL: 1s
		@@ -26,15 +26,15 @@ image:
		MEEP_SVC_PATH: /tinyiot-in-cse
		MEEP_HOST_URL: {{.HostUrl}}
		SERVER_IP: {{ .ServerIP \| default "192.168.0.112" \| quote }}
		SERVER_TYPE: {{ .ServerType \| default "IN_CSE" \| quote }}
		SERVER_PORT: {{ .ServerPort \| default "3002" \| quote }}
		MQTT_ENABLE: {{ .MqttEnable \| default "true" \| quote }}
		CSE_BASE_NAME: {{ .CseBaseName \| default "TinyIoT" \| quote }}
		CSE_BASE_RI: {{ .CseBaseRi \| default "tinyiot" \| quote }}
		MQTT_HOST: {{ .MqttHost \| default "meep-mosquitto" \| quote }}
		MQTT_PORT: {{ .MqttPort \| default 1883 \| quote }}
		MQTT_USERNAME: {{ .MqttUsername \| default "test" \| quote }}
		MQTT_PASSWORD: {{ .MqttPassword \| default "mqttq" \| quote }}
		SERVER_TYPE: "IN_CSE"
		SERVER_PORT: 3002
		MQTT_ENABLE: "true"
		CSE_BASE_NAME: "TinyIoT-IN"
		CSE_BASE_RI: "tinyiot"
		MQTT_HOST: "meep-mosquitto"
		MQTT_PORT: 1883
		MQTT_USERNAME: "test"
		MQTT_PASSWORD: "mqttq"
		MEEP_TOPIC: {{.SandboxName}}/tinyiot-in-cse
		{{- if .IsMepService }}
		MEEP_MEP_NAME: {{.MepName}}
		@@ -49,11 +49,13 @@ image:
		{{- end}}

		service:
		enabled: true
		name: meep-tiny-in-cse
		type: NodePort
		port: 3002
		NodePort: ""
		{{- if .IsMepService }}
		name: {{.MepName}}-meep-tinyiot-in-cse
		{{- else }}
		name: meep-tinyiot-mn-cse
		{{- end }}
		type: ClusterIP
		port: 80

		ingress:
		enabled: true
		@@ -61,7 +63,7 @@ ingress:
		- name: ''
		paths:
		{{- if .IsMepService }}
		- /{{.SandboxName}}/{{.MepName}}/tinyiot-in-cse
		- /{{.SandboxName}}/{{.MepName}}/meep-tinyiot-in-cse
		{{- else }}
		- /{{.SandboxName}}/tinyiot-in-cse
		{{- end }}
		@@ -70,13 +72,13 @@ ingress:
		nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}
		{{- if .IsMepService }}
		nginx.ingress.kubernetes.io/configuration-snippet: \|
		rewrite ^/{{.SandboxName}}/{{.MepName}}/tinyiot-in-cse(/\|$)(.*)$ /tinyiot-in-cse/$2 break;
		rewrite ^/{{.SandboxName}}/{{.MepName}}/meep-tinyiot-in-cse(/\|$)(.*)$ /$2 break;
		{{- else }}
		nginx.ingress.kubernetes.io/configuration-snippet: \|
		rewrite ^/{{.SandboxName}}/tinyiot-in-cse(/\|$)(.*)$ /tinyiot-in-cse/$2 break;
		rewrite ^/{{.SandboxName}}/meep-tinyiot-in-cse(/\|$)(.*)$ /$2 break;
		{{- end }}
		{{- if .AuthEnabled }}
		nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-tiny-in-cse&sandbox={{.SandboxName}}&mep={{.MepName}}
		nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-tinyiot-in-cse&sbox={{.SandboxName}}&mep={{.MepName}}
		{{- end }}
		labels: {}
		tls:

charts/meep-tinyiot-mn-cse/Chart.yaml

+1 −1

Original line number	Diff line number	Diff line
		apiVersion: v2
		appVersion: "1.0.0"
		description: MEEP tinyIoT MN-CSE Service Helm chart for Kubernetes
		name: meep-tiny-mn-cse
		name: meep-tiny-iot-mn-cse
		version: 1.0.0

charts/meep-tinyiot-mn-cse/templates/_helpers.tpl

+3 −3

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		{{/*
		Expand the name of the chart.
		*/}}
		{{- define "meep-tiny-mn-cse.name" -}}
		{{- define "meep-tiny-iot-mn-cse.name" -}}
		{{- default .Chart.Name .Values.nameOverride \| trunc 63 \| trimSuffix "-" -}}
		{{- end -}}

		@@ -11,7 +11,7 @@ Create a default fully qualified app name.
		We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
		If release name contains chart name it will be used as a full name.
		*/}}
		{{- define "meep-tiny-mn-cse.fullname" -}}
		{{- define "meep-tiny-iot-mn-cse.fullname" -}}
		{{- if .Values.fullnameOverride -}}
		{{- .Values.fullnameOverride \| trunc 63 \| trimSuffix "-" -}}
		{{- else -}}
		@@ -27,6 +27,6 @@ If release name contains chart name it will be used as a full name.
		{{/*
		Create chart name and version as used by the chart label.
		*/}}
		{{- define "meep-tiny-mn-cse.chart" -}}
		{{- define "meep-tiny-iot-mn-cse.chart" -}}
		{{- printf "%s-%s" .Chart.Name .Chart.Version \| replace "+" "_" \| trunc 63 \| trimSuffix "-" -}}
		{{- end -}}

charts/meep-tinyiot-mn-cse/templates/clusterrolebinding.yaml

+2 −2

Original line number	Diff line number	Diff line
		apiVersion: rbac.authorization.k8s.io/v1
		kind: ClusterRoleBinding
		metadata:
		name: "{{ .Release.Namespace }}:{{ template "meep-tiny-mn-cse.fullname" . }}"
		name: "{{ .Release.Namespace }}:{{ template "meep-tiny-iot-mn-cse.fullname" . }}"
		roleRef:
		apiGroup: rbac.authorization.k8s.io
		kind: ClusterRole
		name: cluster-admin
		subjects:
		- kind: ServiceAccount
		name: {{ template "meep-tiny-mn-cse.fullname" . }}
		name: {{ template "meep-tiny-iot-mn-cse.fullname" . }}
		namespace: {{ .Release.Namespace }}

		No newline at end of file

charts/meep-tinyiot-mn-cse/templates/codecov-pv.yaml

+5 −5

Original line number	Diff line number	Diff line
		@@ -2,9 +2,9 @@
		kind: PersistentVolume
		apiVersion: v1
		metadata:
		name: meep-tiny-mn-cse-codecov-pv
		name: meep-tiny-iot-mn-cse-codecov-pv
		spec:
		storageClassName: meep-tiny-mn-cse-codecov-sc
		storageClassName: meep-tiny-iot-mn-cse-codecov-sc
		capacity:
		storage: 100Mi
		accessModes:
		@@ -17,16 +17,16 @@ spec:
		kind: StorageClass
		apiVersion: storage.k8s.io/v1
		metadata:
		name: meep-tiny-mn-cse-codecov-sc
		name: meep-tiny-iot-mn-cse-codecov-sc
		provisioner: kubernetes.io/no-provisioner
		volumeBindingMode: WaitForFirstConsumer
		---
		kind: PersistentVolumeClaim
		apiVersion: v1
		metadata:
		name: meep-tiny-mn-cse-codecov-pvc
		name: meep-tiny-iot-mn-cse-codecov-pvc
		spec:
		storageClassName: meep-tiny-mn-cse-codecov-sc
		storageClassName: meep-tiny-iot-mn-cse-codecov-sc
		accessModes:
		- ReadWriteOnce
		resources: