meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm/0008-Update-stx-monitor-for-kubernetes-API-1.16.patch

   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
   5
   6 ---
   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(-)
  26
  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
  31 @@ -1,4 +1,4 @@
  32 -apiVersion: apps/v1beta1
  33 +apiVersion: apps/v1
  34  kind: Deployment
  35  metadata:
  36    labels:
  37 @@ -9,6 +9,10 @@ metadata:
  38      release: {{ .Release.Name }}
  39    name: {{ template "elasticsearch.client.fullname" . }}
  40  spec:
  41 +  selector:
  42 +    matchLabels:
  43 +      app: {{ template "elasticsearch.name" . }}
  44 +      release: {{ .Release.Name }}
  45    replicas: {{ .Values.client.replicas }}
  46    template:
  47      metadata:
  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
  52 @@ -1,7 +1,7 @@
  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
  58  kind: Ingress
  59  metadata:
  60    name: {{ $fullName }}
  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
  65 @@ -1,4 +1,4 @@
  66 -apiVersion: apps/v1beta1
  67 +apiVersion: apps/v1
  68  kind: StatefulSet
  69  metadata:
  70    labels:
  71 @@ -11,6 +11,11 @@ metadata:
  72  spec:
  73    serviceName: {{ template "elasticsearch.data.fullname" . }}
  74    replicas: {{ .Values.data.replicas }}
  75 +  selector:
  76 +    matchLabels:
  77 +      app: {{ template "elasticsearch.name" . }}
  78 +      component: "{{ .Values.data.name }}"
  79 +      release: {{ .Release.Name }}
  80    template:
  81      metadata:
  82        labels:
  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
  87 @@ -1,4 +1,4 @@
  88 -apiVersion: apps/v1beta1
  89 +apiVersion: apps/v1
  90  kind: StatefulSet
  91  metadata:
  92    labels:
  93 @@ -11,6 +11,11 @@ metadata:
  94  spec:
  95    serviceName: {{ template "elasticsearch.master.fullname" . }}
  96    replicas: {{ .Values.master.replicas }}
  97 +  selector:
  98 +    matchLabels:
  99 +      app: {{ template "elasticsearch.name" . }}
 100 +      component: "{{ .Values.master.name }}"
 101 +      release: {{ .Release.Name }}
 102    template:
 103      metadata:
 104        labels:
 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
 109 @@ -1,5 +1,5 @@
 110  {{- if .Values.podSecurityPolicy.enabled }}
 111 -apiVersion: extensions/v1beta1
 112 +apiVersion: policy/v1beta1
 113  kind: PodSecurityPolicy
 114  metadata:
 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
 120 @@ -1,4 +1,4 @@
 121 -apiVersion: apps/v1beta2
 122 +apiVersion: apps/v1
 123  kind: DaemonSet
 124  metadata:
 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
 130 @@ -1,6 +1,6 @@
 131  {{- if .Values.rbac.create -}}
 132  {{- if .Values.podSecurityPolicy.enabled }}
 133 -apiVersion: extensions/v1beta1
 134 +apiVersion: policy/v1beta1
 135  kind: PodSecurityPolicy
 136  metadata:
 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
 142 @@ -1,4 +1,4 @@
 143 -apiVersion: apps/v1beta1
 144 +apiVersion: apps/v1
 145  kind: Deployment
 146  metadata:
 147    labels:
 148 @@ -13,6 +13,10 @@ metadata:
 149  {{- end }}
 150  spec:
 151    replicas: {{ .Values.replicaCount }}
 152 +  selector:
 153 +    matchLabels:
 154 +      app: {{ template "kibana.name" . }}
 155 +      release: {{ .Release.Name }}
 156    revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
 157    template:
 158      metadata:
 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
 163 @@ -1,7 +1,7 @@
 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
 169  kind: Ingress
 170  metadata:
 171    labels:
 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
 176 @@ -1,4 +1,4 @@
 177 -apiVersion: extensions/v1beta1
 178 +apiVersion: apps/v1
 179  kind: Deployment
 180  metadata:
 181    name: {{ template "kube-state-metrics.fullname" . }}
 182 @@ -8,6 +8,9 @@ metadata:
 183      release: "{{ .Release.Name }}"
 184      heritage: "{{ .Release.Service }}"
 185  spec:
 186 +  selector:
 187 +    matchLabels:
 188 +      app: {{ template "kube-state-metrics.name" . }}
 189    replicas: {{ .Values.replicas }}
 190    template:
 191      metadata:
 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
 196 @@ -1,5 +1,5 @@
 197  {{- if .Values.podSecurityPolicy.enabled }}
 198 -apiVersion: extensions/v1beta1
 199 +apiVersion: policy/v1beta1
 200  kind: PodSecurityPolicy
 201  metadata:
 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
 207 @@ -1,7 +1,7 @@
 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
 213  kind: Ingress
 214  metadata:
 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
 220 @@ -1,4 +1,4 @@
 221 -apiVersion: apps/v1beta2
 222 +apiVersion: apps/v1
 223  kind: StatefulSet
 224  metadata:
 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
 230 @@ -1,5 +1,5 @@
 231  {{- if .Values.rbac.pspEnabled }}
 232 -apiVersion: extensions/v1beta1
 233 +apiVersion: policy/v1beta1
 234  kind: PodSecurityPolicy
 235  metadata:
 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
 241 @@ -1,5 +1,5 @@
 242  {{- if eq .Values.controller.kind "DaemonSet" }}
 243 -apiVersion: extensions/v1beta1
 244 +apiVersion: apps/v1
 245  kind: DaemonSet
 246  metadata:
 247    labels:
 248 @@ -10,6 +10,10 @@ metadata:
 249      release: {{ .Release.Name }}
 250    name: {{ template "nginx-ingress.controller.fullname" . }}
 251  spec:
 252 +  selector:
 253 +    matchLabels:
 254 +      app: {{ template "nginx-ingress.name" . }}
 255 +      release: {{ .Release.Name }}
 256    revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
 257    updateStrategy:
 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
 263 @@ -1,5 +1,5 @@
 264  {{- if eq .Values.controller.kind "Deployment" }}
 265 -apiVersion: extensions/v1beta1
 266 +apiVersion: apps/v1
 267  kind: Deployment
 268  metadata:
 269    labels:
 270 @@ -10,6 +10,10 @@ metadata:
 271      release: {{ .Release.Name }}
 272    name: {{ template "nginx-ingress.controller.fullname" . }}
 273  spec:
 274 +  selector:
 275 +    matchLabels:
 276 +      app: {{ template "nginx-ingress.name" . }}
 277 +      release: {{ .Release.Name }}
 278    replicas: {{ .Values.controller.replicaCount }}
 279    revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
 280    strategy:
 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
 285 @@ -1,5 +1,5 @@
 286  {{- if .Values.defaultBackend.enabled }}
 287 -apiVersion: extensions/v1beta1
 288 +apiVersion: apps/v1
 289  kind: Deployment
 290  metadata:
 291    labels:
 292 @@ -10,6 +10,10 @@ metadata:
 293      release: {{ .Release.Name }}
 294    name: {{ template "nginx-ingress.defaultBackend.fullname" . }}
 295  spec:
 296 +  selector:
 297 +     matchLabels:
 298 +       app: {{ template "nginx-ingress.name" . }}
 299 +       release: {{ .Release.Name }}
 300    replicas: {{ .Values.defaultBackend.replicaCount }}
 301    revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
 302    template:
 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
 307 @@ -1,5 +1,5 @@
 308  {{- if .Values.podSecurityPolicy.enabled}}
 309 -apiVersion: extensions/v1beta1
 310 +apiVersion: policy/v1beta1
 311  kind: PodSecurityPolicy
 312  metadata:
 313    name: {{ template "nginx-ingress.fullname" . }}
 314 --
 315 1.8.3.1
 316