Skip to content

Commit 7f4350d

Browse files
committed
Revert "coredns default (#10200)"
This reverts commit 698e93b.
1 parent bc23d45 commit 7f4350d

File tree

2 files changed

+25
-28
lines changed

2 files changed

+25
-28
lines changed

content/en/docs/tasks/administer-cluster/dns-horizontal-autoscaling.md

+20-23
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ The output is similar to this:
3636

3737
NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE
3838
...
39-
dns-autoscaler 1 1 1 1 ...
39+
kube-dns-autoscaler 1 1 1 1 ...
4040
...
4141

42-
If you see "dns-autoscaler" in the output, DNS horizontal autoscaling is
42+
If you see "kube-dns-autoscaler" in the output, DNS horizontal autoscaling is
4343
already enabled, and you can skip to
4444
[Tuning autoscaling parameters](#tuning-autoscaling-parameters).
4545

@@ -53,13 +53,10 @@ The output is similar to this:
5353

5454
NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE
5555
...
56-
coredns 2 2 2 2 ...
56+
kube-dns 1 1 1 1 ...
5757
...
5858

59-
60-
In Kubernetes versions earlier than 1.12, the DNS Deployment was called "kube-dns".
61-
62-
In Kubernetes versions earlier than 1.5 DNS was implemented using a
59+
In Kubernetes versions earlier than 1.5 DNS is implemented using a
6360
ReplicationController instead of a Deployment. So if you don't see kube-dns,
6461
or a similar name, in the preceding output, list the ReplicationControllers in
6562
your cluster in the kube-system namespace:
@@ -80,7 +77,7 @@ If you have a DNS Deployment, your scale target is:
8077
Deployment/<your-deployment-name>
8178

8279
where <dns-deployment-name> is the name of your DNS Deployment. For example, if
83-
your DNS Deployment name is coredns, your scale target is Deployment/coredns.
80+
your DNS Deployment name is kube-dns, your scale target is Deployment/kube-dns.
8481

8582
If you have a DNS ReplicationController, your scale target is:
8683

@@ -114,20 +111,20 @@ DNS horizontal autoscaling is now enabled.
114111

115112
## Tuning autoscaling parameters
116113

117-
Verify that the dns-autoscaler ConfigMap exists:
114+
Verify that the kube-dns-autoscaler ConfigMap exists:
118115

119116
kubectl get configmap --namespace=kube-system
120117

121118
The output is similar to this:
122119

123120
NAME DATA AGE
124121
...
125-
dns-autoscaler 1 ...
122+
kube-dns-autoscaler 1 ...
126123
...
127124

128125
Modify the data in the ConfigMap:
129126

130-
kubectl edit configmap dns-autoscaler --namespace=kube-system
127+
kubectl edit configmap kube-dns-autoscaler --namespace=kube-system
131128

132129
Look for this line:
133130

@@ -154,15 +151,15 @@ There are other supported scaling patterns. For details, see
154151
There are a few options for turning DNS horizontal autoscaling. Which option to
155152
use depends on different conditions.
156153

157-
### Option 1: Scale down the dns-autoscaler deployment to 0 replicas
154+
### Option 1: Scale down the kube-dns-autoscaler deployment to 0 replicas
158155

159156
This option works for all situations. Enter this command:
160157

161-
kubectl scale deployment --replicas=0 dns-autoscaler --namespace=kube-system
158+
kubectl scale deployment --replicas=0 kube-dns-autoscaler --namespace=kube-system
162159

163160
The output is:
164161

165-
deployment.extensions/dns-autoscaler scaled
162+
deployment.extensions/kube-dns-autoscaler scaled
166163

167164
Verify that the replica count is zero:
168165

@@ -172,33 +169,33 @@ The output displays 0 in the DESIRED and CURRENT columns:
172169

173170
NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE
174171
...
175-
dns-autoscaler 0 0 0 0 ...
172+
kube-dns-autoscaler 0 0 0 0 ...
176173
...
177174

178-
### Option 2: Delete the dns-autoscaler deployment
175+
### Option 2: Delete the kube-dns-autoscaler deployment
179176

180-
This option works if dns-autoscaler is under your own control, which means
177+
This option works if kube-dns-autoscaler is under your own control, which means
181178
no one will re-create it:
182179

183-
kubectl delete deployment dns-autoscaler --namespace=kube-system
180+
kubectl delete deployment kube-dns-autoscaler --namespace=kube-system
184181

185182
The output is:
186183

187-
deployment.extensions "dns-autoscaler" deleted
184+
deployment.extensions "kube-dns-autoscaler" deleted
188185

189-
### Option 3: Delete the dns-autoscaler manifest file from the master node
186+
### Option 3: Delete the kube-dns-autoscaler manifest file from the master node
190187

191-
This option works if dns-autoscaler is under control of the
188+
This option works if kube-dns-autoscaler is under control of the
192189
[Addon Manager](https://git.k8s.io/kubernetes/cluster/addons/README.md)'s
193190
control, and you have write access to the master node.
194191

195192
# to the master node and delete the corresponding manifest file.
196-
The common path for this dns-autoscaler is:
193+
The common path for this kube-dns-autoscaler is:
197194

198195
/etc/kubernetes/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml
199196

200197
After the manifest file is deleted, the Addon Manager will delete the
201-
dns-autoscaler Deployment.
198+
kube-dns-autoscaler Deployment.
202199

203200
{{% /capture %}}
204201

content/en/examples/admin/dns/dns-horizontal-autoscaler.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: dns-autoscaler
4+
name: kube-dns-autoscaler
55
namespace: kube-system
66
labels:
7-
k8s-app: dns-autoscaler
7+
k8s-app: kube-dns-autoscaler
88
spec:
99
selector:
1010
matchLabels:
11-
k8s-app: dns-autoscaler
11+
k8s-app: kube-dns-autoscaler
1212
template:
1313
metadata:
1414
labels:
15-
k8s-app: dns-autoscaler
15+
k8s-app: kube-dns-autoscaler
1616
spec:
1717
containers:
1818
- name: autoscaler
@@ -24,7 +24,7 @@ spec:
2424
command:
2525
- /cluster-proportional-autoscaler
2626
- --namespace=kube-system
27-
- --configmap=dns-autoscaler
27+
- --configmap=kube-dns-autoscaler
2828
- --target=<SCALE_TARGET>
2929
# When cluster is using large nodes(with more cores), "coresPerReplica" should dominate.
3030
# If using small nodes, "nodesPerReplica" should dominate.

0 commit comments

Comments
 (0)