From 0aefb48f5c1073e9eeee389bd2c98981c5454f57 Mon Sep 17 00:00:00 2001
From: Matt Rickard <mrick@google.com>
Date: Thu, 6 Apr 2017 15:01:41 -0700
Subject: [PATCH] Cut 0.18.0 release

---
 CHANGELOG.md                                     | 16 ++++++++++++++++
 .../CHANGELOG.md => ISO_CHANGELOG.md             |  9 +++++++++
 Makefile                                         |  7 ++++---
 3 files changed, 29 insertions(+), 3 deletions(-)
 rename deploy/iso/minikube-iso/CHANGELOG.md => ISO_CHANGELOG.md (70%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bbfdc5cd3..869d0aa7f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Minikube Release Notes
 
+## Version 0.18.0 - 4/6/2017
+* Upgraded default kubernetes version to v1.6.0
+* Mount command on macOS xhyve
+* Pods can now write to files mounted by `minikube mount` 
+* Added `addon configure` command
+* Made DNS domain configurable with `--dns-domain` flag to `minikube start`
+* Upgraded Kubernetes Dashboard to 1.6.0
+* Removed Boot2Docker ISO support
+* Added `addons disable default-storageclass` command to disable default dynamic provisioner
+* Added support for private docker registry in registry-creds addon
+* Added `--f` flag to `minikube logs` to stream logs
+* Added `--docker-opts` flag to `minikube start` to propagate docker options to the daemon
+* Updated heapster addon to v1.3.0
+* Updated ingress addon to v0.9-beta.3
+* Made localkube versions backwards compatible for versions without `--apiserver-name`
+
 ## Version 0.17.1 - 3/2/2017
 * Removed vendored KVM driver so minikube doesn't have a dependency on libvirt-bin
 
diff --git a/deploy/iso/minikube-iso/CHANGELOG.md b/ISO_CHANGELOG.md
similarity index 70%
rename from deploy/iso/minikube-iso/CHANGELOG.md
rename to ISO_CHANGELOG.md
index 1f13c7b68b..202d1f3afd 100644
--- a/deploy/iso/minikube-iso/CHANGELOG.md
+++ b/ISO_CHANGELOG.md
@@ -1,5 +1,14 @@
 # Minikube ISO Release Notes
 
+## Version 0.18.0 - 4/6/2017
+* ISO will now be versioned the same as minikube
+* Added timezone data
+* Added `jq` and `coreutils` packages
+* Enabled RDB Kernel module
+* Added dockerized build for iso image
+* Enabled NFS_v4_2 in kernel
+* Added CIFS-utils
+
 ## Version 1.0.7 - 3/2/2017
 * Added ethtool
 * Added bootlocal.sh script for custom startup options
diff --git a/Makefile b/Makefile
index f393f04f43..13e481459a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@
 
 # Bump these on release
 VERSION_MAJOR ?= 0
-VERSION_MINOR ?= 17
-VERSION_BUILD ?= 1
+VERSION_MINOR ?= 18
+VERSION_BUILD ?= 0
 VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR)-$(VERSION_BUILD)
 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
@@ -24,7 +24,8 @@ REGISTRY?=gcr.io/k8s-minikube
 DARWIN_BUILD_IMAGE ?= karalabe/xgo-1.7.3
 ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image
 
-ISO_VERSION ?= v1.0.7
+# The iso will be versioned the same as minikube
+ISO_VERSION ?= $(VERSION)
 ISO_BUCKET ?= minikube/iso
 
 GOOS ?= $(shell go env GOOS)