meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm/0013-removed-unused-images.patch

   1 From 2d54de3ae3858aa6c67ba1de25860c440f5be8a2 Mon Sep 17 00:00:00 2001
   2 From: Kevin Smith <kevin.smith@windriver.com>
   3 Date: Thu, 12 Dec 2019 09:40:13 -0500
   4 Subject: [PATCH 1/1] removed unused images
   5
   6 ---
   7  stable/kibana/templates/tests/test-configmap.yaml | 35 -------------------
   8  stable/kibana/templates/tests/test.yaml           | 42 -----------------------
   9  stable/kibana/values.yaml                         |  4 ---
  10  stable/logstash/templates/statefulset.yaml        | 32 -----------------
  11  stable/logstash/values.yaml                       |  5 ---
  12  5 files changed, 118 deletions(-)
  13  delete mode 100644 stable/kibana/templates/tests/test-configmap.yaml
  14  delete mode 100644 stable/kibana/templates/tests/test.yaml
  15
  16 diff --git a/stable/kibana/templates/tests/test-configmap.yaml b/stable/kibana/templates/tests/test-configmap.yaml
  17 deleted file mode 100644
  18 index 912755e..0000000
  19 --- a/stable/kibana/templates/tests/test-configmap.yaml
  20 +++ /dev/null
  21 @@ -1,35 +0,0 @@
  22 -apiVersion: v1
  23 -kind: ConfigMap
  24 -metadata:
  25 -  name: {{ template "kibana.fullname" . }}-test
  26 -  labels:
  27 -    app: {{ template "kibana.fullname" . }}
  28 -    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
  29 -    heritage: "{{ .Release.Service }}"
  30 -    release: "{{ .Release.Name }}"
  31 -data:
  32 -  run.sh: |-
  33 -    @test "Test Status" {
  34 -      {{- if .Values.service.selector }}
  35 -      skip "Can't guarentee pod names with selector"
  36 -      {{- else }}
  37 -      {{- $port := .Values.service.externalPort }}
  38 -      url="http://{{ template "kibana.fullname" . }}{{ if $port }}:{{ $port }}{{ end }}/api{{ .Values.livenessProbe.path }}"
  39 -
  40 -      # retry for 1 minute
  41 -      run curl -s -o /dev/null -I -w "%{http_code}" --retry 30 --retry-delay 2 $url
  42 -
  43 -      code=$(curl -s -o /dev/null -I -w "%{http_code}" $url)
  44 -      body=$(curl $url)
  45 -      if [ "$code" == "503" ]
  46 -      then
  47 -        skip "Kibana Unavailable (503), can't get status - see pod logs: $body"
  48 -      fi
  49 -
  50 -      result=$(echo $body | jq -cr '.status.statuses[]')
  51 -      [ "$result" != "" ]
  52 -
  53 -      result=$(echo $body | jq -cr '.status.statuses[] | select(.state != "green")')
  54 -      [ "$result" == "" ]
  55 -      {{- end }}
  56 -    }
  57 diff --git a/stable/kibana/templates/tests/test.yaml b/stable/kibana/templates/tests/test.yaml
  58 deleted file mode 100644
  59 index 8a518fd..0000000
  60 --- a/stable/kibana/templates/tests/test.yaml
  61 +++ /dev/null
  62 @@ -1,42 +0,0 @@
  63 -apiVersion: v1
  64 -kind: Pod
  65 -metadata:
  66 -  name: {{ template "kibana.fullname" . }}-test
  67 -  labels:
  68 -    app: {{ template "kibana.fullname" . }}
  69 -    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
  70 -    heritage: "{{ .Release.Service }}"
  71 -    release: "{{ .Release.Name }}"
  72 -  annotations:
  73 -    "helm.sh/hook": test-success
  74 -spec:
  75 -  initContainers:
  76 -    - name: test-framework
  77 -      image: "{{ .Values.testFramework.image}}:{{ .Values.testFramework.tag }}"
  78 -      command:
  79 -      - "bash"
  80 -      - "-c"
  81 -      - |
  82 -        set -ex
  83 -        # copy bats to tools dir
  84 -        cp -R /usr/local/libexec/ /tools/bats/
  85 -      volumeMounts:
  86 -      - mountPath: /tools
  87 -        name: tools
  88 -  containers:
  89 -    - name: {{ .Release.Name }}-test
  90 -      image: "dwdraju/alpine-curl-jq"
  91 -      command: ["/tools/bats/bats", "-t", "/tests/run.sh"]
  92 -      volumeMounts:
  93 -        - mountPath: /tests
  94 -          name: tests
  95 -          readOnly: true
  96 -        - mountPath: /tools
  97 -          name: tools
  98 -  volumes:
  99 -  - name: tests
 100 -    configMap:
 101 -      name: {{ template "kibana.fullname" . }}-test
 102 -  - name: tools
 103 -    emptyDir: {}
 104 -  restartPolicy: Never
 105 diff --git a/stable/kibana/values.yaml b/stable/kibana/values.yaml
 106 index 4ce4b2a..7bc9cf5 100644
 107 --- a/stable/kibana/values.yaml
 108 +++ b/stable/kibana/values.yaml
 109 @@ -3,10 +3,6 @@ image:
 110    tag: "7.2.0"
 111    pullPolicy: "IfNotPresent"
 112
 113 -testFramework:
 114 -  image: "dduportal/bats"
 115 -  tag: "0.4.0"
 116 -
 117  commandline:
 118    args: []
 119
 120 diff --git a/stable/logstash/templates/statefulset.yaml b/stable/logstash/templates/statefulset.yaml
 121 index 1a1a3ef..4749bb1 100644
 122 --- a/stable/logstash/templates/statefulset.yaml
 123 +++ b/stable/logstash/templates/statefulset.yaml
 124 @@ -91,38 +91,6 @@ spec:
 125            volumeMounts:
 126  {{ toYaml .Values.volumeMounts | indent 12 }}
 127
 128 -{{- if .Values.exporter.logstash.enabled }}
 129 -        ## logstash-exporter
 130 -        - name: {{ .Chart.Name }}-exporter
 131 -          image: "{{ .Values.exporter.logstash.image.repository }}:{{ .Values.exporter.logstash.image.tag }}"
 132 -          imagePullPolicy: {{ .Values.exporter.logstash.image.pullPolicy }}
 133 -          command: ["/bin/sh", "-c"]
 134 -          ## Delay start of logstash-exporter to give logstash more time to come online.
 135 -          args:
 136 -            - >-
 137 -              sleep 60;
 138 -              exec /logstash_exporter
 139 -                --logstash.endpoint=http://localhost:{{ .Values.exporter.logstash.target.port }}
 140 -                --web.listen-address=:{{ .Values.exporter.logstash.port }}
 141 -          ports:
 142 -            - name: ls-exporter
 143 -              containerPort: {{ .Values.exporter.logstash.port }}
 144 -              protocol: TCP
 145 -          livenessProbe:
 146 -{{ toYaml .Values.exporter.logstash.livenessProbe | indent 12 }}
 147 -          readinessProbe:
 148 -{{ toYaml .Values.exporter.logstash.readinessProbe | indent 12 }}
 149 -          {{- with .Values.exporter.logstash.config }}
 150 -          env:
 151 -            {{- range $key, $value := . }}
 152 -            - name: {{ $key | upper | replace "." "_" }}
 153 -              value: {{ $value | quote }}
 154 -            {{- end }}
 155 -          {{- end }}
 156 -          resources:
 157 -{{ toYaml .Values.exporter.logstash.resources | indent 12 }}
 158 -{{- end }}
 159 -
 160      {{- with .Values.nodeSelector }}
 161        nodeSelector:
 162  {{ toYaml . | indent 8 }}
 163 diff --git a/stable/logstash/values.yaml b/stable/logstash/values.yaml
 164 index 9ba80c9..b8b8de2 100644
 165 --- a/stable/logstash/values.yaml
 166 +++ b/stable/logstash/values.yaml
 167 @@ -169,11 +169,6 @@ volumes: []
 168
 169  exporter:
 170    logstash:
 171 -    enabled: false
 172 -    image:
 173 -      repository: bonniernews/logstash_exporter
 174 -      tag: v0.1.2
 175 -      pullPolicy: IfNotPresent
 176      env: {}
 177      resources: {}
 178      path: /metrics
 179 --
 180 1.8.3.1
 181