Commit 2e60f82c authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'minor_fix_local_scripts' into 'staging' 

Improving Scripts, local, remote and deployment ones

See merge request !62
parents 56d2769f 8ddc1ce7

helm/capif/charts/fluentbit/values.yaml

+7 −7
Original line number Original line Diff line number Diff line
@@ -64,17 +64,17 @@ ingress: 
  #    hosts:

  #    hosts:

  #      - chart-example.local

  #      - chart-example.local





resources: {}

resources:

  # We usually recommend not to specify default resources and to leave this as a conscious

  # We usually recommend not to specify default resources and to leave this as a conscious

  # choice for the user. This also increases chances charts run on environments with little

  # choice for the user. This also increases chances charts run on environments with little

  # resources, such as Minikube. If you do want to specify resources, uncomment the following

  # resources, such as Minikube. If you do want to specify resources, uncomment the following

  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.

  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.

  # limits:

  limits:

  #   cpu: 100m

    cpu: 200m

  #   memory: 128Mi

    memory: 256Mi

  # requests:

  requests:

  #   cpu: 100m

    cpu: 1m

  #   memory: 128Mi

    memory: 1Mi





livenessProbe:

livenessProbe:

  tcpSocket:

  tcpSocket:

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

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

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

            - name: GF_PATHS_PROVISIONING

            - name: GF_PATHS_PROVISIONING

              value: /etc/grafana/provisioning

              value: /etc/grafana/provisioning

          securityContext:

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

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

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

          imagePullPolicy: {{ .Values.image.pullPolicy }}

          imagePullPolicy: {{ .Values.image.pullPolicy }}

          name: {{ .Chart.Name }}

          name: {{ .Chart.Name }}

helm/capif/charts/grafana/templates/pvc.yaml

+1 −2
Original line number Original line Diff line number Diff line
@@ -8,8 +8,7 @@ metadata: 
  name: grafana-claim0

  name: grafana-claim0

spec:

spec:

  storageClassName: {{ .Values.persistence.storageClass }}

  storageClassName: {{ .Values.persistence.storageClass }}

  accessModes:

  accessModes: {{ .Values.persistence.accessModes }}

    - ReadWriteMany

  resources:

  resources:

    requests:

    requests:

      storage: {{ .Values.persistence.storage }}

      storage: {{ .Values.persistence.storage }}

helm/capif/charts/grafana/values.yaml

+9 −7
Original line number Original line Diff line number Diff line
@@ -52,6 +52,8 @@ persistence: 
  enable: true

  enable: true

  storage: 10Gi

  storage: 10Gi

  storageClass: nfs-01

  storageClass: nfs-01

  accessModes:

  - ReadWriteMany





service:

service:

  type: ClusterIP

  type: ClusterIP
@@ -73,17 +75,17 @@ ingress: 
  #    hosts:

  #    hosts:

  #      - chart-example.local

  #      - chart-example.local





resources: {}

resources:

  # We usually recommend not to specify default resources and to leave this as a conscious

  # We usually recommend not to specify default resources and to leave this as a conscious

  # choice for the user. This also increases chances charts run on environments with little

  # choice for the user. This also increases chances charts run on environments with little

  # resources, such as Minikube. If you do want to specify resources, uncomment the following

  # resources, such as Minikube. If you do want to specify resources, uncomment the following

  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.

  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.

  # limits:

  limits:

  #   cpu: 100m

    cpu: 200m

  #   memory: 128Mi

    memory: 256Mi

  # requests:

  requests:

  #   cpu: 100m

    cpu: 1m

  #   memory: 128Mi

    memory: 1Mi





autoscaling:

autoscaling:

  enabled: false

  enabled: false

helm/capif/charts/loki/templates/pvc.yaml

+1 −2
Original line number Original line Diff line number Diff line
@@ -7,8 +7,7 @@ metadata: 
  name: loki-claim0

  name: loki-claim0

spec:

spec:

  storageClassName: {{ .Values.persistence.storageClass }}

  storageClassName: {{ .Values.persistence.storageClass }}

  accessModes:

  accessModes: {{ .Values.persistence.accessModes }}

    - ReadWriteMany

  resources:

  resources:

    requests:

    requests:

      storage: {{ .Values.persistence.storage }}

      storage: {{ .Values.persistence.storage }}