Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit c61ca0c

Browse files
committed
Bump k8s v1.8.1
1 parent 975ac93 commit c61ca0c

File tree

7 files changed

+63
-28
lines changed

7 files changed

+63
-28
lines changed

hack/multi-node/user-data.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ coreos:
99
[Service]
1010
EnvironmentFile=/etc/environment
1111
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
12-
Environment=KUBELET_IMAGE_TAG=v1.7.7_coreos.0
12+
Environment=KUBELET_IMAGE_TAG=v1.8.1_coreos.0
1313
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
1414
--volume var-lib-cni,kind=host,source=/var/lib/cni \
1515
--volume opt-cni-bin,kind=host,source=/opt/cni/bin \

hack/quickstart/kubelet.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Service]
22
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
3-
Environment=KUBELET_IMAGE_TAG=v1.7.7_coreos.0
3+
Environment=KUBELET_IMAGE_TAG=v1.8.1_coreos.0
44
Environment="RKT_RUN_ARGS=\
55
--uuid-file-save=/var/cache/kubelet-pod.uuid \
66
--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \

hack/quickstart/kubelet.worker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Service]
22
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
3-
Environment=KUBELET_IMAGE_TAG=v1.7.7_coreos.0
3+
Environment=KUBELET_IMAGE_TAG=v1.8.1_coreos.0
44
Environment="RKT_RUN_ARGS=\
55
--uuid-file-save=/var/cache/kubelet-pod.uuid \
66
--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \

hack/single-node/user-data.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ coreos:
99
[Service]
1010
EnvironmentFile=/etc/environment
1111
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
12-
Environment=KUBELET_IMAGE_TAG=v1.7.7_coreos.0
12+
Environment=KUBELET_IMAGE_TAG=v1.8.1_coreos.0
1313
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
1414
--volume var-lib-cni,kind=host,source=/var/lib/cni \
1515
--volume opt-cni-bin,kind=host,source=/opt/cni/bin \

hack/tests/conformance-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -euo pipefail
33

44
CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/coreos/kubernetes}
5-
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.7.7+coreos.0}
5+
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.8.1+coreos.0}
66

77
usage() {
88
echo "USAGE:"

pkg/asset/images.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var DefaultImages = ImageVersions{
88
FlannelCNI: "quay.io/coreos/flannel-cni:v0.3.0",
99
Calico: "quay.io/calico/node:v2.6.1",
1010
CalicoCNI: "quay.io/calico/cni:v1.11.0",
11-
Hyperkube: "quay.io/coreos/hyperkube:v1.7.7_coreos.0",
11+
Hyperkube: "quay.io/coreos/hyperkube:v1.8.1_coreos.0",
1212
Kenc: "quay.io/coreos/kenc:0.0.2",
1313
KubeDNS: "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5",
1414
KubeDNSMasq: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5",

pkg/asset/internal/templates.go

Lines changed: 57 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ contexts:
1919
user: kubelet
2020
`)
2121

22-
var KubeSystemSARoleBindingTemplate = []byte(`apiVersion: rbac.authorization.k8s.io/v1alpha1
22+
var KubeSystemSARoleBindingTemplate = []byte(`apiVersion: rbac.authorization.k8s.io/v1
2323
kind: ClusterRoleBinding
2424
metadata:
2525
name: system:default-sa
@@ -33,7 +33,7 @@ roleRef:
3333
apiGroup: rbac.authorization.k8s.io
3434
`)
3535

36-
var KubeletTemplate = []byte(`apiVersion: extensions/v1beta1
36+
var KubeletTemplate = []byte(`apiVersion: apps/v1beta2
3737
kind: DaemonSet
3838
metadata:
3939
name: kubelet
@@ -42,6 +42,10 @@ metadata:
4242
tier: node
4343
k8s-app: kubelet
4444
spec:
45+
selector:
46+
matchLabels:
47+
tier: node
48+
k8s-app: kubelet
4549
template:
4650
metadata:
4751
labels:
@@ -135,7 +139,7 @@ spec:
135139
type: RollingUpdate
136140
`)
137141

138-
var APIServerTemplate = []byte(`apiVersion: "extensions/v1beta1"
142+
var APIServerTemplate = []byte(`apiVersion: apps/v1beta2
139143
kind: DaemonSet
140144
metadata:
141145
name: kube-apiserver
@@ -144,6 +148,10 @@ metadata:
144148
tier: control-plane
145149
k8s-app: kube-apiserver
146150
spec:
151+
selector:
152+
matchLabels:
153+
tier: control-plane
154+
k8s-app: kube-apiserver
147155
template:
148156
metadata:
149157
labels:
@@ -161,7 +169,7 @@ spec:
161169
- /var/lock/api-server.lock
162170
- /hyperkube
163171
- apiserver
164-
- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota
172+
- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
165173
- --advertise-address=$(POD_IP)
166174
- --allow-privileged=true
167175
- --anonymous-auth=false
@@ -240,7 +248,7 @@ spec:
240248
- /var/lock/api-server.lock
241249
- /hyperkube
242250
- apiserver
243-
- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota
251+
- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
244252
- --advertise-address=$(POD_IP)
245253
- --allow-privileged=true
246254
- --authorization-mode=RBAC
@@ -292,7 +300,7 @@ spec:
292300
path: /var/lock
293301
`)
294302

295-
var KencTemplate = []byte(`apiVersion: "extensions/v1beta1"
303+
var KencTemplate = []byte(`apiVersion: apps/v1beta2
296304
kind: DaemonSet
297305
metadata:
298306
name: kube-etcd-network-checkpointer
@@ -301,6 +309,10 @@ metadata:
301309
tier: control-plane
302310
k8s-app: kube-etcd-network-checkpointer
303311
spec:
312+
selector:
313+
matchLabels:
314+
tier: control-plane
315+
k8s-app: kube-etcd-network-checkpointer
304316
template:
305317
metadata:
306318
labels:
@@ -352,7 +364,7 @@ spec:
352364
type: RollingUpdate
353365
`)
354366

355-
var CheckpointerTemplate = []byte(`apiVersion: "extensions/v1beta1"
367+
var CheckpointerTemplate = []byte(`apiVersion: apps/v1beta2
356368
kind: DaemonSet
357369
metadata:
358370
name: pod-checkpointer
@@ -361,6 +373,10 @@ metadata:
361373
tier: control-plane
362374
k8s-app: pod-checkpointer
363375
spec:
376+
selector:
377+
matchLabels:
378+
tier: control-plane
379+
k8s-app: pod-checkpointer
364380
template:
365381
metadata:
366382
labels:
@@ -416,7 +432,7 @@ spec:
416432
type: RollingUpdate
417433
`)
418434

419-
var ControllerManagerTemplate = []byte(`apiVersion: extensions/v1beta1
435+
var ControllerManagerTemplate = []byte(`apiVersion: apps/v1beta2
420436
kind: Deployment
421437
metadata:
422438
name: kube-controller-manager
@@ -426,6 +442,10 @@ metadata:
426442
k8s-app: kube-controller-manager
427443
spec:
428444
replicas: 2
445+
selector:
446+
matchLabels:
447+
tier: control-plane
448+
k8s-app: kube-controller-manager
429449
template:
430450
metadata:
431451
labels:
@@ -547,7 +567,7 @@ spec:
547567
k8s-app: kube-controller-manager
548568
`)
549569

550-
var SchedulerTemplate = []byte(`apiVersion: extensions/v1beta1
570+
var SchedulerTemplate = []byte(`apiVersion: apps/v1beta2
551571
kind: Deployment
552572
metadata:
553573
name: kube-scheduler
@@ -557,6 +577,10 @@ metadata:
557577
k8s-app: kube-scheduler
558578
spec:
559579
replicas: 2
580+
selector:
581+
matchLabels:
582+
tier: control-plane
583+
k8s-app: kube-scheduler
560584
template:
561585
metadata:
562586
labels:
@@ -645,7 +669,7 @@ spec:
645669
k8s-app: kube-scheduler
646670
`)
647671

648-
var ProxyTemplate = []byte(`apiVersion: "extensions/v1beta1"
672+
var ProxyTemplate = []byte(`apiVersion: apps/v1beta2
649673
kind: DaemonSet
650674
metadata:
651675
name: kube-proxy
@@ -654,6 +678,10 @@ metadata:
654678
tier: node
655679
k8s-app: kube-proxy
656680
spec:
681+
selector:
682+
matchLabels:
683+
tier: node
684+
k8s-app: kube-proxy
657685
template:
658686
metadata:
659687
labels:
@@ -706,7 +734,7 @@ spec:
706734
type: RollingUpdate
707735
`)
708736

709-
var DNSDeploymentTemplate = []byte(`apiVersion: extensions/v1beta1
737+
var DNSDeploymentTemplate = []byte(`apiVersion: apps/v1beta2
710738
kind: Deployment
711739
metadata:
712740
name: kube-dns
@@ -886,20 +914,18 @@ spec:
886914
protocol: TCP
887915
`)
888916

889-
var EtcdOperatorTemplate = []byte(`apiVersion: extensions/v1beta1
917+
var EtcdOperatorTemplate = []byte(`apiVersion: apps/v1beta2
890918
kind: Deployment
891919
metadata:
892920
name: etcd-operator
893921
namespace: kube-system
894922
labels:
895923
k8s-app: etcd-operator
896924
spec:
897-
strategy:
898-
type: RollingUpdate
899-
rollingUpdate:
900-
maxUnavailable: 1
901-
maxSurge: 1
902925
replicas: 1
926+
selector:
927+
matchLabels:
928+
k8s-app: etcd-operator
903929
template:
904930
metadata:
905931
labels:
@@ -929,6 +955,11 @@ spec:
929955
- key: node-role.kubernetes.io/master
930956
operator: Exists
931957
effect: NoSchedule
958+
strategy:
959+
type: RollingUpdate
960+
rollingUpdate:
961+
maxUnavailable: 1
962+
maxSurge: 1
932963
`)
933964

934965
var EtcdSvcTemplate = []byte(`apiVersion: v1
@@ -1095,7 +1126,7 @@ data:
10951126
}
10961127
`)
10971128

1098-
var KubeFlannelTemplate = []byte(`apiVersion: extensions/v1beta1
1129+
var KubeFlannelTemplate = []byte(`apiVersion: apps/v1beta2
10991130
kind: DaemonSet
11001131
metadata:
11011132
name: kube-flannel
@@ -1104,6 +1135,10 @@ metadata:
11041135
tier: node
11051136
k8s-app: flannel
11061137
spec:
1138+
selector:
1139+
matchLabels:
1140+
tier: node
1141+
k8s-app: flannel
11071142
template:
11081143
metadata:
11091144
labels:
@@ -1204,7 +1239,7 @@ data:
12041239
}
12051240
`)
12061241

1207-
var CalicoNodeTemplate = []byte(`apiVersion: extensions/v1beta1
1242+
var CalicoNodeTemplate = []byte(`apiVersion: apps/v1beta2
12081243
kind: DaemonSet
12091244
metadata:
12101245
name: calico-node
@@ -1328,7 +1363,7 @@ spec:
13281363
type: RollingUpdate
13291364
`)
13301365

1331-
var CalicoPolicyOnlyTemplate = []byte(`apiVersion: extensions/v1beta1
1366+
var CalicoPolicyOnlyTemplate = []byte(`apiVersion: apps/v1beta2
13321367
kind: DaemonSet
13331368
metadata:
13341369
name: calico-node
@@ -1517,7 +1552,7 @@ metadata:
15171552
namespace: kube-system
15181553
`)
15191554

1520-
var CalicoRoleTemplate = []byte(`apiVersion: rbac.authorization.k8s.io/v1beta1
1555+
var CalicoRoleTemplate = []byte(`apiVersion: rbac.authorization.k8s.io/v1
15211556
kind: ClusterRole
15221557
metadata:
15231558
name: calico-node
@@ -1572,7 +1607,7 @@ rules:
15721607
- watch
15731608
`)
15741609

1575-
var CalicoRoleBindingTemplate = []byte(`apiVersion: rbac.authorization.k8s.io/v1beta1
1610+
var CalicoRoleBindingTemplate = []byte(`apiVersion: rbac.authorization.k8s.io/v1
15761611
kind: ClusterRoleBinding
15771612
metadata:
15781613
name: calico-node

0 commit comments

Comments
 (0)