From 70fc9a82edfe5ee1109f4c7c1ff8b4d39709c18a Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Wed, 2 Nov 2016 14:03:52 -0700 Subject: [PATCH] k8s: v1.4.4 -> v1.4.5 --- docs/kubernetes.md | 6 +++--- pkg/acsengine/const.go | 4 ++-- .../testdata/disks-storageaccount/kubernetes_expected.json | 4 ++-- .../disks-storageaccount/kubernetes_expected_params.json | 4 ++-- .../testdata/largeclusters/kubernetes_expected.json | 4 ++-- .../testdata/largeclusters/kubernetes_expected_params.json | 4 ++-- pkg/acsengine/testdata/simple/kubernetes_expected.json | 4 ++-- .../testdata/simple/kubernetes_expected_params.json | 4 ++-- pkg/acsengine/testdata/vnet/kubernetesvnet_expected.json | 4 ++-- .../testdata/vnet/kubernetesvnet_expected_params.json | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/kubernetes.md b/docs/kubernetes.md index dfcf59526..95868a476 100644 --- a/docs/kubernetes.md +++ b/docs/kubernetes.md @@ -83,9 +83,9 @@ After completing this walkthrough you will know how to: ![Image of browsing to nginx](images/kubernetes-nginx4.png) 8. The next step in this walkthrough is to show you how to remotely manage your Kubernetes cluster. First download Kubectl to your machine and put it in your path: - * [Windows Kubectl](https://storage.googleapis.com/kubernetes-release/release/v1.4.4/bin/windows/amd64/kubectl.exe) - * [OSX Kubectl](https://storage.googleapis.com/kubernetes-release/release/v1.4.4/bin/darwin/amd64/kubectl) - * [Linux](https://storage.googleapis.com/kubernetes-release/release/v1.4.4/bin/linux/amd64/kubectl) + * [Windows Kubectl](https://storage.googleapis.com/kubernetes-release/release/v1.4.5/bin/windows/amd64/kubectl.exe) + * [OSX Kubectl](https://storage.googleapis.com/kubernetes-release/release/v1.4.5/bin/darwin/amd64/kubectl) + * [Linux](https://storage.googleapis.com/kubernetes-release/release/v1.4.5/bin/linux/amd64/kubectl) 9. The Kubernetes master contains the kube config file for remote access under the home directory ~/.kube/config. Download this file to your machine, set the KUBECONFIG environment variable, and run kubectl to verify you can connect to cluster: * Windows to use pscp from [putty](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html). Ensure you have your certificate exposed through [pageant](SSHKeyManagement.md#key-management-and-agent-forwarding-with-windows-pageant): diff --git a/pkg/acsengine/const.go b/pkg/acsengine/const.go index f39d00680..7b0c9608c 100644 --- a/pkg/acsengine/const.go +++ b/pkg/acsengine/const.go @@ -19,10 +19,10 @@ const ( DefaultKubernetesClusterDomain = "cluster.local" // DefaultKubernetesHyperkubeSpec is the default version used for Kubernetes setup // The latest stable version can be found here: https://storage.googleapis.com/kubernetes-release/release/stable.txt - DefaultKubernetesHyperkubeSpec = "gcr.io/google_containers/hyperkube-amd64:v1.4.4" + DefaultKubernetesHyperkubeSpec = "gcr.io/google_containers/hyperkube-amd64:v1.4.5" // DefaultKubectlVersion is the version used for kubectl // The latest stable version can be found here: https://storage.googleapis.com/kubernetes-release/release/stable.txt - DefaultKubectlVersion = "v1.4.4" + DefaultKubectlVersion = "v1.4.5" ) const ( diff --git a/pkg/acsengine/testdata/disks-storageaccount/kubernetes_expected.json b/pkg/acsengine/testdata/disks-storageaccount/kubernetes_expected.json index a6f06f86c..5f15e419b 100644 --- a/pkg/acsengine/testdata/disks-storageaccount/kubernetes_expected.json +++ b/pkg/acsengine/testdata/disks-storageaccount/kubernetes_expected.json @@ -448,14 +448,14 @@ "type": "securestring" }, "kubectlVersion": { - "defaultValue": "v1.4.4", + "defaultValue": "v1.4.5", "metadata": { "description": "The kubernetes version." }, "type": "string" }, "kubernetesHyperkubeSpec": { - "defaultValue": "gcr.io/google_containers/hyperkube-amd64:v1.4.4", + "defaultValue": "gcr.io/google_containers/hyperkube-amd64:v1.4.5", "metadata": { "description": "The container spec for hyperkube." }, diff --git a/pkg/acsengine/testdata/disks-storageaccount/kubernetes_expected_params.json b/pkg/acsengine/testdata/disks-storageaccount/kubernetes_expected_params.json index 0961beb7b..3a982f829 100644 --- a/pkg/acsengine/testdata/disks-storageaccount/kubernetes_expected_params.json +++ b/pkg/acsengine/testdata/disks-storageaccount/kubernetes_expected_params.json @@ -42,10 +42,10 @@ "value": "a3ViZUNvbmZpZ1ByaXZhdGVLZXk=" }, "kubectlVersion": { - "value": "v1.4.4" + "value": "v1.4.5" }, "kubernetesHyperkubeSpec": { - "value": "gcr.io/google_containers/hyperkube-amd64:v1.4.4" + "value": "gcr.io/google_containers/hyperkube-amd64:v1.4.5" }, "linuxAdminUsername": { "value": "azureuser" diff --git a/pkg/acsengine/testdata/largeclusters/kubernetes_expected.json b/pkg/acsengine/testdata/largeclusters/kubernetes_expected.json index e17022269..c50d37f50 100644 --- a/pkg/acsengine/testdata/largeclusters/kubernetes_expected.json +++ b/pkg/acsengine/testdata/largeclusters/kubernetes_expected.json @@ -2428,14 +2428,14 @@ "type": "securestring" }, "kubectlVersion": { - "defaultValue": "v1.4.4", + "defaultValue": "v1.4.5", "metadata": { "description": "The kubernetes version." }, "type": "string" }, "kubernetesHyperkubeSpec": { - "defaultValue": "gcr.io/google_containers/hyperkube-amd64:v1.4.4", + "defaultValue": "gcr.io/google_containers/hyperkube-amd64:v1.4.5", "metadata": { "description": "The container spec for hyperkube." }, diff --git a/pkg/acsengine/testdata/largeclusters/kubernetes_expected_params.json b/pkg/acsengine/testdata/largeclusters/kubernetes_expected_params.json index 3d91101ef..583f9f813 100644 --- a/pkg/acsengine/testdata/largeclusters/kubernetes_expected_params.json +++ b/pkg/acsengine/testdata/largeclusters/kubernetes_expected_params.json @@ -132,10 +132,10 @@ "value": "a3ViZUNvbmZpZ1ByaXZhdGVLZXk=" }, "kubectlVersion": { - "value": "v1.4.4" + "value": "v1.4.5" }, "kubernetesHyperkubeSpec": { - "value": "gcr.io/google_containers/hyperkube-amd64:v1.4.4" + "value": "gcr.io/google_containers/hyperkube-amd64:v1.4.5" }, "linuxAdminUsername": { "value": "azureuser" diff --git a/pkg/acsengine/testdata/simple/kubernetes_expected.json b/pkg/acsengine/testdata/simple/kubernetes_expected.json index 36456a7ac..6bc957ac7 100644 --- a/pkg/acsengine/testdata/simple/kubernetes_expected.json +++ b/pkg/acsengine/testdata/simple/kubernetes_expected.json @@ -448,14 +448,14 @@ "type": "securestring" }, "kubectlVersion": { - "defaultValue": "v1.4.4", + "defaultValue": "v1.4.5", "metadata": { "description": "The kubernetes version." }, "type": "string" }, "kubernetesHyperkubeSpec": { - "defaultValue": "gcr.io/google_containers/hyperkube-amd64:v1.4.4", + "defaultValue": "gcr.io/google_containers/hyperkube-amd64:v1.4.5", "metadata": { "description": "The container spec for hyperkube." }, diff --git a/pkg/acsengine/testdata/simple/kubernetes_expected_params.json b/pkg/acsengine/testdata/simple/kubernetes_expected_params.json index 0961beb7b..3a982f829 100644 --- a/pkg/acsengine/testdata/simple/kubernetes_expected_params.json +++ b/pkg/acsengine/testdata/simple/kubernetes_expected_params.json @@ -42,10 +42,10 @@ "value": "a3ViZUNvbmZpZ1ByaXZhdGVLZXk=" }, "kubectlVersion": { - "value": "v1.4.4" + "value": "v1.4.5" }, "kubernetesHyperkubeSpec": { - "value": "gcr.io/google_containers/hyperkube-amd64:v1.4.4" + "value": "gcr.io/google_containers/hyperkube-amd64:v1.4.5" }, "linuxAdminUsername": { "value": "azureuser" diff --git a/pkg/acsengine/testdata/vnet/kubernetesvnet_expected.json b/pkg/acsengine/testdata/vnet/kubernetesvnet_expected.json index 9b47a66ec..5e5640591 100644 --- a/pkg/acsengine/testdata/vnet/kubernetesvnet_expected.json +++ b/pkg/acsengine/testdata/vnet/kubernetesvnet_expected.json @@ -446,14 +446,14 @@ "type": "securestring" }, "kubectlVersion": { - "defaultValue": "v1.4.4", + "defaultValue": "v1.4.5", "metadata": { "description": "The kubernetes version." }, "type": "string" }, "kubernetesHyperkubeSpec": { - "defaultValue": "gcr.io/google_containers/hyperkube-amd64:v1.4.4", + "defaultValue": "gcr.io/google_containers/hyperkube-amd64:v1.4.5", "metadata": { "description": "The container spec for hyperkube." }, diff --git a/pkg/acsengine/testdata/vnet/kubernetesvnet_expected_params.json b/pkg/acsengine/testdata/vnet/kubernetesvnet_expected_params.json index 581e17229..d27e05feb 100644 --- a/pkg/acsengine/testdata/vnet/kubernetesvnet_expected_params.json +++ b/pkg/acsengine/testdata/vnet/kubernetesvnet_expected_params.json @@ -42,10 +42,10 @@ "value": "a3ViZUNvbmZpZ1ByaXZhdGVLZXk=" }, "kubectlVersion": { - "value": "v1.4.4" + "value": "v1.4.5" }, "kubernetesHyperkubeSpec": { - "value": "gcr.io/google_containers/hyperkube-amd64:v1.4.4" + "value": "gcr.io/google_containers/hyperkube-amd64:v1.4.5" }, "linuxAdminUsername": { "value": "azureuser"