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

Commit b336f3b

Browse files
authored
Merge pull request #157 from aaronlevy/v1.4.3
V1.4.3
2 parents 7e85e0a + b3d259f commit b336f3b

File tree

27 files changed

+432
-125
lines changed

27 files changed

+432
-125
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.1+coreos.0
46+
VENDOR_VERSION = v1.4.3+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.1_coreos.0
29+
Environment=KUBELET_VERSION=v1.4.3_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.1_coreos.0
30+
Environment=KUBELET_VERSION=v1.4.3_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.4.1+coreos.0}
6+
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.4.3+coreos.0}
77
TEST_ARGS=${TEST_ARGS:-"--ginkgo.focus='\[Conformance\]' --ginkgo.skip='\[Flaky\]|\[Feature:.+\]'"}
88

99
usage() {

pkg/asset/internal/templates.go

Lines changed: 15 additions & 15 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.1_coreos.0
29+
version: v1.4.3_coreos.0
3030
spec:
3131
template:
3232
metadata:
3333
labels:
3434
k8s-app: kubelet
35-
version: v1.4.1_coreos.0
35+
version: v1.4.3_coreos.0
3636
spec:
3737
containers:
3838
- name: kubelet
39-
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
39+
image: quay.io/coreos/hyperkube:v1.4.3_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.1_coreos.0
118+
version: v1.4.3_coreos.0
119119
spec:
120120
template:
121121
metadata:
122122
labels:
123123
k8s-app: kube-apiserver
124-
version: v1.4.1_coreos.0
124+
version: v1.4.3_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.1_coreos.0
138+
image: quay.io/coreos/hyperkube:v1.4.3_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.1_coreos.0
185+
version: v1.4.3_coreos.0
186186
spec:
187187
template:
188188
metadata:
189189
labels:
190190
k8s-app: kube-controller-manager
191-
version: v1.4.1_coreos.0
191+
version: v1.4.3_coreos.0
192192
spec:
193193
containers:
194194
- name: kube-controller-manager
195-
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
195+
image: quay.io/coreos/hyperkube:v1.4.3_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.1_coreos.0
224+
version: v1.4.3_coreos.0
225225
spec:
226226
template:
227227
metadata:
228228
labels:
229229
k8s-app: kube-scheduler
230-
version: v1.4.1_coreos.0
230+
version: v1.4.3_coreos.0
231231
spec:
232232
containers:
233233
- name: kube-scheduler
234-
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
234+
image: quay.io/coreos/hyperkube:v1.4.3_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.1_coreos.0
247+
version: v1.4.3_coreos.0
248248
spec:
249249
template:
250250
metadata:
251251
labels:
252252
k8s_app: kube-proxy
253-
version: v1.4.1_coreos.0
253+
version: v1.4.3_coreos.0
254254
spec:
255255
hostNetwork: true
256256
containers:
257257
- name: kube-proxy
258-
image: quay.io/coreos/hyperkube:v1.4.1_coreos.0
258+
image: quay.io/coreos/hyperkube:v1.4.3_coreos.0
259259
command:
260260
- /hyperkube
261261
- proxy

vendor/k8s.io/kubernetes/federation/deploy/deploy.sh

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

vendor/k8s.io/kubernetes/pkg/api/unversioned/group_version.go

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

vendor/k8s.io/kubernetes/pkg/api/unversioned/group_version_test.go

Lines changed: 44 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/pkg/client/cache/shared_informer.go

Lines changed: 31 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/pkg/controller/node/controller_utils.go

Lines changed: 10 additions & 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)