Skip to content
This repository was archived by the owner on Apr 25, 2024. It is now read-only.

Commit bbebee4

Browse files
committed
use stable api versions for resource which have been promoted to GA
1 parent ef816cd commit bbebee4

File tree

49 files changed

+308
-148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+308
-148
lines changed

01-path-basics/103-kubernetes-concepts/readme.adoc

+15-2
Original file line numberDiff line numberDiff line change
@@ -542,12 +542,15 @@ A "`desired state`", such as 4 replicas of a pod, can be described in a Deployme
542542
The folowing example will create a Deployment with 3 replicas of NGINX base image. Let's begin with the template:
543543

544544
$ cat deployment.yaml
545-
apiVersion: extensions/v1beta1
545+
apiVersion: apps/v1
546546
kind: Deployment # kubernetes object type
547547
metadata:
548548
name: nginx-deployment # deployment name
549549
spec:
550550
replicas: 3 # number of replicas
551+
selector:
552+
matchLabels:
553+
app: nginx
551554
template:
552555
metadata:
553556
labels:
@@ -723,12 +726,15 @@ Pods belong to a service by using a loosely-coupled model where labels are attac
723726
Let's create a Deployment first that will create 3 replicas of a pod:
724727

725728
$ cat echo-deployment.yaml
726-
apiVersion: extensions/v1beta1
729+
apiVersion: apps/v1
727730
kind: Deployment
728731
metadata:
729732
name: echo-deployment
730733
spec:
731734
replicas: 3
735+
selector:
736+
matchLabels:
737+
app: echo-pod
732738
template:
733739
metadata:
734740
labels:
@@ -940,6 +946,10 @@ The folowing is an example DaemonSet that runs a Prometheus container. Let's beg
940946
metadata:
941947
name: prometheus-daemonset
942948
spec:
949+
selector:
950+
matchLabels:
951+
tier: monitoring
952+
name: prometheus-exporter
943953
template:
944954
metadata:
945955
labels:
@@ -1407,6 +1417,9 @@ No resource limits.
14071417
namespace: dev
14081418
spec:
14091419
replicas: 3
1420+
selector:
1421+
matchLabels:
1422+
app: nginx
14101423
template:
14111424
metadata:
14121425
labels:

01-path-basics/103-kubernetes-concepts/templates/daemonset.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: apps/v1
22
kind: DaemonSet
33
metadata:
44
name: prometheus-daemonset
55
spec:
6+
selector:
7+
matchLabels:
8+
tier: monitoring
9+
name: prometheus-exporter
610
template:
711
metadata:
812
labels:
@@ -13,4 +17,4 @@ spec:
1317
- name: prometheus
1418
image: prom/node-exporter
1519
ports:
16-
- containerPort: 80
20+
- containerPort: 80
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: nginx-deployment-ns
55
namespace: dev
66
spec:
7-
replicas: 3
7+
replicas: 3
8+
selector:
9+
matchLabels:
10+
app: nginx
811
template:
912
metadata:
1013
labels:
11-
app: nginx
14+
app: nginx
1215
spec:
1316
containers:
14-
- name: nginx
17+
- name: nginx
1518
image: nginx:1.12.1
16-
ports:
19+
ports:
1720
- containerPort: 80
1821
- containerPort: 443
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: nginx-deployment
55
spec:
6-
replicas: 3
6+
replicas: 3
7+
selector:
8+
matchLabels:
9+
app: nginx
710
template:
811
metadata:
912
labels:
10-
app: nginx
13+
app: nginx
1114
spec:
1215
containers:
13-
- name: nginx
16+
- name: nginx
1417
image: nginx:1.12.1
15-
ports:
18+
ports:
1619
- containerPort: 80
1720
- containerPort: 443

01-path-basics/103-kubernetes-concepts/templates/echo-deployment.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: echo-deployment
55
spec:
66
replicas: 3
7+
selector:
8+
matchLabels:
9+
app: echo-pod
710
template:
811
metadata:
912
labels:

01-path-basics/103-kubernetes-concepts/templates/echo.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: echo-deployment
55
spec:
66
replicas: 3
7+
selector:
8+
matchLabels:
9+
app: echo-pod
710
template:
811
metadata:
912
labels:

01-path-basics/103-kubernetes-concepts/templates/replicaset.yaml

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: apps/v1
22
kind: ReplicaSet
33
metadata:
44
name: nginx-replicaset
55
spec:
6-
replicas: 3
6+
replicas: 3
7+
selector:
8+
matchLabels:
9+
name: nginx-replica
710
template:
811
metadata:
912
labels:
1013
name: nginx-replica
1114
spec:
1215
containers:
13-
- name: nginx-replica
14-
image: nginx:1.12.1
16+
- name: nginx-replica
17+
image: nginx:1.12.1
1518
imagePullPolicy: IfNotPresent
1619
ports:
1720
- containerPort: 80

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/grafana.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: monitoring-grafana
55
namespace: kube-system
66
spec:
77
replicas: 1
8+
selector:
9+
matchLabels:
10+
task: monitoring
11+
k8s-app: grafana
812
template:
913
metadata:
1014
labels:

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/heapster-rbac.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kind: ClusterRoleBinding
2-
apiVersion: rbac.authorization.k8s.io/v1beta1
2+
apiVersion: rbac.authorization.k8s.io/v1
33
metadata:
44
name: heapster
55
roleRef:

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/heapster.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ metadata:
44
name: heapster
55
namespace: kube-system
66
---
7-
apiVersion: extensions/v1beta1
7+
apiVersion: apps/v1
88
kind: Deployment
99
metadata:
1010
name: heapster
1111
namespace: kube-system
1212
spec:
1313
replicas: 1
14+
selector:
15+
matchLabels:
16+
task: monitoring
17+
k8s-app: heapster
1418
template:
1519
metadata:
1620
labels:

02-path-working-with-clusters/201-cluster-monitoring/templates/heapster/influxdb.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: monitoring-influxdb
55
namespace: kube-system
66
spec:
77
replicas: 1
8+
selector:
9+
matchLabels:
10+
task: monitoring
11+
k8s-app: influxdb
812
template:
913
metadata:
1014
labels:

02-path-working-with-clusters/201-cluster-monitoring/templates/prometheus/grafana-bundle.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -5595,13 +5595,16 @@ data:
55955595
"url": "http://prometheus-operated.monitoring.svc:9090"
55965596
}
55975597
---
5598-
apiVersion: apps/v1beta1
5598+
apiVersion: apps/v1
55995599
kind: Deployment
56005600
metadata:
56015601
name: grafana
56025602
namespace: monitoring
56035603
spec:
56045604
replicas: 1
5605+
selector:
5606+
matchLabels:
5607+
app: grafana
56055608
template:
56065609
metadata:
56075610
labels:

02-path-working-with-clusters/201-cluster-monitoring/templates/prometheus/prometheus-bundle.yaml

+6-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Namespace
33
metadata:
44
name: monitoring
55
---
6-
apiVersion: rbac.authorization.k8s.io/v1beta1
6+
apiVersion: rbac.authorization.k8s.io/v1
77
kind: ClusterRoleBinding
88
metadata:
99
name: prometheus-operator
@@ -16,7 +16,7 @@ subjects:
1616
name: prometheus-operator
1717
namespace: monitoring
1818
---
19-
apiVersion: rbac.authorization.k8s.io/v1beta1
19+
apiVersion: rbac.authorization.k8s.io/v1
2020
kind: ClusterRole
2121
metadata:
2222
name: prometheus-operator
@@ -76,7 +76,7 @@ metadata:
7676
name: prometheus-operator
7777
namespace: monitoring
7878
---
79-
apiVersion: extensions/v1beta1
79+
apiVersion: apps/v1
8080
kind: Deployment
8181
metadata:
8282
labels:
@@ -85,6 +85,9 @@ metadata:
8585
namespace: monitoring
8686
spec:
8787
replicas: 1
88+
selector:
89+
matchLabels:
90+
k8s-app: prometheus-operator
8891
template:
8992
metadata:
9093
labels:

02-path-working-with-clusters/201-cluster-monitoring/templates/prometheus/prometheus.yaml

+10-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: kube-state-metrics
55
namespace: monitoring
66
---
7-
apiVersion: rbac.authorization.k8s.io/v1beta1
7+
apiVersion: rbac.authorization.k8s.io/v1
88
kind: ClusterRole
99
metadata:
1010
name: kube-state-metrics
@@ -23,7 +23,7 @@ rules:
2323
- replicasets
2424
verbs: ["list", "watch"]
2525
---
26-
apiVersion: rbac.authorization.k8s.io/v1beta1
26+
apiVersion: rbac.authorization.k8s.io/v1
2727
kind: ClusterRoleBinding
2828
metadata:
2929
name: kube-state-metrics
@@ -72,12 +72,15 @@ spec:
7272
targetPort: 10252
7373
protocol: TCP
7474
---
75-
apiVersion: extensions/v1beta1
75+
apiVersion: apps/v1
7676
kind: DaemonSet
7777
metadata:
7878
name: node-exporter
7979
namespace: monitoring
8080
spec:
81+
selector:
82+
matchLabels:
83+
app: node-exporter
8184
template:
8285
metadata:
8386
labels:
@@ -139,13 +142,16 @@ spec:
139142
selector:
140143
app: node-exporter
141144
---
142-
apiVersion: extensions/v1beta1
145+
apiVersion: apps/v1
143146
kind: Deployment
144147
metadata:
145148
name: kube-state-metrics
146149
namespace: monitoring
147150
spec:
148151
replicas: 1
152+
selector:
153+
matchLabels:
154+
app: kube-state-metrics
149155
template:
150156
metadata:
151157
labels:

02-path-working-with-clusters/204-cluster-logging-with-EFK/templates/fluentd-ds.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: apps/v1
22
kind: DaemonSet
33
metadata:
44
name: fluentd
@@ -12,6 +12,9 @@ spec:
1212
type: RollingUpdate
1313
rollingUpdate:
1414
maxUnavailable: 1
15+
selector:
16+
matchLabels:
17+
k8s-app: fluentd
1518
template:
1619
metadata:
1720
labels:

02-path-working-with-clusters/204-cluster-logging-with-EFK/templates/fluentd-role-binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: rbac.authorization.k8s.io/v1beta1
1+
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRoleBinding
33
metadata:
44
name: fluentd-read

02-path-working-with-clusters/204-cluster-logging-with-EFK/templates/fluentd-role.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: rbac.authorization.k8s.io/v1beta1
1+
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
44
name: fluentd-read

02-path-working-with-clusters/205-cluster-autoscaling/templates/2-10-autoscaler.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: extensions/v1beta1
2+
apiVersion: apps/v1
33
kind: Deployment
44
metadata:
55
name: cluster-autoscaler

02-path-working-with-clusters/205-cluster-autoscaling/templates/dummy-resource-offers.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
ports:
1010
- port: 8080
1111
---
12-
apiVersion: extensions/v1beta1
12+
apiVersion: apps/v1
1313
kind: Deployment
1414
metadata:
1515
name: greeter

0 commit comments

Comments
 (0)