Skip to content

Commit 2b0b33c

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #45077 from ahmetb/example-rm-yamls
Automatic merge from submit-queue examples/guestbook: remove not useful/inaccurate comments The comments removed in this patch are either inaccurate or does not serve any purpose as they're already applies as uncommented in the tutorial and explained in the walkthrough text. ```release-note NONE ``` Signed-off-by: Ahmet Alp Balkan <[email protected]>
2 parents 4bb5338 + 12cbfd6 commit 2b0b33c

12 files changed

+8
-162
lines changed

guestbook/all-in-one/frontend.yaml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ spec:
1010
# an external load-balanced IP for the frontend service.
1111
# type: LoadBalancer
1212
ports:
13-
# the port that this service should serve on
1413
- port: 80
1514
selector:
1615
app: guestbook
@@ -20,21 +19,8 @@ apiVersion: extensions/v1beta1
2019
kind: Deployment
2120
metadata:
2221
name: frontend
23-
# these labels can be applied automatically
24-
# from the labels in the pod template if not set
25-
# labels:
26-
# app: guestbook
27-
# tier: frontend
2822
spec:
29-
# this replicas value is default
30-
# modify it according to your case
3123
replicas: 3
32-
# selector can be applied automatically
33-
# from the labels in the pod template if not set
34-
# selector:
35-
# matchLabels:
36-
# app: guestbook
37-
# tier: frontend
3824
template:
3925
metadata:
4026
labels:
@@ -54,7 +40,7 @@ spec:
5440
# If your cluster config does not include a dns service, then to
5541
# instead access environment variables to find service host
5642
# info, comment out the 'value: dns' line above, and uncomment the
57-
# line below.
43+
# line below:
5844
# value: env
5945
ports:
6046
- containerPort: 80

guestbook/all-in-one/guestbook-all-in-one.yaml

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
role: master
99
spec:
1010
ports:
11-
# the port that this service should serve on
1211
- port: 6379
1312
targetPort: 6379
1413
selector:
@@ -20,23 +19,8 @@ apiVersion: extensions/v1beta1
2019
kind: Deployment
2120
metadata:
2221
name: redis-master
23-
# these labels can be applied automatically
24-
# from the labels in the pod template if not set
25-
# labels:
26-
# app: redis
27-
# role: master
28-
# tier: backend
2922
spec:
30-
# this replicas value is default
31-
# modify it according to your case
3223
replicas: 1
33-
# selector can be applied automatically
34-
# from the labels in the pod template if not set
35-
# selector:
36-
# matchLabels:
37-
# app: guestbook
38-
# role: master
39-
# tier: backend
4024
template:
4125
metadata:
4226
labels:
@@ -64,7 +48,6 @@ metadata:
6448
role: slave
6549
spec:
6650
ports:
67-
# the port that this service should serve on
6851
- port: 6379
6952
selector:
7053
app: redis
@@ -75,23 +58,8 @@ apiVersion: extensions/v1beta1
7558
kind: Deployment
7659
metadata:
7760
name: redis-slave
78-
# these labels can be applied automatically
79-
# from the labels in the pod template if not set
80-
# labels:
81-
# app: redis
82-
# role: slave
83-
# tier: backend
8461
spec:
85-
# this replicas value is default
86-
# modify it according to your case
8762
replicas: 2
88-
# selector can be applied automatically
89-
# from the labels in the pod template if not set
90-
# selector:
91-
# matchLabels:
92-
# app: guestbook
93-
# role: slave
94-
# tier: backend
9563
template:
9664
metadata:
9765
labels:
@@ -112,7 +80,7 @@ spec:
11280
# If your cluster config does not include a dns service, then to
11381
# instead access an environment variable to find the master
11482
# service's host, comment out the 'value: dns' line above, and
115-
# uncomment the line below.
83+
# uncomment the line below:
11684
# value: env
11785
ports:
11886
- containerPort: 6379
@@ -129,7 +97,6 @@ spec:
12997
# an external load-balanced IP for the frontend service.
13098
# type: LoadBalancer
13199
ports:
132-
# the port that this service should serve on
133100
- port: 80
134101
selector:
135102
app: guestbook
@@ -139,21 +106,8 @@ apiVersion: extensions/v1beta1
139106
kind: Deployment
140107
metadata:
141108
name: frontend
142-
# these labels can be applied automatically
143-
# from the labels in the pod template if not set
144-
# labels:
145-
# app: guestbook
146-
# tier: frontend
147109
spec:
148-
# this replicas value is default
149-
# modify it according to your case
150110
replicas: 3
151-
# selector can be applied automatically
152-
# from the labels in the pod template if not set
153-
# selector:
154-
# matchLabels:
155-
# app: guestbook
156-
# tier: frontend
157111
template:
158112
metadata:
159113
labels:
@@ -173,7 +127,7 @@ spec:
173127
# If your cluster config does not include a dns service, then to
174128
# instead access environment variables to find service host
175129
# info, comment out the 'value: dns' line above, and uncomment the
176-
# line below.
130+
# line below:
177131
# value: env
178132
ports:
179133
- containerPort: 80

guestbook/all-in-one/redis-slave.yaml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
tier: backend
99
spec:
1010
ports:
11-
# the port that this service should serve on
1211
- port: 6379
1312
selector:
1413
app: redis
@@ -19,23 +18,8 @@ apiVersion: extensions/v1beta1
1918
kind: Deployment
2019
metadata:
2120
name: redis-slave
22-
# these labels can be applied automatically
23-
# from the labels in the pod template if not set
24-
# labels:
25-
# app: redis
26-
# role: slave
27-
# tier: backend
2821
spec:
29-
# this replicas value is default
30-
# modify it according to your case
3122
replicas: 2
32-
# selector can be applied automatically
33-
# from the labels in the pod template if not set
34-
# selector:
35-
# matchLabels:
36-
# app: guestbook
37-
# role: slave
38-
# tier: backend
3923
template:
4024
metadata:
4125
labels:
@@ -56,7 +40,7 @@ spec:
5640
# If your cluster config does not include a dns service, then to
5741
# instead access an environment variable to find the master
5842
# service's host, comment out the 'value: dns' line above, and
59-
# uncomment the line below.
43+
# uncomment the line below:
6044
# value: env
6145
ports:
6246
- containerPort: 6379

guestbook/frontend-deployment.yaml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,8 @@ apiVersion: extensions/v1beta1
22
kind: Deployment
33
metadata:
44
name: frontend
5-
# these labels can be applied automatically
6-
# from the labels in the pod template if not set
7-
# labels:
8-
# app: guestbook
9-
# tier: frontend
105
spec:
11-
# this replicas value is default
12-
# modify it according to your case
136
replicas: 3
14-
# selector can be applied automatically
15-
# from the labels in the pod template if not set
16-
# selector:
17-
# matchLabels:
18-
# app: guestbook
19-
# tier: frontend
207
template:
218
metadata:
229
labels:
@@ -36,7 +23,7 @@ spec:
3623
# If your cluster config does not include a dns service, then to
3724
# instead access environment variables to find service host
3825
# info, comment out the 'value: dns' line above, and uncomment the
39-
# line below.
26+
# line below:
4027
# value: env
4128
ports:
4229
- containerPort: 80

guestbook/frontend-service.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ spec:
1010
# an external load-balanced IP for the frontend service.
1111
# type: LoadBalancer
1212
ports:
13-
# the port that this service should serve on
1413
- port: 80
1514
selector:
1615
app: guestbook

guestbook/legacy/frontend-controller.yaml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,8 @@ apiVersion: v1
22
kind: ReplicationController
33
metadata:
44
name: frontend
5-
# these labels can be applied automatically
6-
# from the labels in the pod template if not set
7-
# labels:
8-
# app: guestbook
9-
# tier: frontend
105
spec:
11-
# this replicas value is default
12-
# modify it according to your case
136
replicas: 3
14-
# selector can be applied automatically
15-
# from the labels in the pod template if not set
16-
# selector:
17-
# app: guestbook
18-
# tier: frontend
197
template:
208
metadata:
219
labels:
@@ -35,7 +23,7 @@ spec:
3523
# If your cluster config does not include a dns service, then to
3624
# instead access environment variables to find service host
3725
# info, comment out the 'value: dns' line above, and uncomment the
38-
# line below.
26+
# line below:
3927
# value: env
4028
ports:
4129
- containerPort: 80

guestbook/legacy/redis-master-controller.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,12 @@ apiVersion: v1
22
kind: ReplicationController
33
metadata:
44
name: redis-master
5-
# these labels can be applied automatically
6-
# from the labels in the pod template if not set
75
labels:
86
app: redis
97
role: master
108
tier: backend
119
spec:
12-
# this replicas value is default
13-
# modify it according to your case
1410
replicas: 1
15-
# selector can be applied automatically
16-
# from the labels in the pod template if not set
17-
# selector:
18-
# app: guestbook
19-
# role: master
20-
# tier: backend
2111
template:
2212
metadata:
2313
labels:

guestbook/legacy/redis-slave-controller.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,12 @@ apiVersion: v1
22
kind: ReplicationController
33
metadata:
44
name: redis-slave
5-
# these labels can be applied automatically
6-
# from the labels in the pod template if not set
75
labels:
86
app: redis
97
role: slave
108
tier: backend
119
spec:
12-
# this replicas value is default
13-
# modify it according to your case
1410
replicas: 2
15-
# selector can be applied automatically
16-
# from the labels in the pod template if not set
17-
# selector:
18-
# app: guestbook
19-
# role: slave
20-
# tier: backend
2111
template:
2212
metadata:
2313
labels:
@@ -38,7 +28,7 @@ spec:
3828
# If your cluster config does not include a dns service, then to
3929
# instead access an environment variable to find the master
4030
# service's host, comment out the 'value: dns' line above, and
41-
# uncomment the line below.
31+
# uncomment the line below:
4232
# value: env
4333
ports:
4434
- containerPort: 6379

guestbook/redis-master-deployment.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,8 @@ apiVersion: extensions/v1beta1
22
kind: Deployment
33
metadata:
44
name: redis-master
5-
# these labels can be applied automatically
6-
# from the labels in the pod template if not set
7-
# labels:
8-
# app: redis
9-
# role: master
10-
# tier: backend
115
spec:
12-
# this replicas value is default
13-
# modify it according to your case
146
replicas: 1
15-
# selector can be applied automatically
16-
# from the labels in the pod template if not set
17-
# selector:
18-
# matchLabels:
19-
# app: guestbook
20-
# role: master
21-
# tier: backend
227
template:
238
metadata:
249
labels:

guestbook/redis-master-service.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
tier: backend
99
spec:
1010
ports:
11-
# the port that this service should serve on
1211
- port: 6379
1312
targetPort: 6379
1413
selector:

0 commit comments

Comments
 (0)