Skip to content
This repository was archived by the owner on Jan 10, 2025. It is now read-only.

Commit cf300c9

Browse files
committed
update apiVersion in manifest files
1 parent 9af3861 commit cf300c9

File tree

4 files changed

+39
-10
lines changed

4 files changed

+39
-10
lines changed

GKE-On-Prem/filebeat-kubernetes.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ data:
7676
output.elasticsearch:
7777
hosts: ${ELASTICSEARCH_HOSTS}
7878
ilm.enabled: true
79-
79+
8080
---
81-
apiVersion: extensions/v1beta1
81+
apiVersion: apps/v1
8282
kind: DaemonSet
8383
metadata:
8484
name: filebeat-dynamic
@@ -87,6 +87,10 @@ metadata:
8787
k8s-app: filebeat-dynamic
8888
kubernetes.io/cluster-service: "true"
8989
spec:
90+
selector:
91+
matchLabels:
92+
k8s-app: filebeat-dynamic
93+
kubernetes.io/cluster-service: "true"
9094
template:
9195
metadata:
9296
labels:

GKE-On-Prem/guestbook.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,17 @@ spec:
174174
tier: backend
175175
role: master
176176
---
177-
apiVersion: extensions/v1beta1
177+
apiVersion: apps/v1
178178
kind: Deployment
179179
metadata:
180180
name: redis-master
181181
spec:
182182
replicas: 1
183+
selector:
184+
matchLabels:
185+
app: redis
186+
role: master
187+
tier: backend
183188
template:
184189
metadata:
185190
labels:
@@ -223,12 +228,17 @@ spec:
223228
tier: backend
224229
role: slave
225230
---
226-
apiVersion: extensions/v1beta1
231+
apiVersion: apps/v1
227232
kind: Deployment
228233
metadata:
229234
name: redis-slave
230235
spec:
231236
replicas: 1
237+
selector:
238+
matchLabels:
239+
app: redis
240+
role: slave
241+
tier: backend
232242
template:
233243
metadata:
234244
labels:
@@ -271,12 +281,16 @@ spec:
271281
tier: frontend
272282
loadBalancerIP: 10.0.10.42
273283
---
274-
apiVersion: extensions/v1beta1
284+
apiVersion: apps/v1
275285
kind: Deployment
276286
metadata:
277287
name: frontend
278288
spec:
279289
replicas: 1
290+
selector:
291+
matchLabels:
292+
app: guestbook
293+
tier: frontend
280294
template:
281295
metadata:
282296
labels:

GKE-On-Prem/journalbeat-kubernetes.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ data:
2828
output.elasticsearch:
2929
hosts: ${ELASTICSEARCH_HOSTS}
3030
ilm.enabled: true
31-
31+
3232
---
33-
apiVersion: extensions/v1beta1
33+
apiVersion: apps/v1
3434
kind: DaemonSet
3535
metadata:
3636
name: journalbeat-dynamic
@@ -39,6 +39,10 @@ metadata:
3939
k8s-app: journalbeat-dynamic
4040
kubernetes.io/cluster-service: "true"
4141
spec:
42+
selector:
43+
matchLabels:
44+
k8s-app: journalbeat-dynamic
45+
kubernetes.io/cluster-service: "true"
4246
template:
4347
metadata:
4448
labels:

GKE-On-Prem/metricbeat-kubernetes.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ data:
101101
period: 10s
102102
host: ${NODE_NAME}
103103
hosts: ["localhost:10255"]
104-
# If using Red Hat OpenShift remove the previous hosts entry and
104+
# If using Red Hat OpenShift remove the previous hosts entry and
105105
# uncomment these settings:
106106
#hosts: ["https://${HOSTNAME}:10250"]
107107
#bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
@@ -110,14 +110,17 @@ data:
110110
111111
---
112112
# Deploy a Metricbeat instance per node for node metrics retrieval
113-
apiVersion: extensions/v1beta1
113+
apiVersion: apps/v1
114114
kind: DaemonSet
115115
metadata:
116116
name: metricbeat
117117
namespace: kube-system
118118
labels:
119119
k8s-app: metricbeat
120120
spec:
121+
selector:
122+
matchLabels:
123+
k8s-app: metricbeat
121124
template:
122125
metadata:
123126
labels:
@@ -237,14 +240,18 @@ data:
237240
hosts: ["kube-state-metrics:8080"]
238241
---
239242
# Deploy singleton instance in the whole cluster for some unique data sources, like kube-state-metrics
240-
apiVersion: apps/v1beta1
243+
apiVersion: apps/v1
241244
kind: Deployment
242245
metadata:
243246
name: metricbeat
244247
namespace: kube-system
245248
labels:
246249
k8s-app: metricbeat
247250
spec:
251+
selector:
252+
matchLabels:
253+
k8s-app: metricbeat
254+
248255
template:
249256
metadata:
250257
labels:

0 commit comments

Comments
 (0)