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

Commit

Permalink
Merge pull request #171 from aaronlevy/v1.4.4
Browse files Browse the repository at this point in the history
V1.4.4
  • Loading branch information
aaronlevy authored Nov 1, 2016
2 parents 851de25 + 96ce0f8 commit 086bb11
Show file tree
Hide file tree
Showing 18 changed files with 157 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ conformance-%: clean all
#TODO(aaron): the k8s.io/client-go upstream package is a symlink with relative path. Making note because we change symlink path.
# This will naively try and create a vendor dir from a k8s release
# USE: make vendor VENDOR_VERSION=vX.Y.Z
VENDOR_VERSION = v1.4.3+coreos.0
VENDOR_VERSION = v1.4.4+coreos.0
vendor:
@echo "Creating k8s vendor for: $(VENDOR_VERSION)"
@rm -rf vendor
Expand Down
2 changes: 1 addition & 1 deletion hack/multi-node/user-data.sample
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ coreos:
[Service]
EnvironmentFile=/etc/environment
Environment=KUBELET_ACI=quay.io/coreos/hyperkube
Environment=KUBELET_VERSION=v1.4.3_coreos.0
Environment=KUBELET_VERSION=v1.4.4_coreos.0
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests
ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets
Expand Down
2 changes: 1 addition & 1 deletion hack/single-node/user-data.sample
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ coreos:
[Service]
EnvironmentFile=/etc/environment
Environment=KUBELET_ACI=quay.io/coreos/hyperkube
Environment=KUBELET_VERSION=v1.4.3_coreos.0
Environment=KUBELET_VERSION=v1.4.4_coreos.0
ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests
ExecStartPre=/bin/mkdir -p /etc/kubernetes/checkpoint-secrets
Expand Down
2 changes: 1 addition & 1 deletion hack/tests/conformance-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -euo pipefail

CHECK_NODE_COUNT=${CHECK_NODE_COUNT:-true}
CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/coreos/kubernetes}
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.4.3+coreos.0}
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.4.4+coreos.0}
TEST_ARGS=${TEST_ARGS:-"--ginkgo.focus='\[Conformance\]' --ginkgo.skip='\[Flaky\]|\[Feature:.+\]'"}

usage() {
Expand Down
10 changes: 5 additions & 5 deletions pkg/asset/internal/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: kubelet
image: quay.io/coreos/hyperkube:v1.4.3_coreos.0
image: quay.io/coreos/hyperkube:v1.4.4_coreos.0
command:
- /nsenter
- --target=1
Expand Down Expand Up @@ -131,7 +131,7 @@ spec:
- mountPath: /etc/kubernetes/manifests
name: etc-k8s-manifests
- name: kube-apiserver
image: quay.io/coreos/hyperkube:v1.4.3_coreos.0
image: quay.io/coreos/hyperkube:v1.4.4_coreos.0
command:
- /hyperkube
- apiserver
Expand Down Expand Up @@ -187,7 +187,7 @@ spec:
spec:
containers:
- name: kube-controller-manager
image: quay.io/coreos/hyperkube:v1.4.3_coreos.0
image: quay.io/coreos/hyperkube:v1.4.4_coreos.0
command:
- ./hyperkube
- controller-manager
Expand Down Expand Up @@ -225,7 +225,7 @@ spec:
spec:
containers:
- name: kube-scheduler
image: quay.io/coreos/hyperkube:v1.4.3_coreos.0
image: quay.io/coreos/hyperkube:v1.4.4_coreos.0
command:
- ./hyperkube
- scheduler
Expand All @@ -247,7 +247,7 @@ spec:
hostNetwork: true
containers:
- name: kube-proxy
image: quay.io/coreos/hyperkube:v1.4.3_coreos.0
image: quay.io/coreos/hyperkube:v1.4.4_coreos.0
command:
- /hyperkube
- proxy
Expand Down
2 changes: 1 addition & 1 deletion vendor/k8s.io/kubernetes/pkg/api/v1/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 086bb11

Please sign in to comment.