From de66b35a0a4eb792fafb72d424dacf6244be9c36 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Fri, 17 Jul 2020 16:06:05 -0400
Subject: [PATCH] release v1.12.1

---
 CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++
 Makefile     |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c0834aa54..9e4af5dd68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Release Notes
 
+## Version 1.12.1 - 2020-07-17
+
+Features:
+* Add support for Calico CNI (--cni=calico) [#8571](https://github.com/kubernetes/minikube/pull/8571)
+
+Bug Fixes:
+* Fix bugs which prevented upgrades from v1.0+ to v1.12 [#8741](https://github.com/kubernetes/minikube/pull/8741)
+* Add KicBaseImage to existing config if missing (fixes v1.9.x upgrade) [#8738](https://github.com/kubernetes/minikube/pull/8738)
+* add required quote to alias kubectl [#8747](https://github.com/kubernetes/minikube/pull/8747)
+* multinode: fix control plane not ready on restart [#8698](https://github.com/kubernetes/minikube/pull/8698)
+* none CNI: error if portmap plug-in is required but unavailable [#8684](https://github.com/kubernetes/minikube/pull/8684)
+
+Version Upgrades:
+* ingress addon: bump to latest version [#8705](https://github.com/kubernetes/minikube/pull/8705)
+* Upgrade go version to 1.14.4 [#8660](https://github.com/kubernetes/minikube/pull/8660)
+
+Huge thank you for this release towards our contributors: 
+- Anders F Björklund
+- Harsh Modi
+- James Lucktaylor
+- Medya Ghazizadeh
+- Michael Vorburger ⛑️
+- Prasad Katti
+- Priya Wadhwa
+- RA489
+- Sharif Elgamal
+- Sun-Li Beatteay
+- Tam Mach
+- Thomas Strömberg
+- jinhong.kim
+
+
+
 ## Version 1.12.0 - 2020-07-09
 
 Features:
diff --git a/Makefile b/Makefile
index 4cbddae67c..d059bfc458 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # Bump these on release - and please check ISO_VERSION for correctness.
 VERSION_MAJOR ?= 1
 VERSION_MINOR ?= 12
-VERSION_BUILD ?= 0
+VERSION_BUILD ?= 1
 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 VERSION ?= v$(RAW_VERSION)