kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename verify pkg to kverify

pull/6151/head
Medya Gh 2020-01-09 16:28:23 -08:00
parent b92c22ee5b
commit 59ecf3fd06
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/minikube/bootstrapper/bsutil/verify/verify.go → pkg/minikube/bootstrapper/bsutil/kverify/kverify.go
View File

@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Package verify takes care of making sure a running kubernetes cluster is healthy // Package kverify verifies a running kubernetes cluster is healthy
package verify package kverify
import ( import (
"crypto/tls" "crypto/tls"

12
pkg/minikube/bootstrapper/kicbs/kicbs.go
View File

@ -35,7 +35,7 @@ import (
"k8s.io/minikube/pkg/kapi" "k8s.io/minikube/pkg/kapi"
"k8s.io/minikube/pkg/minikube/bootstrapper" "k8s.io/minikube/pkg/minikube/bootstrapper"
"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil" "k8s.io/minikube/pkg/minikube/bootstrapper/bsutil"
"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/verify" "k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
"k8s.io/minikube/pkg/minikube/bootstrapper/images" "k8s.io/minikube/pkg/minikube/bootstrapper/images"
"k8s.io/minikube/pkg/minikube/command" "k8s.io/minikube/pkg/minikube/command"
"k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/config"
@ -247,7 +247,7 @@ func (k *Bootstrapper) restartCluster(k8s config.KubernetesConfig) error {
} }
// We must ensure that the apiserver is healthy before proceeding // We must ensure that the apiserver is healthy before proceeding
if err := verify.APIServerProcess(k.c, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil { if err := kverify.APIServerProcess(k.c, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
return errors.Wrap(err, "apiserver healthz") return errors.Wrap(err, "apiserver healthz")
} }
@ -256,7 +256,7 @@ func (k *Bootstrapper) restartCluster(k8s config.KubernetesConfig) error {
return errors.Wrap(err, "getting k8s client") return errors.Wrap(err, "getting k8s client")
} }
if err := verify.SystemPods(client, time.Now(), k8s.NodeIP, k8s.NodePort, kconst.DefaultControlPlaneTimeout); err != nil { if err := kverify.SystemPods(client, time.Now(), k8s.NodeIP, k8s.NodePort, kconst.DefaultControlPlaneTimeout); err != nil {
return errors.Wrap(err, "system pods") return errors.Wrap(err, "system pods")
} }
@ -275,11 +275,11 @@ func (k *Bootstrapper) restartCluster(k8s config.KubernetesConfig) error {
func (k *Bootstrapper) WaitForCluster(k8s config.KubernetesConfig, timeout time.Duration) error { func (k *Bootstrapper) WaitForCluster(k8s config.KubernetesConfig, timeout time.Duration) error {
start := time.Now() start := time.Now()
out.T(out.Waiting, "Waiting for cluster to come online ...") out.T(out.Waiting, "Waiting for cluster to come online ...")
if err := verify.APIServerProcess(k.c, start, timeout); err != nil { if err := kverify.APIServerProcess(k.c, start, timeout); err != nil {
return errors.Wrap(err, "wait for api proc") return errors.Wrap(err, "wait for api proc")
} }
if err := verify.APIServerIsRunning(start, "127.0.0.1", k8s.NodePort, timeout); err != nil { if err := kverify.APIServerIsRunning(start, "127.0.0.1", k8s.NodePort, timeout); err != nil {
return err return err
} }
@ -288,7 +288,7 @@ func (k *Bootstrapper) WaitForCluster(k8s config.KubernetesConfig, timeout time.
return errors.Wrap(err, "get k8s client") return errors.Wrap(err, "get k8s client")
} }
if err := verify.SystemPods(c, start, "127.0.0.1", k8s.NodePort, timeout); err != nil { if err := kverify.SystemPods(c, start, "127.0.0.1", k8s.NodePort, timeout); err != nil {
return errors.Wrap(err, "wait for system pods") return errors.Wrap(err, "wait for system pods")
} }

14
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
View File

@ -40,7 +40,7 @@ import (
"k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/bootstrapper" "k8s.io/minikube/pkg/minikube/bootstrapper"
"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil" "k8s.io/minikube/pkg/minikube/bootstrapper/bsutil"
"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/verify" "k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
"k8s.io/minikube/pkg/minikube/bootstrapper/images" "k8s.io/minikube/pkg/minikube/bootstrapper/images"
"k8s.io/minikube/pkg/minikube/command" "k8s.io/minikube/pkg/minikube/command"
"k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/config"
@ -93,7 +93,7 @@ func (k *Bootstrapper) GetKubeletStatus() (string, error) {
// GetAPIServerStatus returns the api-server status // GetAPIServerStatus returns the api-server status
func (k *Bootstrapper) GetAPIServerStatus(ip net.IP, apiserverPort int) (string, error) { func (k *Bootstrapper) GetAPIServerStatus(ip net.IP, apiserverPort int) (string, error) {
return verify.APIServerStatus(ip, apiserverPort) return kverify.APIServerStatus(ip, apiserverPort)
} }
// LogCommands returns a map of log type to a command which will display that log. // LogCommands returns a map of log type to a command which will display that log.
@ -234,10 +234,10 @@ func (k *Bootstrapper) client(k8s config.KubernetesConfig) (*kubernetes.Clientse
func (k *Bootstrapper) WaitForCluster(k8s config.KubernetesConfig, timeout time.Duration) error { func (k *Bootstrapper) WaitForCluster(k8s config.KubernetesConfig, timeout time.Duration) error {
start := time.Now() start := time.Now()
out.T(out.Waiting, "Waiting for cluster to come online ...") out.T(out.Waiting, "Waiting for cluster to come online ...")
if err := verify.APIServerProcess(k.c, start, timeout); err != nil { if err := kverify.APIServerProcess(k.c, start, timeout); err != nil {
return err return err
} }
if err := verify.APIServerIsRunning(start, k8s.NodeIP, k8s.NodePort, timeout); err != nil { if err := kverify.APIServerIsRunning(start, k8s.NodeIP, k8s.NodePort, timeout); err != nil {
return err return err
} }
@ -246,7 +246,7 @@ func (k *Bootstrapper) WaitForCluster(k8s config.KubernetesConfig, timeout time.
return errors.Wrap(err, "get k8s client") return errors.Wrap(err, "get k8s client")
} }
return verify.SystemPods(c, start, k8s.NodeIP, k8s.NodePort, timeout) return kverify.SystemPods(c, start, k8s.NodeIP, k8s.NodePort, timeout)
} }
// restartCluster restarts the Kubernetes cluster configured by kubeadm // restartCluster restarts the Kubernetes cluster configured by kubeadm
@ -291,7 +291,7 @@ func (k *Bootstrapper) restartCluster(k8s config.KubernetesConfig) error {
} }
// We must ensure that the apiserver is healthy before proceeding // We must ensure that the apiserver is healthy before proceeding
if err := verify.APIServerProcess(k.c, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil { if err := kverify.APIServerProcess(k.c, time.Now(), kconst.DefaultControlPlaneTimeout); err != nil {
return errors.Wrap(err, "apiserver healthz") return errors.Wrap(err, "apiserver healthz")
} }
@ -300,7 +300,7 @@ func (k *Bootstrapper) restartCluster(k8s config.KubernetesConfig) error {
return errors.Wrap(err, "getting k8s client") return errors.Wrap(err, "getting k8s client")
} }
if err := verify.SystemPods(client, time.Now(), k8s.NodeIP, k8s.NodePort, kconst.DefaultControlPlaneTimeout); err != nil { if err := kverify.SystemPods(client, time.Now(), k8s.NodeIP, k8s.NodePort, kconst.DefaultControlPlaneTimeout); err != nil {
return errors.Wrap(err, "system pods") return errors.Wrap(err, "system pods")
} }