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

Commit 9a5df8a

Browse files
aaronlevyaaronlevy
authored
Merge pull request #701 from aaronlevy/v1.7.5
Bump k8s V1.7.5
2 parents 5742100 + 4745460 commit 9a5df8a

Some content is hidden

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

64 files changed

+2089
-1464
lines changed

‎bill-of-materials.json‎

Lines changed: 126 additions & 386 deletions
Large diffs are not rendered by default.

‎glide.lock‎

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

‎glide.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import:
3030
- pkg/util/wait
3131
- pkg/watch
3232
- package: k8s.io/client-go
33-
version: v4.0.0-beta.0
33+
version: v4.0.0
3434
subpackages:
3535
- kubernetes
3636
- pkg/api
@@ -39,7 +39,7 @@ import:
3939
- tools/cache
4040
- tools/clientcmd
4141
- package: k8s.io/kubernetes
42-
version: v1.7.3
42+
version: v1.7.5
4343
subpackages:
4444
- pkg/kubectl/cmd/util
4545
- pkg/kubectl/resource
@@ -52,4 +52,4 @@ import:
5252
- ssh/agent
5353
- curve25519
5454
- package: github.com/coreos/ktestutil
55-
version: 1c5a59f93ffab7cf69fde8b805fee942fd467cdc
55+
version: 1c5a59f93ffab7cf69fde8b805fee942fd467cdc

‎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.3_coreos.0
12+
Environment=KUBELET_IMAGE_TAG=v1.7.5_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.3_coreos.0
3+
Environment=KUBELET_IMAGE_TAG=v1.7.5_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.3_coreos.0
3+
Environment=KUBELET_IMAGE_TAG=v1.7.5_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.3_coreos.0
12+
Environment=KUBELET_IMAGE_TAG=v1.7.5_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.3+coreos.0}
5+
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.7.5+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.2.0",
99
Calico: "quay.io/calico/node:v2.4.0",
1010
CalicoCNI: "quay.io/calico/cni:v1.10.0",
11-
Hyperkube: "quay.io/coreos/hyperkube:v1.7.3_coreos.0",
11+
Hyperkube: "quay.io/coreos/hyperkube:v1.7.5_coreos.0",
1212
Kenc: "quay.io/coreos/kenc:0.0.2",
1313
KubeDNS: "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4",
1414
KubeDNSMasq: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4",

‎vendor/github.com/Azure/go-autorest/autorest/adal/README.md‎

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

0 commit comments

Comments
 (0)