alias kubeadmutil for k8s.io/kubernetes/cmd/kubeadm/app/util

Author: tanjunchen

cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go

@@ -26,7 +26,7 @@ import (
 
 	apps "k8s.io/api/apps/v1"
 	"k8s.io/kubernetes/cmd/kubeadm/app/constants"
-	"k8s.io/kubernetes/cmd/kubeadm/app/util"
+	kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
 )
 
 const (
@@ -503,7 +503,7 @@ func TestBuildDaemonSet(t *testing.T) {
 			}
 
 			ds := BuildDaemonSet(rt.component, podSpec, GetDefaultMutators())
-			dsBytes, err := util.MarshalToYaml(ds, apps.SchemeGroupVersion)
+			dsBytes, err := kubeadmutil.MarshalToYaml(ds, apps.SchemeGroupVersion)
 			if err != nil {
 				t.Fatalf("failed to marshal daemonset to YAML: %v", err)
 			}

cmd/kubeadm/app/phases/upgrade/staticpods.go

@@ -33,7 +33,7 @@ import (
 	"k8s.io/kubernetes/cmd/kubeadm/app/phases/certs/renewal"
 	"k8s.io/kubernetes/cmd/kubeadm/app/phases/controlplane"
 	etcdphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/etcd"
-	"k8s.io/kubernetes/cmd/kubeadm/app/util"
+	kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient"
 	dryrunutil "k8s.io/kubernetes/cmd/kubeadm/app/util/dryrun"
 	etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd"
@@ -276,7 +276,7 @@ func performEtcdStaticPodUpgrade(certsRenewMgr *renewal.Manager, client clientse
 	// Backing up etcd data store
 	backupEtcdDir := pathMgr.BackupEtcdDir()
 	runningEtcdDir := cfg.Etcd.Local.DataDir
-	if err := util.CopyDir(runningEtcdDir, backupEtcdDir); err != nil {
+	if err := kubeadmutil.CopyDir(runningEtcdDir, backupEtcdDir); err != nil {
 		return true, errors.Wrap(err, "failed to back up etcd data")
 	}
 
@@ -522,7 +522,7 @@ func rollbackEtcdData(cfg *kubeadmapi.InitConfiguration, pathMgr StaticPodPathMa
 	backupEtcdDir := pathMgr.BackupEtcdDir()
 	runningEtcdDir := cfg.Etcd.Local.DataDir
 
-	if err := util.CopyDir(backupEtcdDir, runningEtcdDir); err != nil {
+	if err := kubeadmutil.CopyDir(backupEtcdDir, runningEtcdDir); err != nil {
 		// Let the user know there we're problems, but we tried to reçover
 		return errors.Wrapf(err, "couldn't recover etcd database with error, the location of etcd backup: %s ", backupEtcdDir)
 	}

cmd/kubeadm/app/preflight/checks_linux.go

@@ -20,22 +20,22 @@ package preflight
 
 import (
 	"github.com/pkg/errors"
-	"k8s.io/kubernetes/cmd/kubeadm/app/util"
+	kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
 	"k8s.io/utils/exec"
 )
 
 // Check validates if Docker is setup to use systemd as the cgroup driver.
 func (idsc IsDockerSystemdCheck) Check() (warnings, errorList []error) {
-	driver, err := util.GetCgroupDriverDocker(exec.New())
+	driver, err := kubeadmutil.GetCgroupDriverDocker(exec.New())
 	if err != nil {
 		return nil, []error{err}
 	}
-	if driver != util.CgroupDriverSystemd {
+	if driver != kubeadmutil.CgroupDriverSystemd {
 		err = errors.Errorf("detected %q as the Docker cgroup driver. "+
 			"The recommended driver is %q. "+
 			"Please follow the guide at https://kubernetes.io/docs/setup/cri/",
 			driver,
-			util.CgroupDriverSystemd)
+			kubeadmutil.CgroupDriverSystemd)
 		return []error{err}, nil
 	}
 	return nil, nil

cmd/kubeadm/app/util/audit/utils.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apiserver/pkg/apis/audit/install"
 	auditv1 "k8s.io/apiserver/pkg/apis/audit/v1"
-	"k8s.io/kubernetes/cmd/kubeadm/app/util"
+	kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
 )
 
 // CreateDefaultAuditLogPolicy writes the default audit log policy to disk.
@@ -60,7 +60,7 @@ func writePolicyToDisk(policyFile string, policy *auditv1.Policy) error {
 	codecs := serializer.NewCodecFactory(scheme)
 
 	// writes the policy to disk
-	serialized, err := util.MarshalToYamlForCodecs(policy, auditv1.SchemeGroupVersion, codecs)
+	serialized, err := kubeadmutil.MarshalToYamlForCodecs(policy, auditv1.SchemeGroupVersion, codecs)
 
 	if err != nil {
 		return errors.Wrap(err, "failed to marshal audit policy to YAML")

cmd/kubeadm/app/util/staticpod/utils.go

@@ -33,7 +33,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
 	kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
-	"k8s.io/kubernetes/cmd/kubeadm/app/util"
+	kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/kustomize"
 )
 
@@ -148,7 +148,7 @@ func GetExtraParameters(overrides map[string]string, defaults map[string]string)
 // KustomizeStaticPod applies patches defined in kustomizeDir to a static Pod manifest
 func KustomizeStaticPod(pod *v1.Pod, kustomizeDir string) (*v1.Pod, error) {
 	// marshal the pod manifest into yaml
-	serialized, err := util.MarshalToYaml(pod, v1.SchemeGroupVersion)
+	serialized, err := kubeadmutil.MarshalToYaml(pod, v1.SchemeGroupVersion)
 	if err != nil {
 		return pod, errors.Wrapf(err, "failed to marshal manifest to YAML")
 	}
@@ -164,7 +164,7 @@ func KustomizeStaticPod(pod *v1.Pod, kustomizeDir string) (*v1.Pod, error) {
 	}
 
 	// unmarshal kustomized yaml back into a pod manifest
-	obj, err := util.UnmarshalFromYaml(kustomized, v1.SchemeGroupVersion)
+	obj, err := kubeadmutil.UnmarshalFromYaml(kustomized, v1.SchemeGroupVersion)
 	if err != nil {
 		return pod, errors.Wrap(err, "failed to unmarshal kustomize manifest from YAML")
 	}
@@ -186,7 +186,7 @@ func WriteStaticPodToDisk(componentName, manifestDir string, pod v1.Pod) error {
 	}
 
 	// writes the pod to disk
-	serialized, err := util.MarshalToYaml(&pod, v1.SchemeGroupVersion)
+	serialized, err := kubeadmutil.MarshalToYaml(&pod, v1.SchemeGroupVersion)
 	if err != nil {
 		return errors.Wrapf(err, "failed to marshal manifest for %q to YAML", componentName)
 	}
@@ -207,7 +207,7 @@ func ReadStaticPodFromDisk(manifestPath string) (*v1.Pod, error) {
 		return &v1.Pod{}, errors.Wrapf(err, "failed to read manifest for %q", manifestPath)
 	}
 
-	obj, err := util.UnmarshalFromYaml(buf, v1.SchemeGroupVersion)
+	obj, err := kubeadmutil.UnmarshalFromYaml(buf, v1.SchemeGroupVersion)
 	if err != nil {
 		return &v1.Pod{}, errors.Errorf("failed to unmarshal manifest for %q from YAML: %v", manifestPath, err)
 	}
@@ -298,7 +298,7 @@ func GetEtcdProbeEndpoint(cfg *kubeadmapi.Etcd, isIPv6 bool) (string, int, v1.UR
 		port := kubeadmconstants.EtcdMetricsPort
 		portStr := parsedURL.Port()
 		if len(portStr) != 0 {
-			p, err := util.ParsePort(portStr)
+			p, err := kubeadmutil.ParsePort(portStr)
 			if err == nil {
 				port = p
 			}

cmd/kubeadm/kubeadm.go

@@ -18,9 +18,9 @@ package main
 
 import (
 	"k8s.io/kubernetes/cmd/kubeadm/app"
-	"k8s.io/kubernetes/cmd/kubeadm/app/util"
+	kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
 )
 
 func main() {
-	util.CheckErr(app.Run())
+	kubeadmutil.CheckErr(app.Run())
 }