Commit dfdbde18 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'staging' into OCF53-add-environment-variable-to-control-log-level

parents 4b303f23 953e49d8

helm/capif/charts/mock-server/templates/deployment.yaml

+3 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,9 @@ spec: 
            - name: http

            - name: http

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

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

              protocol: TCP

              protocol: TCP

          env:

          - name: LOG_LEVEL

            value: {{ quote .Values.env.logLevel }}

          livenessProbe:

          livenessProbe:

            {{- toYaml .Values.livenessProbe | nindent 12 }}

            {{- toYaml .Values.livenessProbe | nindent 12 }}

          readinessProbe:

          readinessProbe:

helm/capif/charts/mock-server/values.yaml

+3 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,9 @@ imagePullSecrets: [] 
nameOverride: ""

nameOverride: ""

fullnameOverride: ""

fullnameOverride: ""





env:

 logLevel: "INFO"

 

serviceAccount:

serviceAccount:

  # Specifies whether a service account should be created

  # Specifies whether a service account should be created

  create: true

  create: true

helm/capif/charts/nginx/templates/deployment.yaml

+2 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,8 @@ spec: 
            value: {{ quote .Values.env.vaultPort }}

            value: {{ quote .Values.env.vaultPort }}

          - name: VAULT_ACCESS_TOKEN

          - name: VAULT_ACCESS_TOKEN

            value: {{ quote .Values.env.vaultAccessToken }}

            value: {{ quote .Values.env.vaultAccessToken }}

          - name: LOG_LEVEL

            value: {{ quote .Values.env.logLevel }}

          livenessProbe:

          livenessProbe:

            {{- toYaml .Values.livenessProbe | nindent 12 }}

            {{- toYaml .Values.livenessProbe | nindent 12 }}

          readinessProbe:

          readinessProbe:

helm/capif/charts/nginx/values.yaml

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ env: 
  vaultHostname: vault-internal.mon.svc.cluster.local

  vaultHostname: vault-internal.mon.svc.cluster.local

  vaultPort: 8200

  vaultPort: 8200

  vaultAccessToken: dev-only-token

  vaultAccessToken: dev-only-token

  logLevel: "info"





serviceAccount:

serviceAccount:

  # Specifies whether a service account should be created

  # Specifies whether a service account should be created

helm/capif/charts/ocf-access-control-policy/templates/deployment.yaml

+2 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,8 @@ spec: 
            value: {{ quote .Values.env.capifHostname }}

            value: {{ quote .Values.env.capifHostname }}

          - name: MONITORING

          - name: MONITORING

            value: {{ quote .Values.env.monitoring }}

            value: {{ quote .Values.env.monitoring }}

          - name: LOG_LEVEL

            value: {{ quote .Values.env.logLevel }}

          livenessProbe:

          livenessProbe:

            {{- toYaml .Values.livenessProbe | nindent 12 }}

            {{- toYaml .Values.livenessProbe | nindent 12 }}

          readinessProbe:

          readinessProbe: