Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

Commit

Permalink
K8s v1.7.5 (#1381)
Browse files Browse the repository at this point in the history
* feat(k8s): Bump k8s to v1.7.5

* chore(dev): make k8s v1.7.5 default in Docker builds
  • Loading branch information
seanknox authored and jackfrancis committed Aug 31, 2017
1 parent 99f60bd commit f4e6ef4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN mkdir /tmp/azurecli \

RUN curl -fsSL https://get.docker.com/ | sh

ENV KUBECTL_VERSION 1.6.6
ENV KUBECTL_VERSION 1.7.5
RUN curl "https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" > /usr/local/bin/kubectl \
&& chmod +x /usr/local/bin/kubectl

Expand Down
6 changes: 3 additions & 3 deletions pkg/acsengine/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,17 @@ const (
// For instance, Kubernetes release "1.7" would contain the version "1.7.2"
var KubeConfigs = map[string]map[string]string{
api.KubernetesRelease1Dot7: {
"hyperkube": "hyperkube-amd64:v1.7.4",
"hyperkube": "hyperkube-amd64:v1.7.5",
"dashboard": "kubernetes-dashboard-amd64:v1.6.3",
"exechealthz": "exechealthz-amd64:1.2",
"addonresizer": "addon-resizer:1.7",
"heapster": "heapster-amd64:v1.4.1",
"heapster": "heapster-amd64:v1.4.2",
"dns": "k8s-dns-kube-dns-amd64:1.14.4",
"addonmanager": "kube-addon-manager-amd64:v6.4-beta.2",
"dnsmasq": "k8s-dns-dnsmasq-amd64:1.14.4",
"pause": "pause-amd64:3.0",
"tiller": DefaultTillerImage,
"windowszip": "v1.7.2intwinnat.zip",
"windowszip": "v1.7.5-1intwinnat.zip",
"nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency,
"nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod,
"podeviction": DefaultKubernetesCtrlMgrPodEvictionTimeout,
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/common/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const (

// KubeReleaseToVersion maps a major.minor release to an full major.minor.patch version
var KubeReleaseToVersion = map[string]string{
KubernetesRelease1Dot7: "1.7.4",
KubernetesRelease1Dot7: "1.7.5",
KubernetesRelease1Dot6: "1.6.6",
KubernetesRelease1Dot5: "1.5.7",
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ var DCOSReleaseToVersion = map[string]string{

// KubernetesReleaseToVersion maps a major.minor release to an full major.minor.patch version
var KubernetesReleaseToVersion = map[string]string{
KubernetesRelease1Dot7: "1.7.4",
KubernetesRelease1Dot7: "1.7.5",
KubernetesRelease1Dot6: "1.6.6",
KubernetesRelease1Dot5: "1.5.7",
}
Expand Down

0 comments on commit f4e6ef4

Please sign in to comment.