Update to Kubernetes 1.15.0 (#168)

* Update support policy Signed-off-by: Stephen Augustus <saugustus@vmware.com> * Update to Kubernetes 1.15.0 Signed-off-by: Stephen Augustus <saugustus@vmware.com>
kubernetes-sigs · Jun 30, 2019 · 64cf981 · 64cf981
1 parent 9b553da
commit 64cf981
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -30,19 +30,19 @@ TODO
 
 This provider's versions are compatible with the following versions of Cluster API:
 
-||Cluster API 0.0.x|Cluster API 0.1 (unreleased)|Cluster API 0.2 (unreleased)|
-|-|-|-|-|
-|Azure Provider 0.1 (unreleased)|✓|✓|-|
-|Azure Provider 0.2 (unreleased)|x|x|✓|
+|  | Cluster API `v1alpha1` (`v0.1.x`) | Cluster API `v1alpha2` (`v0.2.x`) (unreleased) |
+|---|---|---|
+|Azure Provider `v0.2.x` | ✓ |  |
+|Azure Provider `v0.3.x` |  | ✓ |
 
 This provider's versions are able to install and manage the following versions of Kubernetes:
 
-||Kubernetes 1.13|Kubernetes 1.14 (unreleased)|
-|-|-|-|
-|Azure Provider 0.1 (unreleased)|✓|? (Currently untested)|
-|Azure Provider 0.2 (unreleased)|x|✓|
+|  | Azure Provider `v0.2.x` | Azure Provider `v0.3.x` (unreleased) |
+|---|---|---|
+| Kubernetes 1.13 | ✓ |  |
+| Kubernetes 1.14 | ✓ | ✓ |
+| Kubernetes 1.15 | ✓ | ✓ |
 
-In general, Cluster API for Azure will remain in lock-step with Cluster API versioning in terms of support e.g., Azure Provider `v0.x` will maintain compatibility with Cluster API `v0.x`.
 
 Each version of Cluster API for Azure will attempt to support two Kubernetes versions e.g., Cluster API for Azure `v0.1` may support Kubernetes 1.13 and Kubernetes 1.14.
 

diff --git a/WORKSPACE b/WORKSPACE
@@ -119,7 +119,7 @@ go_repository(
 go_repository(
     name = "io_k8s_kubernetes",
     importpath = "k8s.io/kubernetes",
-    tag = "v1.14.3",
+    tag = "v1.15.0",
 )
 
 go_repository(

diff --git a/cmd/clusterctl/examples/azure/generate-yaml.sh b/cmd/clusterctl/examples/azure/generate-yaml.sh
@@ -26,15 +26,15 @@ ENVSUBST=${ENVSUBST:-envsubst}
 RANDOM_STRING=$(date | md5sum | head -c8)
 
 # Azure settings.
-export LOCATION="${LOCATION:-eastus2}"
+export LOCATION="${LOCATION:-eastus}"
 export RESOURCE_GROUP="${RESOURCE_GROUP:-capi-${RANDOM_STRING}}"
 
 # Cluster settings.
 export CLUSTER_NAME="${CLUSTER_NAME:-test1}"
 export VNET_NAME="${VNET_NAME:-}"
 
 # Machine settings.
-export KUBERNETES_VERSION="${KUBERNETES_VERSION:-1.14.3}"
+export KUBERNETES_VERSION="${KUBERNETES_VERSION:-1.15.0}"
 export CONTROL_PLANE_MACHINE_TYPE="${CONTROL_PLANE_MACHINE_TYPE:-Standard_B2ms}"
 export NODE_MACHINE_TYPE="${NODE_MACHINE_TYPE:-Standard_B2ms}"
 

diff --git a/docs/release-notes-template.md b/docs/release-notes-template.md
@@ -3,6 +3,11 @@
 
 <!-- Replace with a short description of the overarching theme for this release -->
 
+## Action Required
+
+<!-- Detail actions required to use new version -->
+-
+
 ## Breaking changes
 
 <!-- List breaking changes since last version -->

diff --git a/docs/releasing.md b/docs/releasing.md
@@ -48,7 +48,7 @@ Example versions:
 ## Expected artifacts
 
 1. A container image containing the azure-provider manager binary
-2. A release tarball containing the manifest-templates and a script to generate     the actual manifests
+2. A release tarball containing the manifest-templates and a script to generate the actual manifests
 3. `clusterctl`
 4. Release notes
 

diff --git a/pkg/cloud/azure/actuators/machine/actuator_test.go b/pkg/cloud/azure/actuators/machine/actuator_test.go
@@ -80,8 +80,8 @@ func newMachine(t *testing.T, machineConfig v1alpha1.AzureMachineProviderSpec, l
 		Spec: clusterv1.MachineSpec{
 			ProviderSpec: *providerSpec,
 			Versions: clusterv1.MachineVersionInfo{
-				Kubelet:      "1.14.3",
-				ControlPlane: "1.14.3",
+				Kubelet:      "1.15.0",
+				ControlPlane: "1.15.0",
 			},
 		},
 	}