From 79e1b4e99d55a74bb4272055274ef300baaf2594 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 10 Jun 2021 11:34:06 -0700
Subject: [PATCH] Bump Makefile for 1.21.0 release

---
 CHANGELOG.md                           | 31 ++++++++++++++++++++++++++
 Makefile                               |  2 +-
 hack/benchmark/time-to-k8s/time-to-k8s |  1 -
 3 files changed, 32 insertions(+), 2 deletions(-)
 delete mode 160000 hack/benchmark/time-to-k8s/time-to-k8s

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5de17385e3..4e2531559c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # Release Notes
 
+## Version 1.21.0 - 2021-06-10
+* add more polish translations [#11587](https://github.com/kubernetes/minikube/pull/11587)
+* Modify MetricsServer to use v1 api version (instead of v1beta1). [#11584](https://github.com/kubernetes/minikube/pull/11584)
+
+For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md).
+
+Thank you to our contributors for this release!
+
+- Andriy Dzikh
+- Ilya Zuyev
+- JacekDuszenko
+- Medya Ghazizadeh
+- Sharif Elgamal
+- Steven Powell
+
+Thank you to our PR reviewers for this release!
+
+- spowelljr (11 comments)
+- medyagh (2 comments)
+- sharifelgamal (2 comments)
+- andriyDev (1 comments)
+
+Thank you to our triage members for this release!
+
+- RA489 (12 comments)
+- andriyDev (10 comments)
+- sharifelgamal (10 comments)
+- JacekDuszenko (7 comments)
+- spowelljr (5 comments)
+
+
 ## Version 1.21.0-beta.0 - 2021-06-02
 Features:
 * Support setting addons from environmental variables [#11469](https://github.com/kubernetes/minikube/pull/11469)
diff --git a/Makefile b/Makefile
index 1802a96575..ce1c5dd247 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 ?= 21
-VERSION_BUILD ?= 0-beta.0
+VERSION_BUILD ?= 0
 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 VERSION ?= v$(RAW_VERSION)
 
diff --git a/hack/benchmark/time-to-k8s/time-to-k8s b/hack/benchmark/time-to-k8s/time-to-k8s
deleted file mode 160000
index 72506e9487..0000000000
--- a/hack/benchmark/time-to-k8s/time-to-k8s
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 72506e948764aeeafc01e58e6bec0ea741c61ca0