Update k8s manifests (#15)

* remove ref to deleted file, match proposed manifest in kubeadm pr

* classless cidrs not in 0.9.9
This commit is contained in:
Chris O'Haver 2017-10-31 10:10:05 -04:00 committed by John Belamaric
parent f78ade71d7
commit b997ad78fe
2 changed files with 7 additions and 12 deletions

View file

@ -28,12 +28,5 @@ $ ./deploy.sh 10.3.0.0/24 | kubectl apply -f -
$ kubectl delete --namespace=kube-system deployment kube-dns
~~~
Kubernetes 1.6 uses Role Based Access Control (RBAC). The following example uses the 1.6 yaml
tamplate to replace Kube-DNS and add the RBAC needed for CoreDNS to access the API.
-Note that the CIDR's netmask needs to be a multiple of 8.
~~~
$ ./deploy.sh 10.3.0.0/24 cluster.local coredns-1.6.yaml.sed | kubectl apply -f -
$ kubectl delete --namespace=kube-system deployment kube-dns
~~~
Note that the CIDR's netmask needs to be a multiple of 8.

View file

@ -73,14 +73,16 @@ spec:
metadata:
labels:
k8s-app: coredns
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec:
serviceAccountName: coredns
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: "CriticalAddonsOnly"
operator: "Exists"
containers:
- name: coredns
image: coredns/coredns:latest
image: coredns/coredns:0.9.9
imagePullPolicy: Always
args: [ "-conf", "/etc/coredns/Corefile" ]
volumeMounts: