External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-18 11:40:10 -03:30
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

1
roles/network_plugin/calico/templates/calico-node.yml.j2
View File

@@ -19,7 +19,6 @@ spec:
k8s-app: calico-node
annotations:
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
scheduler.alpha.kubernetes.io/critical-pod: ''
kubespray.etcd-cert/serial: "{{ etcd_client_cert_serial }}"
{% if calico_felix_prometheusmetricsenabled %}
prometheus.io/scrape: 'true'

3
roles/network_plugin/canal/templates/canal-node.yaml.j2
View File

@@ -12,9 +12,6 @@ spec:
k8s-app: canal-node
template:
metadata:
annotations:
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
scheduler.alpha.kubernetes.io/critical-pod: ''
labels:
k8s-app: canal-node
spec:

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"

3
roles/network_plugin/contiv/templates/contiv-api-proxy.yml.j2
View File

@@ -15,9 +15,6 @@ spec:
namespace: kube-system
labels:
k8s-app: contiv-api-proxy
annotations:
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-node-critical

3
roles/network_plugin/contiv/templates/contiv-cleanup.yml.j2
View File

@@ -14,9 +14,6 @@ spec:
metadata:
labels:
k8s-app: contiv-cleanup
annotations:
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-node-critical

2
roles/network_plugin/contiv/templates/contiv-etcd-proxy.yml.j2
View File

@@ -14,8 +14,6 @@ spec:
metadata:
labels:
k8s-app: contiv-etcd-proxy
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-node-critical

2
roles/network_plugin/contiv/templates/contiv-etcd.yml.j2
View File

@@ -14,8 +14,6 @@ spec:
metadata:
labels:
k8s-app: contiv-etcd
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-node-critical

3
roles/network_plugin/contiv/templates/contiv-netmaster.yml.j2
View File

@@ -15,9 +15,6 @@ spec:
namespace: kube-system
labels:
k8s-app: contiv-netmaster
annotations:
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-node-critical

3
roles/network_plugin/contiv/templates/contiv-netplugin.yml.j2
View File

@@ -19,9 +19,6 @@ spec:
metadata:
labels:
k8s-app: contiv-netplugin
annotations:
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-node-critical

3
roles/network_plugin/contiv/templates/contiv-ovs.yml.j2
View File

@@ -16,9 +16,6 @@ spec:
metadata:
labels:
k8s-app: contiv-ovs
annotations:
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-node-critical

3
roles/network_plugin/flannel/templates/cni-flannel.yml.j2
View File

@@ -51,9 +51,6 @@ spec:
labels:
tier: node
k8s-app: flannel
annotations:
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-node-critical

2
roles/network_plugin/kube-router/templates/kube-router.yml.j2
View File

@@ -60,8 +60,6 @@ spec:
labels:
k8s-app: kube-router
tier: node
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-cluster-critical

3
roles/network_plugin/weave/templates/weave-net.yml.j2
View File

@@ -114,9 +114,6 @@ items:
metadata:
labels:
name: weave-net
annotations:
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-node-critical