epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-09 11:47:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade kubernetes to v1.13.0 (#3810)

Browse Source 
* Upgrade kubernetes to v1.13.0

* Remove all precense of scheduler.alpha.kubernetes.io/critical-pod in templates

* Fix cert dir

* Use kubespray v2.8 as baseline for gitlab
This commit is contained in:
Rong Zhang
2018-12-07 04:11:48 +08:00
committed by Kubernetes Prow Robot
parent ddffdb63bf
commit 225f765b56
35 changed files with 325 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/network_plugin/cilium/templates/cilium-ds.yml.j2
View File

@@ -21,12 +21,6 @@ spec:
labels:
k8s-app: cilium
kubernetes.io/cluster-service: "true"
annotations:
# This annotation plus the CriticalAddonsOnly toleration makes
# cilium to be a critical pod in the cluster, which ensures cilium
# gets priority scheduling.
# https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
scheduler.alpha.kubernetes.io/critical-pod: ''
{% if cilium_enable_prometheus %}
prometheus.io/scrape: "true"
prometheus.io/port: "9090"