Skip to content

Commit 8750778

Browse files
heschlieheschlie
committed
Updating DNS and k8s version
Upated kubedns to the latest version, and updated k8s to the latest stable (v1.7.5) in the Vagrant demo.
1 parent db6af8d commit 8750778

File tree

5 files changed

+182
-133
lines changed

5 files changed

+182
-133
lines changed

‎_includes/master/install-k8s-addons.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ calico-policy-controller-so4gl 1/1 Running 0 1m
3030
To install KubeDNS, use the provided manifest. This enables Kubernetes Service discovery.
3131

3232
```shell
33-
kubectl apply -f {{site.url}}/{{page.version}}/getting-started/kubernetes/installation/manifests/skydns.yaml
33+
kubectl apply -f {{site.url}}/{{page.version}}/getting-started/kubernetes/installation/manifests/kubedns.yaml
3434
```

‎master/getting-started/kubernetes/installation/manifests/kubedns.yaml‎

Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: kube-dns
5+
namespace: kube-system
6+
labels:
7+
k8s-app: kube-dns
8+
kubernetes.io/cluster-service: "true"
9+
kubernetes.io/name: "KubeDNS"
10+
spec:
11+
selector:
12+
k8s-app: kube-dns
13+
clusterIP: 10.100.0.10
14+
ports:
15+
- name: dns
16+
port: 53
17+
protocol: UDP
18+
- name: dns-tcp
19+
port: 53
20+
protocol: TCP
21+
---
22+
23+
apiVersion: extensions/v1beta1
24+
kind: Deployment
25+
metadata:
26+
name: kube-dns
27+
namespace: kube-system
28+
labels:
29+
k8s-app: kube-dns
30+
kubernetes.io/cluster-service: "true"
31+
addonmanager.kubernetes.io/mode: Reconcile
32+
spec:
33+
# replicas: not specified here:
34+
# 1. In order to make Addon Manager do not reconcile this replicas parameter.
35+
# 2. Default is 1.
36+
# 3. Will be tuned in real time if DNS horizontal auto-scaling is turned on.
37+
strategy:
38+
rollingUpdate:
39+
maxSurge: 10%
40+
maxUnavailable: 0
41+
selector:
42+
matchLabels:
43+
k8s-app: kube-dns
44+
template:
45+
metadata:
46+
labels:
47+
k8s-app: kube-dns
48+
annotations:
49+
scheduler.alpha.kubernetes.io/critical-pod: ''
50+
spec:
51+
tolerations:
52+
- key: "CriticalAddonsOnly"
53+
operator: "Exists"
54+
volumes:
55+
- name: kube-dns-config
56+
configMap:
57+
name: kube-dns
58+
optional: true
59+
containers:
60+
- name: kubedns
61+
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4
62+
resources:
63+
# TODO: Set memory limits when we've profiled the container for large
64+
# clusters, then set request = limit to keep this container in
65+
# guaranteed class. Currently, this container falls into the
66+
# "burstable" category so the kubelet doesn't backoff from restarting it.
67+
limits:
68+
memory: 170Mi
69+
requests:
70+
cpu: 100m
71+
memory: 70Mi
72+
livenessProbe:
73+
httpGet:
74+
path: /healthcheck/kubedns
75+
port: 10054
76+
scheme: HTTP
77+
initialDelaySeconds: 60
78+
timeoutSeconds: 5
79+
successThreshold: 1
80+
failureThreshold: 5
81+
readinessProbe:
82+
httpGet:
83+
path: /readiness
84+
port: 8081
85+
scheme: HTTP
86+
# we poll on pod startup for the Kubernetes master service and
87+
# only setup the /readiness HTTP server once that's available.
88+
initialDelaySeconds: 3
89+
timeoutSeconds: 5
90+
args:
91+
- --domain=cluster.local
92+
- --dns-port=10053
93+
- --config-dir=/kube-dns-config
94+
- --v=2
95+
env:
96+
- name: PROMETHEUS_PORT
97+
value: "10055"
98+
ports:
99+
- containerPort: 10053
100+
name: dns-local
101+
protocol: UDP
102+
- containerPort: 10053
103+
name: dns-tcp-local
104+
protocol: TCP
105+
- containerPort: 10055
106+
name: metrics
107+
protocol: TCP
108+
volumeMounts:
109+
- name: kube-dns-config
110+
mountPath: /kube-dns-config
111+
- name: dnsmasq
112+
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4
113+
livenessProbe:
114+
httpGet:
115+
path: /healthcheck/dnsmasq
116+
port: 10054
117+
scheme: HTTP
118+
initialDelaySeconds: 60
119+
timeoutSeconds: 5
120+
successThreshold: 1
121+
failureThreshold: 5
122+
args:
123+
- -v=2
124+
- -logtostderr
125+
- -configDir=/etc/k8s/dns/dnsmasq-nanny
126+
- -restartDnsmasq=true
127+
- --
128+
- -k
129+
- --cache-size=1000
130+
- --log-facility=-
131+
- --server=/cluster.local/127.0.0.1#10053
132+
- --server=/in-addr.arpa/127.0.0.1#10053
133+
- --server=/ip6.arpa/127.0.0.1#10053
134+
ports:
135+
- containerPort: 53
136+
name: dns
137+
protocol: UDP
138+
- containerPort: 53
139+
name: dns-tcp
140+
protocol: TCP
141+
# see: https://github.com/kubernetes/kubernetes/issues/29055 for details
142+
resources:
143+
requests:
144+
cpu: 150m
145+
memory: 20Mi
146+
volumeMounts:
147+
- name: kube-dns-config
148+
mountPath: /etc/k8s/dns/dnsmasq-nanny
149+
- name: sidecar
150+
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4
151+
livenessProbe:
152+
httpGet:
153+
path: /metrics
154+
port: 10054
155+
scheme: HTTP
156+
initialDelaySeconds: 60
157+
timeoutSeconds: 5
158+
successThreshold: 1
159+
failureThreshold: 5
160+
args:
161+
- --v=2
162+
- --logtostderr
163+
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.cluster.local,5,A
164+
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.cluster.local,5,A
165+
ports:
166+
- containerPort: 10054
167+
name: metrics
168+
protocol: TCP
169+
resources:
170+
requests:
171+
memory: 20Mi
172+
cpu: 10m
173+
dnsPolicy: Default # Don't use cluster DNS.

‎master/getting-started/kubernetes/installation/manifests/skydns.yaml‎

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

‎master/getting-started/kubernetes/installation/vagrant/master-config.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ coreos:
2323
After=etcd-member.service
2424
[Service]
2525
TimeoutStartSec=1800
26-
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kubectl
27-
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kube-apiserver
26+
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.5/bin/linux/amd64/kubectl
27+
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.5/bin/linux/amd64/kube-apiserver
2828
ExecStartPre=/usr/bin/chmod +x /opt/bin/kubectl
2929
ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver
3030
ExecStart=/opt/bin/kube-apiserver \
@@ -49,7 +49,7 @@ coreos:
4949
After=kube-apiserver.service
5050
[Service]
5151
TimeoutStartSec=1800
52-
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kube-controller-manager
52+
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.5/bin/linux/amd64/kube-controller-manager
5353
ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-controller-manager
5454
# --cluster-cidr must match the IP Pool defined in the manifest
5555
ExecStart=/opt/bin/kube-controller-manager \
@@ -72,7 +72,7 @@ coreos:
7272
After=kube-apiserver.service
7373
[Service]
7474
TimeoutStartSec=1800
75-
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kube-scheduler
75+
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.5/bin/linux/amd64/kube-scheduler
7676
ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-scheduler
7777
ExecStart=/opt/bin/kube-scheduler --master=$private_ipv4:8080
7878
Restart=always
@@ -90,7 +90,7 @@ coreos:
9090
9191
[Service]
9292
TimeoutStartSec=1800
93-
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kubelet
93+
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.5/bin/linux/amd64/kubelet
9494
ExecStartPre=/usr/bin/chmod +x /opt/bin/kubelet
9595
ExecStart=/opt/bin/kubelet \
9696
--address=0.0.0.0 \
@@ -118,7 +118,7 @@ coreos:
118118
After=kubelet.service
119119
[Service]
120120
TimeoutStartSec=1800
121-
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kube-proxy
121+
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.5/bin/linux/amd64/kube-proxy
122122
ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy
123123
# --cluster-cidr must match the IP Pool defined in the manifest
124124
ExecStart=/opt/bin/kube-proxy \

‎master/getting-started/kubernetes/installation/vagrant/node-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ coreos:
4747
TimeoutStartSec=1800
4848
ExecStartPre=/usr/bin/wget -N -P /opt/cni/bin https://github.com/containernetworking/cni/releases/download/v0.5.1/cni-v0.5.1.tgz
4949
ExecStartPre=/usr/bin/tar -xvf /opt/cni/bin/cni-v0.5.1.tgz -C /opt/cni/bin
50-
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kubelet
50+
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.5/bin/linux/amd64/kubelet
5151
ExecStartPre=/usr/bin/chmod +x /opt/bin/kubelet
5252
ExecStartPre=/usr/bin/mkdir -p /opt/cni/bin
5353
ExecStart=/opt/bin/kubelet \
@@ -75,7 +75,7 @@ coreos:
7575
After=kubelet.service
7676
[Service]
7777
TimeoutStartSec=1800
78-
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.0/bin/linux/amd64/kube-proxy
78+
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v1.7.5/bin/linux/amd64/kube-proxy
7979
ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy
8080
# --cluster-cidr must match the IP Pool defined in the manifest
8181
ExecStart=/opt/bin/kube-proxy \

0 commit comments

Comments
 (0)