1 From f82b9b85ac03f59fd1ce9b7eb0a9ed2afac47995 Mon Sep 17 00:00:00 2001
2 From: John Kung <john.kung@windriver.com>
3 Date: Sun, 6 Oct 2019 12:50:45 -0400
4 Subject: [PATCH 1/1] 0008-Update-stx-monitor-for-kubernetes-API-1.16
7 stable/elasticsearch/templates/client-deployment.yaml | 6 +++++-
8 stable/elasticsearch/templates/client-ingress.yaml | 2 +-
9 stable/elasticsearch/templates/data-statefulset.yaml | 7 ++++++-
10 stable/elasticsearch/templates/master-statefulset.yaml | 7 ++++++-
11 stable/elasticsearch/templates/podsecuritypolicy.yaml | 2 +-
12 stable/filebeat/templates/daemonset.yaml | 2 +-
13 stable/filebeat/templates/podsecuritypolicy.yaml | 2 +-
14 stable/kibana/templates/deployment.yaml | 6 +++++-
15 stable/kibana/templates/ingress.yaml | 2 +-
16 stable/kube-state-metrics/templates/deployment.yaml | 5 ++++-
17 stable/kube-state-metrics/templates/podsecuritypolicy.yaml | 2 +-
18 stable/logstash/templates/ingress.yaml | 2 +-
19 stable/logstash/templates/statefulset.yaml | 2 +-
20 stable/metricbeat/templates/podsecuritypolicy.yaml | 2 +-
21 stable/nginx-ingress/templates/controller-daemonset.yaml | 6 +++++-
22 stable/nginx-ingress/templates/controller-deployment.yaml | 6 +++++-
23 stable/nginx-ingress/templates/default-backend-deployment.yaml | 6 +++++-
24 stable/nginx-ingress/templates/podsecuritypolicy.yaml | 2 +-
25 18 files changed, 51 insertions(+), 18 deletions(-)
27 diff --git a/stable/elasticsearch/templates/client-deployment.yaml b/stable/elasticsearch/templates/client-deployment.yaml
28 index 5625ee0..8bd1b15 100644
29 --- a/stable/elasticsearch/templates/client-deployment.yaml
30 +++ b/stable/elasticsearch/templates/client-deployment.yaml
32 -apiVersion: apps/v1beta1
37 @@ -9,6 +9,10 @@ metadata:
38 release: {{ .Release.Name }}
39 name: {{ template "elasticsearch.client.fullname" . }}
43 + app: {{ template "elasticsearch.name" . }}
44 + release: {{ .Release.Name }}
45 replicas: {{ .Values.client.replicas }}
48 diff --git a/stable/elasticsearch/templates/client-ingress.yaml b/stable/elasticsearch/templates/client-ingress.yaml
49 index 9070cdd..8eb4b9a 100644
50 --- a/stable/elasticsearch/templates/client-ingress.yaml
51 +++ b/stable/elasticsearch/templates/client-ingress.yaml
53 {{- if .Values.client.ingress.enabled -}}
54 {{- $fullName := include "elasticsearch.client.fullname" . -}}
55 {{- $ingressPath := .Values.client.ingress.path -}}
56 -apiVersion: extensions/v1beta1
57 +apiVersion: networking.k8s.io/v1beta1
61 diff --git a/stable/elasticsearch/templates/data-statefulset.yaml b/stable/elasticsearch/templates/data-statefulset.yaml
62 index 69b54cd..ccf7ad2 100644
63 --- a/stable/elasticsearch/templates/data-statefulset.yaml
64 +++ b/stable/elasticsearch/templates/data-statefulset.yaml
66 -apiVersion: apps/v1beta1
71 @@ -11,6 +11,11 @@ metadata:
73 serviceName: {{ template "elasticsearch.data.fullname" . }}
74 replicas: {{ .Values.data.replicas }}
77 + app: {{ template "elasticsearch.name" . }}
78 + component: "{{ .Values.data.name }}"
79 + release: {{ .Release.Name }}
83 diff --git a/stable/elasticsearch/templates/master-statefulset.yaml b/stable/elasticsearch/templates/master-statefulset.yaml
84 index 7c48fe3..aa7014d 100644
85 --- a/stable/elasticsearch/templates/master-statefulset.yaml
86 +++ b/stable/elasticsearch/templates/master-statefulset.yaml
88 -apiVersion: apps/v1beta1
93 @@ -11,6 +11,11 @@ metadata:
95 serviceName: {{ template "elasticsearch.master.fullname" . }}
96 replicas: {{ .Values.master.replicas }}
99 + app: {{ template "elasticsearch.name" . }}
100 + component: "{{ .Values.master.name }}"
101 + release: {{ .Release.Name }}
105 diff --git a/stable/elasticsearch/templates/podsecuritypolicy.yaml b/stable/elasticsearch/templates/podsecuritypolicy.yaml
106 index ee38e35..fd5f663 100644
107 --- a/stable/elasticsearch/templates/podsecuritypolicy.yaml
108 +++ b/stable/elasticsearch/templates/podsecuritypolicy.yaml
110 {{- if .Values.podSecurityPolicy.enabled }}
111 -apiVersion: extensions/v1beta1
112 +apiVersion: policy/v1beta1
113 kind: PodSecurityPolicy
115 name: {{ template "elasticsearch.fullname" . }}
116 diff --git a/stable/filebeat/templates/daemonset.yaml b/stable/filebeat/templates/daemonset.yaml
117 index b1833a9..22b46df 100644
118 --- a/stable/filebeat/templates/daemonset.yaml
119 +++ b/stable/filebeat/templates/daemonset.yaml
121 -apiVersion: apps/v1beta2
125 name: {{ template "filebeat.fullname" . }}
126 diff --git a/stable/filebeat/templates/podsecuritypolicy.yaml b/stable/filebeat/templates/podsecuritypolicy.yaml
127 index 3a11b38..25a0f06 100644
128 --- a/stable/filebeat/templates/podsecuritypolicy.yaml
129 +++ b/stable/filebeat/templates/podsecuritypolicy.yaml
131 {{- if .Values.rbac.create -}}
132 {{- if .Values.podSecurityPolicy.enabled }}
133 -apiVersion: extensions/v1beta1
134 +apiVersion: policy/v1beta1
135 kind: PodSecurityPolicy
137 name: {{ template "filebeat.fullname" . }}
138 diff --git a/stable/kibana/templates/deployment.yaml b/stable/kibana/templates/deployment.yaml
139 index 33fc6f0..c5229ae 100644
140 --- a/stable/kibana/templates/deployment.yaml
141 +++ b/stable/kibana/templates/deployment.yaml
143 -apiVersion: apps/v1beta1
148 @@ -13,6 +13,10 @@ metadata:
151 replicas: {{ .Values.replicaCount }}
154 + app: {{ template "kibana.name" . }}
155 + release: {{ .Release.Name }}
156 revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
159 diff --git a/stable/kibana/templates/ingress.yaml b/stable/kibana/templates/ingress.yaml
160 index de14ae9..9d97e26 100644
161 --- a/stable/kibana/templates/ingress.yaml
162 +++ b/stable/kibana/templates/ingress.yaml
164 {{- if .Values.ingress.enabled -}}
165 {{- $serviceName := include "kibana.fullname" . -}}
166 {{- $servicePort := .Values.service.externalPort -}}
167 -apiVersion: extensions/v1beta1
168 +apiVersion: networking.k8s.io/v1beta1
172 diff --git a/stable/kube-state-metrics/templates/deployment.yaml b/stable/kube-state-metrics/templates/deployment.yaml
173 index b251758..ce02f8e 100644
174 --- a/stable/kube-state-metrics/templates/deployment.yaml
175 +++ b/stable/kube-state-metrics/templates/deployment.yaml
177 -apiVersion: extensions/v1beta1
181 name: {{ template "kube-state-metrics.fullname" . }}
182 @@ -8,6 +8,9 @@ metadata:
183 release: "{{ .Release.Name }}"
184 heritage: "{{ .Release.Service }}"
188 + app: {{ template "kube-state-metrics.name" . }}
189 replicas: {{ .Values.replicas }}
192 diff --git a/stable/kube-state-metrics/templates/podsecuritypolicy.yaml b/stable/kube-state-metrics/templates/podsecuritypolicy.yaml
193 index d195a5f..4ca46ac 100644
194 --- a/stable/kube-state-metrics/templates/podsecuritypolicy.yaml
195 +++ b/stable/kube-state-metrics/templates/podsecuritypolicy.yaml
197 {{- if .Values.podSecurityPolicy.enabled }}
198 -apiVersion: extensions/v1beta1
199 +apiVersion: policy/v1beta1
200 kind: PodSecurityPolicy
202 name: {{ template "kube-state-metrics.fullname" . }}
203 diff --git a/stable/logstash/templates/ingress.yaml b/stable/logstash/templates/ingress.yaml
204 index 0e26f89..d107a32 100644
205 --- a/stable/logstash/templates/ingress.yaml
206 +++ b/stable/logstash/templates/ingress.yaml
208 {{- if .Values.ingress.enabled -}}
209 {{- $fullName := include "logstash.fullname" . -}}
210 {{- $ingressPath := .Values.ingress.path -}}
211 -apiVersion: extensions/v1beta1
212 +apiVersion: networking.k8s.io/v1beta1
215 name: {{ $fullName }}
216 diff --git a/stable/logstash/templates/statefulset.yaml b/stable/logstash/templates/statefulset.yaml
217 index 070ef56..1a1a3ef 100644
218 --- a/stable/logstash/templates/statefulset.yaml
219 +++ b/stable/logstash/templates/statefulset.yaml
221 -apiVersion: apps/v1beta2
225 name: {{ template "logstash.fullname" . }}
226 diff --git a/stable/metricbeat/templates/podsecuritypolicy.yaml b/stable/metricbeat/templates/podsecuritypolicy.yaml
227 index 29fb2a9..90231e2 100644
228 --- a/stable/metricbeat/templates/podsecuritypolicy.yaml
229 +++ b/stable/metricbeat/templates/podsecuritypolicy.yaml
231 {{- if .Values.rbac.pspEnabled }}
232 -apiVersion: extensions/v1beta1
233 +apiVersion: policy/v1beta1
234 kind: PodSecurityPolicy
236 name: {{ template "metricbeat.fullname" . }}
237 diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml
238 index a05062e..c6e8271 100644
239 --- a/stable/nginx-ingress/templates/controller-daemonset.yaml
240 +++ b/stable/nginx-ingress/templates/controller-daemonset.yaml
242 {{- if eq .Values.controller.kind "DaemonSet" }}
243 -apiVersion: extensions/v1beta1
248 @@ -10,6 +10,10 @@ metadata:
249 release: {{ .Release.Name }}
250 name: {{ template "nginx-ingress.controller.fullname" . }}
254 + app: {{ template "nginx-ingress.name" . }}
255 + release: {{ .Release.Name }}
256 revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
258 {{ toYaml .Values.controller.updateStrategy | indent 4 }}
259 diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml
260 index 7d78507..f653c8a 100644
261 --- a/stable/nginx-ingress/templates/controller-deployment.yaml
262 +++ b/stable/nginx-ingress/templates/controller-deployment.yaml
264 {{- if eq .Values.controller.kind "Deployment" }}
265 -apiVersion: extensions/v1beta1
270 @@ -10,6 +10,10 @@ metadata:
271 release: {{ .Release.Name }}
272 name: {{ template "nginx-ingress.controller.fullname" . }}
276 + app: {{ template "nginx-ingress.name" . }}
277 + release: {{ .Release.Name }}
278 replicas: {{ .Values.controller.replicaCount }}
279 revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
281 diff --git a/stable/nginx-ingress/templates/default-backend-deployment.yaml b/stable/nginx-ingress/templates/default-backend-deployment.yaml
282 index 93ea613..399b798 100644
283 --- a/stable/nginx-ingress/templates/default-backend-deployment.yaml
284 +++ b/stable/nginx-ingress/templates/default-backend-deployment.yaml
286 {{- if .Values.defaultBackend.enabled }}
287 -apiVersion: extensions/v1beta1
292 @@ -10,6 +10,10 @@ metadata:
293 release: {{ .Release.Name }}
294 name: {{ template "nginx-ingress.defaultBackend.fullname" . }}
298 + app: {{ template "nginx-ingress.name" . }}
299 + release: {{ .Release.Name }}
300 replicas: {{ .Values.defaultBackend.replicaCount }}
301 revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
303 diff --git a/stable/nginx-ingress/templates/podsecuritypolicy.yaml b/stable/nginx-ingress/templates/podsecuritypolicy.yaml
304 index 9222daf..b99aee8 100644
305 --- a/stable/nginx-ingress/templates/podsecuritypolicy.yaml
306 +++ b/stable/nginx-ingress/templates/podsecuritypolicy.yaml
308 {{- if .Values.podSecurityPolicy.enabled}}
309 -apiVersion: extensions/v1beta1
310 +apiVersion: policy/v1beta1
311 kind: PodSecurityPolicy
313 name: {{ template "nginx-ingress.fullname" . }}