Skip to content

Commit 52c0768

Browse files
authored
Merge pull request kubernetes#39448 from bowei/remove-dns
Remove dns
2 parents 66a6020 + 75c29ad commit 52c0768

Some content is hidden

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

42 files changed

+55
-3734
lines changed

build/kube-dns/CHANGELOG.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

build/kube-dns/Dockerfile

Lines changed: 0 additions & 17 deletions
This file was deleted.

build/kube-dns/MAINTAINERS.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

build/kube-dns/Makefile

Lines changed: 0 additions & 68 deletions
This file was deleted.

build/kube-dns/OWNERS

Lines changed: 0 additions & 11 deletions
This file was deleted.

build/kube-dns/README.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

build/kube-dns/RELEASES.md

Lines changed: 0 additions & 51 deletions
This file was deleted.

cluster/addons/dns/README.md

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
# kube-dns
2-
kube-dns schedules DNS Pods and Service on the cluster, other pods in cluster can
3-
use the DNS Service’s IP to resolve DNS names.
42

5-
More details on http://kubernetes.io/docs/admin/dns/.
3+
`kube-dns` schedules DNS Pods and Service on the cluster, other pods in cluster
4+
can use the DNS Service’s IP to resolve DNS names.
5+
6+
* [Administrators guide](http://kubernetes.io/docs/admin/dns/)
7+
* [Code repository](http://www.github.com/kubernetes/dns)
68

79
## Manually scale kube-dns Deployment
10+
811
kube-dns creates only one DNS Pod by default. If
912
[dns-horizontal-autoscaler](../dns-horizontal-autoscaler/)
1013
is not enabled, you may need to manually scale kube-dns Deployment.
@@ -14,45 +17,52 @@ Please use below `kubectl scale` command to scale:
1417
kubectl --namespace=kube-system scale deployment kube-dns --replicas=<NUM_YOU_WANT>
1518
```
1619

17-
Do not use `kubectl edit` to modify kube-dns Deployment object if it is controlled by
18-
[Addon Manager](../addon-manager/). Otherwise the modifications will be clobbered,
19-
in addition the replicas count for kube-dns Deployment will be reset to 1. See
20-
[Cluster add-ons README](../README.md) and [#36411](https://github.com/kubernetes/kubernetes/issues/36411)
21-
for reference.
20+
Do not use `kubectl edit` to modify kube-dns Deployment object if it is
21+
controlled by [Addon Manager](../addon-manager/). Otherwise the modifications
22+
will be clobbered, in addition the replicas count for kube-dns Deployment will
23+
be reset to 1. See [Cluster add-ons README](../README.md) and
24+
[#36411](https://github.com/kubernetes/kubernetes/issues/36411) for reference.
2225

2326
## kube-dns Deployment and Service templates
2427

25-
This directory contains the base UNDERSCORE templates that can be used
26-
to generate the kubedns-controller.yaml.in and kubedns.controller.yaml.in needed in Salt format.
28+
This directory contains the base UNDERSCORE templates that can be used to
29+
generate the kubedns-controller.yaml.in and kubedns.controller.yaml.in needed in
30+
Salt format.
2731

2832
Due to a varied preference in templating language choices, the transform
29-
Makefile in this directory should be enhanced to generate all required
30-
formats from the base underscore templates.
33+
Makefile in this directory should be enhanced to generate all required formats
34+
from the base underscore templates.
35+
36+
**N.B.**: When you add a parameter you should also update the various scripts
37+
that supply values for your new parameter. Here is one way you might find those
38+
scripts:
3139

32-
**NOTE WELL**: Developers, when you add a parameter you should also
33-
update the various scripts that supply values for your new parameter.
34-
Here is one way you might find those scripts:
3540
```
36-
cd kubernetes
37-
find [a-zA-Z0-9]* -type f -exec grep kubedns-controller.yaml \{\} \; -print -exec echo \;
41+
cd kubernetes && git grep 'kubedns-controller.yaml'
3842
```
3943

4044
### Base Template files
4145

4246
These are the authoritative base templates.
4347
Run 'make' to generate the Salt and Sed yaml templates from these.
4448

49+
```
4550
kubedns-controller.yaml.base
4651
kubedns-svc.yaml.base
52+
```
4753

4854
### Generated Salt files
4955

56+
```
5057
kubedns-controller.yaml.in
5158
kubedns-svc.yaml.in
59+
```
5260

5361
### Generated Sed files
5462

63+
```
5564
kubedns-controller.yaml.sed
5665
kubedns-svc.yaml.sed
66+
```
5767

5868
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/dns/README.md?pixel)]()

cluster/addons/dns/kubedns-controller.yaml.base

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
spec:
4848
containers:
4949
- name: kubedns
50-
image: gcr.io/google_containers/kubedns-amd64:1.9
50+
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.10.1
5151
resources:
5252
# TODO: Set memory limits when we've profiled the container for large
5353
# clusters, then set request = limit to keep this container in
@@ -96,7 +96,7 @@ spec:
9696
name: metrics
9797
protocol: TCP
9898
- name: dnsmasq
99-
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
99+
image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.10.1
100100
livenessProbe:
101101
httpGet:
102102
path: /healthcheck/dnsmasq
@@ -124,7 +124,7 @@ spec:
124124
cpu: 150m
125125
memory: 10Mi
126126
- name: sidecar
127-
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.10.0
127+
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.10.1
128128
livenessProbe:
129129
httpGet:
130130
path: /metrics

cluster/addons/dns/kubedns-controller.yaml.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
spec:
4848
containers:
4949
- name: kubedns
50-
image: gcr.io/google_containers/kubedns-amd64:1.9
50+
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.10.1
5151
resources:
5252
# TODO: Set memory limits when we've profiled the container for large
5353
# clusters, then set request = limit to keep this container in
@@ -96,7 +96,7 @@ spec:
9696
name: metrics
9797
protocol: TCP
9898
- name: dnsmasq
99-
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
99+
image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.10.1
100100
livenessProbe:
101101
httpGet:
102102
path: /healthcheck/dnsmasq
@@ -124,7 +124,7 @@ spec:
124124
cpu: 150m
125125
memory: 10Mi
126126
- name: sidecar
127-
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.10.0
127+
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.10.1
128128
livenessProbe:
129129
httpGet:
130130
path: /metrics

cluster/addons/dns/kubedns-controller.yaml.sed

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
spec:
4848
containers:
4949
- name: kubedns
50-
image: gcr.io/google_containers/kubedns-amd64:1.9
50+
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.10.1
5151
resources:
5252
# TODO: Set memory limits when we've profiled the container for large
5353
# clusters, then set request = limit to keep this container in
@@ -95,7 +95,7 @@ spec:
9595
name: metrics
9696
protocol: TCP
9797
- name: dnsmasq
98-
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
98+
image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.10.1
9999
livenessProbe:
100100
httpGet:
101101
path: /healthcheck/dnsmasq
@@ -123,7 +123,7 @@ spec:
123123
cpu: 150m
124124
memory: 10Mi
125125
- name: sidecar
126-
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.10.0
126+
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.10.1
127127
livenessProbe:
128128
httpGet:
129129
path: /metrics

cmd/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ filegroup(
2626
"//cmd/kube-apiserver:all-srcs",
2727
"//cmd/kube-controller-manager:all-srcs",
2828
"//cmd/kube-discovery:all-srcs",
29-
"//cmd/kube-dns:all-srcs",
3029
"//cmd/kube-proxy:all-srcs",
3130
"//cmd/kubeadm:all-srcs",
3231
"//cmd/kubectl:all-srcs",

0 commit comments

Comments
 (0)