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

Commit 8fb9b6b

Browse files
aaronlevyaaronlevy
authored
Merge pull request #985 from aaronlevy/v1.10.3
V1.10.3
2 parents 10bfea5 + 9314dff commit 8fb9b6b

File tree

12 files changed

+32
-20
lines changed

12 files changed

+32
-20
lines changed

‎Gopkg.lock‎

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

‎Gopkg.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ required = [
99

1010
[[override]]
1111
name = "k8s.io/api"
12-
revision = "kubernetes-1.10.2"
12+
revision = "kubernetes-1.10.3"
1313
[[constraint]]
1414
name = "k8s.io/apiextensions-apiserver"
15-
revision = "kubernetes-1.10.2"
15+
revision = "kubernetes-1.10.3"
1616
[[constraint]]
1717
name = "k8s.io/apimachinery"
18-
revision = "kubernetes-1.10.2"
18+
revision = "kubernetes-1.10.3"
1919
[[constraint]]
2020
name = "k8s.io/client-go"
21-
revision = "kubernetes-1.10.2"
21+
revision = "kubernetes-1.10.3"
2222

2323
[[constraint]]
2424
name = "github.com/coreos/etcd"

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,11 @@ conformance-%: clean all
7373
@sleep 30 # Give addons a little time to start
7474
@cd hack/$*-node && ./conformance-test.sh
7575

76+
#TODO: curl/sed "vendored" libs is gross - come up with something better
7677
vendor:
7778
@dep ensure -v
79+
@curl https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.3/pkg/kubelet/util/util.go | sed 's/^package util$$/package internal/' > pkg/checkpoint/internal/util.go
80+
@curl https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.3/pkg/kubelet/util/util_unix.go | sed 's/^package util$$/package internal/' > pkg/checkpoint/internal/util_unix.go
7881
@CGO_ENABLED=1 go build -o _output/bin/license-bill-of-materials ./vendor/github.com/coreos/license-bill-of-materials
7982
@./_output/bin/license-bill-of-materials ./cmd/bootkube ./cmd/checkpoint > bill-of-materials.json
8083

‎hack/jenkins/scripts/conformance.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
export KUBECONFIG="${KUBECONFIG:-"${DIR}/../../quickstart/cluster/auth/kubeconfig"}"
5-
export KUBERNETES_VERSION="v1.10.2"
5+
export KUBERNETES_VERSION="v1.10.3"
66

77
# Set up kubectl
88
curl -L -O -v https://storage.googleapis.com/kubernetes-release/release/$KUBERNETES_VERSION/bin/linux/amd64/kubectl

‎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=docker://k8s.gcr.io/hyperkube
12-
Environment=KUBELET_IMAGE_TAG=v1.10.2
12+
Environment=KUBELET_IMAGE_TAG=v1.10.3
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 var-lib-kubelet,kind=host,source=/var/lib/kubelet \

‎hack/quickstart/kubelet.service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Service]
22
EnvironmentFile=-/etc/kubernetes/kubelet.env
33
Environment=KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube
4-
Environment=KUBELET_IMAGE_TAG=v1.10.2
4+
Environment=KUBELET_IMAGE_TAG=v1.10.3
55
Environment=KUBELET_MINIMUM_CONTAINER_TTL_DURATION=3m0s
66
Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS=-1
77
Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS_PER_CONTAINER=1

‎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=docker://k8s.gcr.io/hyperkube
12-
Environment=KUBELET_IMAGE_TAG=v1.10.2
12+
Environment=KUBELET_IMAGE_TAG=v1.10.3
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 var-lib-kubelet,kind=host,source=/var/lib/kubelet \

‎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/kubernetes/kubernetes}
5-
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.10.2}
5+
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.10.3}
66

77
usage() {
88
echo "USAGE:"

‎pkg/asset/images.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ var DefaultImages = ImageVersions{
77
FlannelCNI: "quay.io/coreos/flannel-cni:v0.3.0",
88
Calico: "quay.io/calico/node:v3.0.3",
99
CalicoCNI: "quay.io/calico/cni:v2.0.0",
10-
Hyperkube: "k8s.gcr.io/hyperkube:v1.10.2",
11-
KubeDNS: "k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.9",
12-
KubeDNSMasq: "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.9",
13-
KubeDNSSidecar: "k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.9",
10+
Hyperkube: "k8s.gcr.io/hyperkube:v1.10.3",
11+
KubeDNS: "k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.10",
12+
KubeDNSMasq: "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.10",
13+
KubeDNSSidecar: "k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.10",
1414
PodCheckpointer: "quay.io/coreos/pod-checkpointer:9dc83e1ab3bc36ca25c9f7c18ddef1b91d4a0558",
1515
}

‎pkg/checkpoint/internal/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Copied from pkg/kubelet/util to prevent importing kubernetes
22

33
```
4-
wget https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.2/pkg/kubelet/util/util_unix.go
5-
wget https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.2/pkg/kubelet/util/util.go
4+
wget https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.3/pkg/kubelet/util/util_unix.go
5+
wget https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.3/pkg/kubelet/util/util.go
66
```

0 commit comments

Comments
 (0)