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

Commit 382fbcb

Browse files
aaronlevyaaronlevy
authored
Merge pull request #152 from aaronlevy/v1.4.1
v1.4.1 + kube-dns v20
2 parents a805b96 + 68426a5 commit 382fbcb

File tree

343 files changed

+21403
-13449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

343 files changed

+21403
-13449
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ conformance-%: clean all
4343
#TODO(aaron): the k8s.io/client-go upstream package is a symlink with relative path. Making note because we change symlink path.
4444
# This will naively try and create a vendor dir from a k8s release
4545
# USE: make vendor VENDOR_VERSION=vX.Y.Z
46-
VENDOR_VERSION = v1.4.0+coreos.0
46+
VENDOR_VERSION = v1.4.1+coreos.0
4747
vendor:
4848
@echo "Creating k8s vendor for: $(VENDOR_VERSION)"
4949
@rm -rf vendor

‎hack/multi-node/user-data.sample‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ coreos:
2626
[Service]
2727
EnvironmentFile=/etc/environment
2828
Environment=KUBELET_ACI=quay.io/coreos/hyperkube
29-
Environment=KUBELET_VERSION=v1.4.0_coreos.0
29+
Environment=KUBELET_VERSION=v1.4.1_coreos.0
3030
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
3131
ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests
3232
ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets

‎hack/single-node/user-data.sample‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ coreos:
2727
[Service]
2828
EnvironmentFile=/etc/environment
2929
Environment=KUBELET_ACI=quay.io/coreos/hyperkube
30-
Environment=KUBELET_VERSION=v1.4.0_coreos.0
30+
Environment=KUBELET_VERSION=v1.4.1_coreos.0
3131
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
3232
ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests
3333
ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets

‎hack/tests/conformance-test.sh‎

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

44
CHECK_NODE_COUNT=${CHECK_NODE_COUNT:-true}
55
CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/coreos/kubernetes}
6-
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.3.7+coreos.0}
6+
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.4.1+coreos.0}
77
TEST_ARGS=${TEST_ARGS:-"--ginkgo.focus='\[Conformance\]' --ginkgo.skip='\[Flaky\]|\[Feature:.+\]'"}
88

99
usage() {

‎pkg/asset/internal/templates.go‎

Lines changed: 39 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ metadata:
2626
namespace: kube-system
2727
labels:
2828
k8s-app: kubelet
29-
version: v1.4.0_coreos.0
29+
version: v1.4.1_coreos.0
3030
spec:
3131
template:
3232
metadata:
3333
labels:
3434
k8s-app: kubelet
35-
version: v1.4.0_coreos.0
35+
version: v1.4.1_coreos.0
3636
spec:
3737
containers:
3838
- name: kubelet
39-
image: quay.io/coreos/hyperkube:v1.4.0_coreos.0
39+
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
4040
command:
4141
- /nsenter
4242
- --target=1
@@ -115,13 +115,13 @@ metadata:
115115
namespace: kube-system
116116
labels:
117117
k8s-app: kube-apiserver
118-
version: v1.4.0_coreos.0
118+
version: v1.4.1_coreos.0
119119
spec:
120120
template:
121121
metadata:
122122
labels:
123123
k8s-app: kube-apiserver
124-
version: v1.4.0_coreos.0
124+
version: v1.4.1_coreos.0
125125
spec:
126126
nodeSelector:
127127
master: "true"
@@ -135,7 +135,7 @@ spec:
135135
- mountPath: /etc/kubernetes/manifests
136136
name: etc-k8s-manifests
137137
- name: kube-apiserver
138-
image: quay.io/coreos/hyperkube:v1.4.0_coreos.0
138+
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
139139
command:
140140
- /hyperkube
141141
- apiserver
@@ -182,17 +182,17 @@ metadata:
182182
namespace: kube-system
183183
labels:
184184
k8s-app: kube-controller-manager
185-
version: v1.4.0_coreos.0
185+
version: v1.4.1_coreos.0
186186
spec:
187187
template:
188188
metadata:
189189
labels:
190190
k8s-app: kube-controller-manager
191-
version: v1.4.0_coreos.0
191+
version: v1.4.1_coreos.0
192192
spec:
193193
containers:
194194
- name: kube-controller-manager
195-
image: quay.io/coreos/hyperkube:v1.4.0_coreos.0
195+
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
196196
command:
197197
- ./hyperkube
198198
- controller-manager
@@ -221,17 +221,17 @@ metadata:
221221
namespace: kube-system
222222
labels:
223223
k8s-app: kube-scheduler
224-
version: v1.4.0_coreos.0
224+
version: v1.4.1_coreos.0
225225
spec:
226226
template:
227227
metadata:
228228
labels:
229229
k8s-app: kube-scheduler
230-
version: v1.4.0_coreos.0
230+
version: v1.4.1_coreos.0
231231
spec:
232232
containers:
233233
- name: kube-scheduler
234-
image: quay.io/coreos/hyperkube:v1.4.0_coreos.0
234+
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
235235
command:
236236
- ./hyperkube
237237
- scheduler
@@ -244,18 +244,18 @@ metadata:
244244
namespace: kube-system
245245
labels:
246246
k8s_app: kube-proxy
247-
version: v1.4.0_coreos.0
247+
version: v1.4.1_coreos.0
248248
spec:
249249
template:
250250
metadata:
251251
labels:
252252
k8s_app: kube-proxy
253-
version: v1.4.0_coreos.0
253+
version: v1.4.1_coreos.0
254254
spec:
255255
hostNetwork: true
256256
containers:
257257
- name: kube-proxy
258-
image: quay.io/coreos/hyperkube:v1.4.0_coreos.0
258+
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
259259
command:
260260
- /hyperkube
261261
- proxy
@@ -281,27 +281,26 @@ spec:
281281
DNSDeploymentTemplate = []byte(`apiVersion: extensions/v1beta1
282282
kind: Deployment
283283
metadata:
284-
name: kube-dns-v19
284+
name: kube-dns-v20
285285
namespace: kube-system
286286
labels:
287287
k8s-app: kube-dns
288-
version: v19
288+
version: v20
289289
kubernetes.io/cluster-service: "true"
290290
spec:
291291
replicas: 1
292292
template:
293293
metadata:
294294
labels:
295295
k8s-app: kube-dns
296-
version: v19
297-
kubernetes.io/cluster-service: "true"
296+
version: v20
298297
annotations:
299298
scheduler.alpha.kubernetes.io/critical-pod: ''
300299
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
301300
spec:
302301
containers:
303302
- name: kubedns
304-
image: gcr.io/google_containers/kubedns-amd64:1.7
303+
image: gcr.io/google_containers/kubedns-amd64:1.8
305304
resources:
306305
# TODO: Set memory limits when we've profiled the container for large
307306
# clusters, then set request = limit to keep this container in
@@ -314,7 +313,7 @@ spec:
314313
memory: 70Mi
315314
livenessProbe:
316315
httpGet:
317-
path: /healthz
316+
path: /healthz-kubedns
318317
port: 8080
319318
scheme: HTTP
320319
initialDelaySeconds: 60
@@ -328,7 +327,7 @@ spec:
328327
scheme: HTTP
329328
# we poll on pod startup for the Kubernetes master service and
330329
# only setup the /readiness HTTP server once that's available.
331-
initialDelaySeconds: 30
330+
initialDelaySeconds: 3
332331
timeoutSeconds: 5
333332
args:
334333
# command = "/kube-dns"
@@ -342,11 +341,21 @@ spec:
342341
name: dns-tcp-local
343342
protocol: TCP
344343
- name: dnsmasq
345-
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.3
344+
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
345+
livenessProbe:
346+
httpGet:
347+
path: /healthz-dnsmasq
348+
port: 8080
349+
scheme: HTTP
350+
initialDelaySeconds: 60
351+
timeoutSeconds: 5
352+
successThreshold: 1
353+
failureThreshold: 5
346354
args:
347355
- --cache-size=1000
348356
- --no-resolv
349357
- --server=127.0.0.1#10053
358+
- --log-facility=-
350359
ports:
351360
- containerPort: 53
352361
name: dns
@@ -355,7 +364,7 @@ spec:
355364
name: dns-tcp
356365
protocol: TCP
357366
- name: healthz
358-
image: gcr.io/google_containers/exechealthz-amd64:1.1
367+
image: gcr.io/google_containers/exechealthz-amd64:1.2
359368
resources:
360369
limits:
361370
memory: 50Mi
@@ -367,9 +376,12 @@ spec:
367376
# net memory requested by the pod constant.
368377
memory: 50Mi
369378
args:
370-
- -cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.cluster.local 127.0.0.1:10053 >/dev/null
371-
- -port=8080
372-
- -quiet
379+
- --cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1 >/dev/null
380+
- --url=/healthz-dnsmasq
381+
- --cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1:10053 >/dev/null
382+
- --url=/healthz-kubedns
383+
- --port=8080
384+
- --quiet
373385
ports:
374386
- containerPort: 8080
375387
protocol: TCP

‎pkg/bootkube/status.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"k8s.io/kubernetes/pkg/client/cache"
1414
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4"
1515
"k8s.io/kubernetes/pkg/client/restclient"
16-
"k8s.io/kubernetes/pkg/controller/framework"
1716
"k8s.io/kubernetes/pkg/labels"
1817
"k8s.io/kubernetes/pkg/runtime"
1918
"k8s.io/kubernetes/pkg/util/wait"
@@ -63,7 +62,7 @@ func (s *statusController) Run() {
6362
}
6463

6564
options := api.ListOptions{LabelSelector: ls}
66-
podStore, podController := framework.NewInformer(
65+
podStore, podController := cache.NewInformer(
6766
&cache.ListWatch{
6867
ListFunc: func(lo api.ListOptions) (runtime.Object, error) {
6968
return s.client.Core().Pods(api.NamespaceSystem).List(options)
@@ -74,7 +73,7 @@ func (s *statusController) Run() {
7473
},
7574
&v1.Pod{},
7675
30*time.Minute,
77-
framework.ResourceEventHandlerFuncs{},
76+
cache.ResourceEventHandlerFuncs{},
7877
)
7978
s.podStore = podStore
8079
go podController.Run(wait.NeverStop)

‎vendor/k8s.io/kubernetes/build/build-image/cross/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/build/build-image/cross/VERSION‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/build/kube-dns/Changelog‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/build/kube-dns/Makefile‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)