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
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
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
25 - name: {{ template "kibana.fullname" . }}-test
27 - app: {{ template "kibana.fullname" . }}
28 - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
29 - heritage: "{{ .Release.Service }}"
30 - release: "{{ .Release.Name }}"
33 - @test "Test Status" {
34 - {{- if .Values.service.selector }}
35 - skip "Can't guarentee pod names with selector"
37 - {{- $port := .Values.service.externalPort }}
38 - url="http://{{ template "kibana.fullname" . }}{{ if $port }}:{{ $port }}{{ end }}/api{{ .Values.livenessProbe.path }}"
40 - # retry for 1 minute
41 - run curl -s -o /dev/null -I -w "%{http_code}" --retry 30 --retry-delay 2 $url
43 - code=$(curl -s -o /dev/null -I -w "%{http_code}" $url)
45 - if [ "$code" == "503" ]
47 - skip "Kibana Unavailable (503), can't get status - see pod logs: $body"
50 - result=$(echo $body | jq -cr '.status.statuses[]')
53 - result=$(echo $body | jq -cr '.status.statuses[] | select(.state != "green")')
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
66 - name: {{ template "kibana.fullname" . }}-test
68 - app: {{ template "kibana.fullname" . }}
69 - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
70 - heritage: "{{ .Release.Service }}"
71 - release: "{{ .Release.Name }}"
73 - "helm.sh/hook": test-success
76 - - name: test-framework
77 - image: "{{ .Values.testFramework.image}}:{{ .Values.testFramework.tag }}"
83 - # copy bats to tools dir
84 - cp -R /usr/local/libexec/ /tools/bats/
89 - - name: {{ .Release.Name }}-test
90 - image: "dwdraju/alpine-curl-jq"
91 - command: ["/tools/bats/bats", "-t", "/tests/run.sh"]
101 - name: {{ template "kibana.fullname" . }}-test
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:
111 pullPolicy: "IfNotPresent"
114 - image: "dduportal/bats"
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:
126 {{ toYaml .Values.volumeMounts | indent 12 }}
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.
138 - exec /logstash_exporter
139 - --logstash.endpoint=http://localhost:{{ .Values.exporter.logstash.target.port }}
140 - --web.listen-address=:{{ .Values.exporter.logstash.port }}
142 - - name: ls-exporter
143 - containerPort: {{ .Values.exporter.logstash.port }}
146 -{{ toYaml .Values.exporter.logstash.livenessProbe | indent 12 }}
148 -{{ toYaml .Values.exporter.logstash.readinessProbe | indent 12 }}
149 - {{- with .Values.exporter.logstash.config }}
151 - {{- range $key, $value := . }}
152 - - name: {{ $key | upper | replace "." "_" }}
153 - value: {{ $value | quote }}
157 -{{ toYaml .Values.exporter.logstash.resources | indent 12 }}
160 {{- with .Values.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: []
173 - repository: bonniernews/logstash_exporter
175 - pullPolicy: IfNotPresent