diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index cbb2b49ad..09d6ec409 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -920,7 +920,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "13f29098a509"
+			"Rev": "0097618c6e4c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
diff --git a/go.mod b/go.mod
index ef5cdf6de..14bc73625 100644
--- a/go.mod
+++ b/go.mod
@@ -51,7 +51,7 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20210518101607-13f29098a509
+	k8s.io/api => k8s.io/api v0.0.0-20210505141115-0097618c6e4c
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210518100456-fda713515979
 	k8s.io/client-go => k8s.io/client-go v0.0.0-20210518102924-2ed8b3081056
 	k8s.io/component-base => k8s.io/component-base v0.0.0-20210518111232-44faecbf614e
diff --git a/go.sum b/go.sum
index 9a65e45f4..aa6e97fed 100644
--- a/go.sum
+++ b/go.sum
@@ -674,8 +674,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.0.0-20210518101607-13f29098a509 h1:+1GipftN626FJVaUP8O0o0pgeqGunyS22Ng4hZYulvI=
-k8s.io/api v0.0.0-20210518101607-13f29098a509/go.mod h1:IgKLK42qxUHnMxdcdbEBFOo+TfTANemQTLg3gcGe8/M=
+k8s.io/api v0.0.0-20210505141115-0097618c6e4c h1:QmszvJU0uDvIUanyZ0QhOYfZaILVvbkLJbRM7Ve3nts=
+k8s.io/api v0.0.0-20210505141115-0097618c6e4c/go.mod h1:IgKLK42qxUHnMxdcdbEBFOo+TfTANemQTLg3gcGe8/M=
 k8s.io/apimachinery v0.0.0-20210518100456-fda713515979 h1:qjGp8QxGJZSGSMQw31AFuI2za6IEfDmdJ5/cY+Eeas8=
 k8s.io/apimachinery v0.0.0-20210518100456-fda713515979/go.mod h1:fBRSkoylGO2QUTae8Wb2wac6pZ83/r+tL6HFSXGbzfs=
 k8s.io/client-go v0.0.0-20210518102924-2ed8b3081056 h1:t4nxl6RpDRcvk1H0shNODINaiDEcBvGozB+ufxikbiA=
diff --git a/pkg/storage/storagebackend/config.go b/pkg/storage/storagebackend/config.go
index 500e55c02..45f0d6f4a 100644
--- a/pkg/storage/storagebackend/config.go
+++ b/pkg/storage/storagebackend/config.go
@@ -27,6 +27,7 @@ import (
 
 const (
 	StorageTypeUnset = ""
+	StorageTypeETCD2 = "etcd2"
 	StorageTypeETCD3 = "etcd3"
 
 	DefaultCompactInterval      = 5 * time.Minute
diff --git a/pkg/storage/storagebackend/factory/factory.go b/pkg/storage/storagebackend/factory/factory.go
index 1e8a8cdb0..fb1e2d289 100644
--- a/pkg/storage/storagebackend/factory/factory.go
+++ b/pkg/storage/storagebackend/factory/factory.go
@@ -30,8 +30,8 @@ type DestroyFunc func()
 // Create creates a storage backend based on given config.
 func Create(c storagebackend.Config, newFunc func() runtime.Object) (storage.Interface, DestroyFunc, error) {
 	switch c.Type {
-	case "etcd2":
-		return nil, nil, fmt.Errorf("%v is no longer a supported storage backend", c.Type)
+	case storagebackend.StorageTypeETCD2:
+		return nil, nil, fmt.Errorf("%s is no longer a supported storage backend", c.Type)
 	case storagebackend.StorageTypeUnset, storagebackend.StorageTypeETCD3:
 		return newETCD3Storage(c, newFunc)
 	default:
@@ -42,8 +42,8 @@ func Create(c storagebackend.Config, newFunc func() runtime.Object) (storage.Int
 // CreateHealthCheck creates a healthcheck function based on given config.
 func CreateHealthCheck(c storagebackend.Config) (func() error, error) {
 	switch c.Type {
-	case "etcd2":
-		return nil, fmt.Errorf("%v is no longer a supported storage backend", c.Type)
+	case storagebackend.StorageTypeETCD2:
+		return nil, fmt.Errorf("%s is no longer a supported storage backend", c.Type)
 	case storagebackend.StorageTypeUnset, storagebackend.StorageTypeETCD3:
 		return newETCD3HealthCheck(c)
 	default: