Commit 1da82085 authored by Yann Garcia's avatar Yann Garcia
Browse files

Minor bug fixed in charts

parent 2bb87903

charts/meep-acme-in-cse/templates/service.yaml

+1 −1
Changes for charts/meep-acme-in-cse/templates/service.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ spec: 
    app: {{ template "meep-acme-in-cse.name" . }}

    release: {{ .Release.Name }}

  ports:

    - name: tinyiot

    - name: meep-acme-in-cse

      port: {{ .Values.service.port }}

      targetPort: {{ .Values.deployment.port }}

      {{- if .Values.service.nodePort }}

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

+12 −2
Changes for charts/meep-acme-in-cse/values-template.yaml: 12 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -23,9 +23,19 @@ image: 
    NR_MEAS_REP_UE_PERIODIC_TRIGGER_INTERVAL: 1s

    MEEP_INSTANCE_ID: {{.InstanceId}}

    MEEP_SANDBOX_NAME: {{.SandboxName}}

    MEEP_SVC_PATH: /in-csse

    MEEP_SVC_PATH: /in-cse

    MEEP_HOST_URL: {{.HostUrl}}

    MEEP_TOPIC: {{.SandboxName}}/meep-acme-in-cse

    SERVER_TYPE: IN

    SERVER_PORT: 3003

    CSE_BASE_NAME: laboai-cse-in

    CSE_BASE_RI: laboai-id-in

    MQTT_HOST: meep-mosquitto

    MQTT_PORT: 1883

    MQTT_USERNAME: test

    MQTT_PASSWORD: mqttq

    MEEP_TOPIC: {{.SandboxName}}/acme-in-cse

    ENABLE_COAP: false

    ENABLE_WSP: false

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

    {{- end }}

charts/meep-acme-mn-cse/templates/service.yaml

+1 −1
Changes for charts/meep-acme-mn-cse/templates/service.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ spec: 
    app: {{ template "meep-acme-mn-cse.name" . }}

    release: {{ .Release.Name }}

  ports:

    - name: tinyiot

    - name: meep-acme-mn-cse

      port: {{ .Values.service.port }}

      targetPort: {{ .Values.deployment.port }}

      {{- if .Values.service.nodePort }}

charts/meep-acme-mn-cse/values-template.yaml

+17 −3
Changes for charts/meep-acme-mn-cse/values-template.yaml: 17 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


deployment:

  replicas: 1

  port: 3004

  port: 3005

  protocol: TCP

  dependencies:

    system:
@@ -25,7 +25,21 @@ image: 
    MEEP_SANDBOX_NAME: {{.SandboxName}}

    MEEP_SVC_PATH: /meep-acme-mn-cse

    MEEP_HOST_URL: {{.HostUrl}}

    MEEP_TOPIC: {{.SandboxName}}/meep-acme-mn-cse

    SERVER_PORT: 3005

    CSE_BASE_NAME: mep-cse-mn

    CSE_BASE_RI: acme-mep-id-mn-cse

    SERVER_TYPE: MN

    REMOTE_CSE_HOST: meep-acme-in-cse

    REMOTE_CSE_PORT: 3003

    REMOTE_CSE_ID: laboai-id-in

    REMOTE_CSE_NAME: laboai-cse-in

    MQTT_HOST: meep-mosquitto

    MQTT_PORT: 1883

    MQTT_USERNAME: test

    MQTT_PASSWORD: mqttq

    MEEP_TOPIC: {{.SandboxName}}/acme-mn-cse

    ENABLE_COAP: false

    ENABLE_WS: false

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

    {{- end }}
@@ -41,7 +55,7 @@ image: 
service:

  name: meep-acme-mn-cse

  type: NodePort

  port: 3004

  port: 3005

  NodePort: ""



ingress:

charts/meep-cloud-mosquitto/values-template.yaml

+2 −11
Changes for charts/meep-cloud-mosquitto/values-template.yaml: 2 added lines, 11 removed lines.
Original line number Diff line number Diff line 
# Default values for meep-iot-plt-tinyiot

# Default values for meep-cloud-mosquitto

# This is a YAML-formatted file.

# Declare variables to be passed into your templates.
@@ -24,9 +24,6 @@ image: 
    MEEP_INSTANCE_ID: {{.InstanceId}}

    MEEP_SANDBOX_NAME: {{.SandboxName}}

    MEEP_HOST_URL: {{.HostUrl}}

    # MEEP_BROKER: meep-cloud-mosquitto

    # MEEP_BROKER_PORT: 1883

    # MEEP_TOPIC: {{.SandboxName}}/tinyiot

    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

    {{- end }}
@@ -40,12 +37,6 @@ image: 
    {{- end}}



service:

  # {{- if .IsMepService }}

  # name: {{.MepName}}-meep-iot-plt-tinyiot

  # {{- else if .IsFederationService }}

  # {{- else }}

  # name: meep-iot-plt-tinyiot

  # {{- end }}

  name: meep-cloud-mosquitto

  # type: ClusterIP

  # port: 80
@@ -74,7 +65,7 @@ ingress: 
      rewrite ^/{{.SandboxName}}/meep-cloud-mosquitto(/|$)(.*)$ /meep-cloud-mosquitto/$2 break;

    {{- end }}

    {{- if .AuthEnabled }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-iot-plt-tinyiot&sbox={{.SandboxName}}&mep={{.MepName}}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-cloud-mosquitto&sbox={{.SandboxName}}&mep={{.MepName}}

    {{- end }}

  labels: {}

  tls: