Commit f8a2a400 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

fix for #42: 

- Include METRICO in Helm Chart
parent fe4d3ef4

kubernetes/helm/openslice/templates/metrico.yaml

0 → 100644
+46 −0
Original line number Diff line number Diff line 
{{ if .Values.metrico.enabled }}

apiVersion: apps/v1

kind: Deployment

metadata:	

  namespace: {{ .Release.Namespace }}

  labels:

    app: {{ include "openslice.fullname" . }}

    org.etsi.osl.service: metrico

    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"

    {{- include "openslice.labels" . | nindent 4 }}

  name: {{ include "openslice.fullname" . }}-metrico

spec:

  {{- if not .Values.autoscaling.enabled }}

  replicas: {{ .Values.replicaCount }}

  {{- end }}

  selector:

    matchLabels:

      app: {{ include "openslice.fullname" . }}

      org.etsi.osl.service: metrico

      {{- include "openslice.selectorLabels" . | nindent 6 }}

  template:

    metadata:

      labels:

        app: {{ include "openslice.fullname" . }}

        org.etsi.osl.service: metrico

        {{- include "openslice.selectorLabels" . | nindent 8 }}

    spec:

      containers:

        - image: "{{ .Values.image.metrico.repository }}:{{ .Values.image.metrico.tag | default .Chart.AppVersion }}"

          imagePullPolicy: {{ .Values.image.metrico.pullPolicy | default "Always" }}

          name: {{ include "openslice.fullname" . }}-metrico

          env:

            - name: SPRING_APPLICATION_JSON

              value: >-

                {

                  "spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/metricodb?createDatabaseIfNotExist=true",

                  "spring.datasource.username": "{{ .Values.oscreds.mysql.username }}",

                  "spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",

                  "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", 

                  "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", 

                  "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",

                  "logging.level.org.springframework" : "{{ .Values.metrico.spring.logLevel | default "INFO" }}",

                  "logging.level.org.etsi.osl.cridge" : "{{ .Values.metrico.logLevel | default "INFO" }}" 

                }

      restartPolicy: Always

{{- end }}

kubernetes/helm/openslice/values.yaml

+11 −0
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ image: 
    pullPolicy: Always

    # Overrides the image tag whose default is the chart appVersion.

    tag: "develop"

  metrico:

    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico

    pullPolicy: Always

    # Overrides the image tag whose default is the chart appVersion.

    tag: "develop"



bugzillaurl: example.com:443/bugzilla

bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
@@ -111,6 +116,12 @@ spring: 
mysql:

  storage: 10Gi



metrico:

  enabled: true

  logLevel: DEBUG

  spring:

    loglevel: DEBUG

  

cridge:

  enabled: true

  logLevel: INFO