From 15b0ff80e3d7ad70424a95a93e49b18dffc2c827 Mon Sep 17 00:00:00 2001
From: wojtekt <wojtekt@google.com>
Date: Tue, 2 Jul 2019 09:28:02 +0200
Subject: [PATCH] Move etcd/util to etcd3/

Kubernetes-commit: 23d9d6b1d0f835d7b342773149ded2c89c6b4507
---
 pkg/storage/etcd/OWNERS                       | 27 -------------------
 pkg/storage/etcd/doc.go                       | 17 ------------
 pkg/storage/etcd/util/doc.go                  | 19 -------------
 .../etcd_util.go => etcd3/healthcheck.go}     |  4 ++-
 .../healthcheck_test.go}                      |  2 +-
 5 files changed, 4 insertions(+), 65 deletions(-)
 delete mode 100644 pkg/storage/etcd/OWNERS
 delete mode 100644 pkg/storage/etcd/doc.go
 delete mode 100644 pkg/storage/etcd/util/doc.go
 rename pkg/storage/{etcd/util/etcd_util.go => etcd3/healthcheck.go} (86%)
 rename pkg/storage/{etcd/util/etcd_util_test.go => etcd3/healthcheck_test.go} (98%)

diff --git a/pkg/storage/etcd/OWNERS b/pkg/storage/etcd/OWNERS
deleted file mode 100644
index bb4ad2a4c..000000000
--- a/pkg/storage/etcd/OWNERS
+++ /dev/null
@@ -1,27 +0,0 @@
-# See the OWNERS docs at https://go.k8s.io/owners
-
-reviewers:
-- lavalamp
-- smarterclayton
-- wojtek-t
-- deads2k
-- derekwaynecarr
-- caesarxuchao
-- mikedanese
-- liggitt
-- davidopp
-- pmorie
-- luxas
-- janetkuo
-- roberthbailey
-- tallclair
-- timothysc
-- dims
-- hongchaodeng
-- krousey
-- fgrzadkowski
-- resouer
-- pweil-
-- mqliang
-- feihujiang
-- enj
diff --git a/pkg/storage/etcd/doc.go b/pkg/storage/etcd/doc.go
deleted file mode 100644
index 566f46651..000000000
--- a/pkg/storage/etcd/doc.go
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package etcd // import "k8s.io/apiserver/pkg/storage/etcd"
diff --git a/pkg/storage/etcd/util/doc.go b/pkg/storage/etcd/util/doc.go
deleted file mode 100644
index 97241a44f..000000000
--- a/pkg/storage/etcd/util/doc.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package util holds generic etcd-related utility functions that any user of ectd might want to
-// use, without pulling in kubernetes-specific code.
-package util // import "k8s.io/apiserver/pkg/storage/etcd/util"
diff --git a/pkg/storage/etcd/util/etcd_util.go b/pkg/storage/etcd3/healthcheck.go
similarity index 86%
rename from pkg/storage/etcd/util/etcd_util.go
rename to pkg/storage/etcd3/healthcheck.go
index 9b98403bd..ad051d2d6 100644
--- a/pkg/storage/etcd/util/etcd_util.go
+++ b/pkg/storage/etcd3/healthcheck.go
@@ -14,18 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
+package etcd3
 
 import (
 	"encoding/json"
 	"fmt"
 )
 
+// etcdHealth encodes data returned from etcd /healthz handler.
 type etcdHealth struct {
 	// Note this has to be public so the json library can modify it.
 	Health string `json:"health"`
 }
 
+// EtcdHealthCheck decodes data returned from etcd /healthz handler.
 func EtcdHealthCheck(data []byte) error {
 	obj := etcdHealth{}
 	if err := json.Unmarshal(data, &obj); err != nil {
diff --git a/pkg/storage/etcd/util/etcd_util_test.go b/pkg/storage/etcd3/healthcheck_test.go
similarity index 98%
rename from pkg/storage/etcd/util/etcd_util_test.go
rename to pkg/storage/etcd3/healthcheck_test.go
index b06932e4f..551a27594 100644
--- a/pkg/storage/etcd/util/etcd_util_test.go
+++ b/pkg/storage/etcd3/healthcheck_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
+package etcd3
 
 import (
 	"testing"