Commit ac3b775d authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

prometheus pvc deleter fix to prevent hanging uninstall + prometheus chart fix... 

prometheus pvc deleter fix to prevent hanging uninstall + prometheus chart fix to alert manager installation
parent c9eaa8fe

charts/kube-prometheus-stack/templates/prometheus/pvc-deleter.yaml

+5 −5
Original line number Diff line number Diff line
@@ -51,16 +51,16 @@ spec: 
      containers:

      - name: post-delete-job

        image: "bitnami/kubectl"

        command: ["kubectl"]

        command: ["/bin/sh", "-c"]

        args:

        - "delete"

        - "pvc"

        - kubectl delete pvc

        {{- if and $prometheus $promStorageSpec }}

        - "{{ $promStorageSpec.volumeClaimTemplate.metadata.name }}-prometheus-{{ template "kube-prometheus-stack.fullname" . }}-server-0"

          {{ $promStorageSpec.volumeClaimTemplate.metadata.name }}-prometheus-{{ template "kube-prometheus-stack.fullname" . }}-server-0

        {{- end }}

        {{- if and $alertmanager $alertStorageSpec }}

        - "{{ $alertStorageSpec.volumeClaimTemplate.metadata.name }}-alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-alertmanager-0"

          {{ $alertStorageSpec.volumeClaimTemplate.metadata.name }}-alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-alertmanager-0

        {{- end }}

          ; echo done;

      serviceAccountName: pvc-deleter-sa

      securityContext:

        runAsUser: 0

charts/kube-prometheus-stack/values.yaml

+17 −17
Original line number Diff line number Diff line
@@ -143,23 +143,23 @@ alertmanager: 
  ## ref: https://prometheus.io/docs/alerting/configuration/#configuration-file

  ##      https://prometheus.io/webtools/alerting/routing-tree-editor/

  ##

  config:

    global:

      resolve_timeout: 5m

    route:

      group_by: ['job']

      group_wait: 30s

      group_interval: 5m

      repeat_interval: 12h

      receiver: 'null'

      routes:

      - match:

          alertname: Watchdog

        receiver: 'null'

    receivers:

    - name: 'null'

    templates:

    - '/etc/alertmanager/config/*.tmpl'

  # config:

  #   global:

  #     resolve_timeout: 5m

  #   route:

  #     group_by: ['job']

  #     group_wait: 30s

  #     group_interval: 5m

  #     repeat_interval: 12h

  #     receiver: 'null'

  #     routes:

  #     - match:

  #         alertname: Watchdog

  #       receiver: 'null'

  #   receivers:

  #   - name: 'null'

  #   templates:

  #   - '/etc/alertmanager/config/*.tmpl'



  ## Pass the Alertmanager configuration directives through Helm's templating

  ## engine. If the Alertmanager configuration contains Alertmanager templates,