merge util into one file

pkg/volume/util/recyclerclient/recycler_client.go

@@ -74,7 +74,7 @@ func internalRecycleVolumeByWatchingPodUntilCompletion(pvName string, pod *v1.Po
 			if deleteErr != nil {
 				return fmt.Errorf("failed to delete old recycler pod %s/%s: %s", pod.Namespace, pod.Name, deleteErr)
 			}
-			// Recycler will try again and the old pod will be hopefuly deleted
+			// Recycler will try again and the old pod will be hopefully deleted
 			// at that time.
 			return fmt.Errorf("old recycler pod found, will retry later")
 		}

pkg/volume/util/recyclerclient/recycler_client_test.go

@@ -88,8 +88,8 @@ func TestRecyclerPod(t *testing.T) {
 				// Pod gets Running and Succeeded
 				newPodEvent(watch.Added, "podRecyclerSuccess", v1.PodPending, ""),
 				newEvent(v1.EventTypeNormal, "Successfully assigned recycler-for-podRecyclerSuccess to 127.0.0.1"),
-				newEvent(v1.EventTypeNormal, "pulling image \"gcr.io/google_containers/busybox\""),
-				newEvent(v1.EventTypeNormal, "Successfully pulled image \"gcr.io/google_containers/busybox\""),
+				newEvent(v1.EventTypeNormal, "pulling image \"k8s.gcr.io/busybox\""),
+				newEvent(v1.EventTypeNormal, "Successfully pulled image \"k8s.gcr.io/busybox\""),
 				newEvent(v1.EventTypeNormal, "Created container with docker id 83d929aeac82"),
 				newEvent(v1.EventTypeNormal, "Started container with docker id 83d929aeac82"),
 				newPodEvent(watch.Modified, "podRecyclerSuccess", v1.PodRunning, ""),
@@ -97,8 +97,8 @@ func TestRecyclerPod(t *testing.T) {
 			},
 			expectedEvents: []mockEvent{
 				{v1.EventTypeNormal, "Successfully assigned recycler-for-podRecyclerSuccess to 127.0.0.1"},
-				{v1.EventTypeNormal, "pulling image \"gcr.io/google_containers/busybox\""},
-				{v1.EventTypeNormal, "Successfully pulled image \"gcr.io/google_containers/busybox\""},
+				{v1.EventTypeNormal, "pulling image \"k8s.gcr.io/busybox\""},
+				{v1.EventTypeNormal, "Successfully pulled image \"k8s.gcr.io/busybox\""},
 				{v1.EventTypeNormal, "Created container with docker id 83d929aeac82"},
 				{v1.EventTypeNormal, "Started container with docker id 83d929aeac82"},
 			},

pkg/volume/util/util_linux.go

-// +build linux
-
-/*
-Copyright 2017 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
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/golang/glog"
-)
-
-// AttachFileDevice takes a path to a regular file and makes it available as an
-// attached block device.
-func (v VolumePathHandler) AttachFileDevice(path string) (string, error) {
-	blockDevicePath, err := v.GetLoopDevice(path)
-	if err != nil && err.Error() != ErrDeviceNotFound {
-		return "", err
-	}
-
-	// If no existing loop device for the path, create one
-	if blockDevicePath == "" {
-		glog.V(4).Infof("Creating device for path: %s", path)
-		blockDevicePath, err = makeLoopDevice(path)
-		if err != nil {
-			return "", err
-		}
-	}
-	return blockDevicePath, nil
-}
-
-// GetLoopDevice returns the full path to the loop device associated with the given path.
-func (v VolumePathHandler) GetLoopDevice(path string) (string, error) {
-	_, err := os.Stat(path)
-	if os.IsNotExist(err) {
-		return "", errors.New(ErrDeviceNotFound)
-	}
-	if err != nil {
-		return "", fmt.Errorf("not attachable: %v", err)
-	}
-
-	args := []string{"-j", path}
-	cmd := exec.Command(losetupPath, args...)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		glog.V(2).Infof("Failed device discover command for path %s: %v %s", path, err, out)
-		return "", err
-	}
-	return parseLosetupOutputForDevice(out)
-}
-
-func makeLoopDevice(path string) (string, error) {
-	args := []string{"-f", "--show", path}
-	cmd := exec.Command(losetupPath, args...)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		glog.V(2).Infof("Failed device create command for path: %s %v %s ", path, err, out)
-		return "", err
-	}
-	return parseLosetupOutputForDevice(out)
-}
-
-// RemoveLoopDevice removes specified loopback device
-func (v VolumePathHandler) RemoveLoopDevice(device string) error {
-	args := []string{"-d", device}
-	cmd := exec.Command(losetupPath, args...)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		if _, err := os.Stat(device); os.IsNotExist(err) {
-			return nil
-		}
-		glog.V(2).Infof("Failed to remove loopback device: %s: %v %s", device, err, out)
-		return err
-	}
-	return nil
-}
-
-func parseLosetupOutputForDevice(output []byte) (string, error) {
-	if len(output) == 0 {
-		return "", errors.New(ErrDeviceNotFound)
-	}
-
-	// losetup returns device in the format:
-	// /dev/loop1: [0073]:148662 (/dev/sda)
-	device := strings.TrimSpace(strings.SplitN(string(output), ":", 2)[0])
-	if len(device) == 0 {
-		return "", errors.New(ErrDeviceNotFound)
-	}
-	return device, nil
-}

pkg/volume/util/util_unsupported.go

-// +build !linux
-
-/*
-Copyright 2017 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
-
-import (
-	"fmt"
-)
-
-// AttachFileDevice takes a path to a regular file and makes it available as an
-// attached block device.
-func (v VolumePathHandler) AttachFileDevice(path string) (string, error) {
-	return "", fmt.Errorf("AttachFileDevice not supported for this build.")
-}
-
-// GetLoopDevice returns the full path to the loop device associated with the given path.
-func (v VolumePathHandler) GetLoopDevice(path string) (string, error) {
-	return "", fmt.Errorf("GetLoopDevice not supported for this build.")
-}
-
-// RemoveLoopDevice removes specified loopback device
-func (v VolumePathHandler) RemoveLoopDevice(device string) error {
-	return fmt.Errorf("RemoveLoopDevice not supported for this build.")
-}

pkg/volume/util/volumehelper/BUILD

-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["volumehelper.go"],
-    importpath = "k8s.io/kubernetes/pkg/volume/util/volumehelper",
-    deps = [
-        "//pkg/features:go_default_library",
-        "//pkg/util/mount:go_default_library",
-        "//pkg/volume:go_default_library",
-        "//pkg/volume/util/types:go_default_library",
-        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)

pkg/volume/util/volumehelper/volumehelper.go

-/*
-Copyright 2016 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 volumehelper contains consts and helper methods used by various
-// volume components (attach/detach controller, kubelet, etc.).
-package volumehelper
-
-import (
-	"fmt"
-	"strings"
-
-	"k8s.io/api/core/v1"
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
-	"k8s.io/kubernetes/pkg/features"
-	"k8s.io/kubernetes/pkg/util/mount"
-	"k8s.io/kubernetes/pkg/volume"
-	"k8s.io/kubernetes/pkg/volume/util/types"
-)
-
-const (
-	// ControllerManagedAttachAnnotation is the key of the annotation on Node
-	// objects that indicates attach/detach operations for the node should be
-	// managed by the attach/detach controller
-	ControllerManagedAttachAnnotation string = "volumes.kubernetes.io/controller-managed-attach-detach"
-
-	// KeepTerminatedPodVolumesAnnotation is the key of the annotation on Node
-	// that decides if pod volumes are unmounted when pod is terminated
-	KeepTerminatedPodVolumesAnnotation string = "volumes.kubernetes.io/keep-terminated-pod-volumes"
-
-	// VolumeGidAnnotationKey is the of the annotation on the PersistentVolume
-	// object that specifies a supplemental GID.
-	VolumeGidAnnotationKey = "pv.beta.kubernetes.io/gid"
-
-	// VolumeDynamicallyCreatedByKey is the key of the annotation on PersistentVolume
-	// object created dynamically
-	VolumeDynamicallyCreatedByKey = "kubernetes.io/createdby"
-)
-
-// GetUniquePodName returns a unique identifier to reference a pod by
-func GetUniquePodName(pod *v1.Pod) types.UniquePodName {
-	return types.UniquePodName(pod.UID)
-}
-
-// GetUniqueVolumeName returns a unique name representing the volume/plugin.
-// Caller should ensure that volumeName is a name/ID uniquely identifying the
-// actual backing device, directory, path, etc. for a particular volume.
-// The returned name can be used to uniquely reference the volume, for example,
-// to prevent operations (attach/detach or mount/unmount) from being triggered
-// on the same volume.
-func GetUniqueVolumeName(pluginName, volumeName string) v1.UniqueVolumeName {
-	return v1.UniqueVolumeName(fmt.Sprintf("%s/%s", pluginName, volumeName))
-}
-
-// GetUniqueVolumeNameForNonAttachableVolume returns the unique volume name
-// for a non-attachable volume.
-func GetUniqueVolumeNameForNonAttachableVolume(
-	podName types.UniquePodName, volumePlugin volume.VolumePlugin, volumeSpec *volume.Spec) v1.UniqueVolumeName {
-	return v1.UniqueVolumeName(
-		fmt.Sprintf("%s/%v-%s", volumePlugin.GetPluginName(), podName, volumeSpec.Name()))
-}
-
-// GetUniqueVolumeNameFromSpec uses the given VolumePlugin to generate a unique
-// name representing the volume defined in the specified volume spec.
-// This returned name can be used to uniquely reference the actual backing
-// device, directory, path, etc. referenced by the given volumeSpec.
-// If the given plugin does not support the volume spec, this returns an error.
-func GetUniqueVolumeNameFromSpec(
-	volumePlugin volume.VolumePlugin,
-	volumeSpec *volume.Spec) (v1.UniqueVolumeName, error) {
-	if volumePlugin == nil {
-		return "", fmt.Errorf(
-			"volumePlugin should not be nil. volumeSpec.Name=%q",
-			volumeSpec.Name())
-	}
-
-	volumeName, err := volumePlugin.GetVolumeName(volumeSpec)
-	if err != nil || volumeName == "" {
-		return "", fmt.Errorf(
-			"failed to GetVolumeName from volumePlugin for volumeSpec %q err=%v",
-			volumeSpec.Name(),
-			err)
-	}
-
-	return GetUniqueVolumeName(
-			volumePlugin.GetPluginName(),
-			volumeName),
-		nil
-}
-
-// IsPodTerminated checks if pod is terminated
-func IsPodTerminated(pod *v1.Pod, podStatus v1.PodStatus) bool {
-	return podStatus.Phase == v1.PodFailed || podStatus.Phase == v1.PodSucceeded || (pod.DeletionTimestamp != nil && notRunning(podStatus.ContainerStatuses))
-}
-
-// notRunning returns true if every status is terminated or waiting, or the status list
-// is empty.
-func notRunning(statuses []v1.ContainerStatus) bool {
-	for _, status := range statuses {
-		if status.State.Terminated == nil && status.State.Waiting == nil {
-			return false
-		}
-	}
-	return true
-}
-
-// SplitUniqueName splits the unique name to plugin name and volume name strings. It expects the uniqueName to follow
-// the fromat plugin_name/volume_name and the plugin name must be namespaced as described by the plugin interface,
-// i.e. namespace/plugin containing exactly one '/'. This means the unique name will always be in the form of
-// plugin_namespace/plugin/volume_name, see k8s.io/kubernetes/pkg/volume/plugins.go VolumePlugin interface
-// description and pkg/volume/util/volumehelper/volumehelper.go GetUniqueVolumeNameFromSpec that constructs
-// the unique volume names.
-func SplitUniqueName(uniqueName v1.UniqueVolumeName) (string, string, error) {
-	components := strings.SplitN(string(uniqueName), "/", 3)
-	if len(components) != 3 {
-		return "", "", fmt.Errorf("cannot split volume unique name %s to plugin/volume components", uniqueName)
-	}
-	pluginName := fmt.Sprintf("%s/%s", components[0], components[1])
-	return pluginName, components[2], nil
-}
-
-// NewSafeFormatAndMountFromHost creates a new SafeFormatAndMount with Mounter
-// and Exec taken from given VolumeHost.
-func NewSafeFormatAndMountFromHost(pluginName string, host volume.VolumeHost) *mount.SafeFormatAndMount {
-	mounter := host.GetMounter(pluginName)
-	exec := host.GetExec(pluginName)
-	return &mount.SafeFormatAndMount{Interface: mounter, Exec: exec}
-}
-
-// GetVolumeMode retrieves VolumeMode from pv.
-// If the volume doesn't have PersistentVolume, it's an inline volume,
-// should return volumeMode as filesystem to keep existing behavior.
-func GetVolumeMode(volumeSpec *volume.Spec) (v1.PersistentVolumeMode, error) {
-	if volumeSpec == nil || volumeSpec.PersistentVolume == nil {
-		return v1.PersistentVolumeFilesystem, nil
-	}
-	if volumeSpec.PersistentVolume.Spec.VolumeMode != nil {
-		return *volumeSpec.PersistentVolume.Spec.VolumeMode, nil
-	}
-	return "", fmt.Errorf("cannot get volumeMode for volume: %v", volumeSpec.Name())
-}
-
-// GetPersistentVolumeClaimVolumeMode retrieves VolumeMode from pvc.
-func GetPersistentVolumeClaimVolumeMode(claim *v1.PersistentVolumeClaim) (v1.PersistentVolumeMode, error) {
-	if claim.Spec.VolumeMode != nil {
-		return *claim.Spec.VolumeMode, nil
-	}
-	return "", fmt.Errorf("cannot get volumeMode from pvc: %v", claim.Name)
-}
-
-// CheckVolumeModeFilesystem checks VolumeMode.
-// If the mode is Filesystem, return true otherwise return false.
-func CheckVolumeModeFilesystem(volumeSpec *volume.Spec) (bool, error) {
-	if utilfeature.DefaultFeatureGate.Enabled(features.BlockVolume) {
-		volumeMode, err := GetVolumeMode(volumeSpec)
-		if err != nil {
-			return true, err
-		}
-		if volumeMode == v1.PersistentVolumeBlock {
-			return false, nil
-		}
-	}
-	return true, nil
-}

pkg/volume/util/volumepathhandler/volume_path_handler_linux.go

@@ -61,7 +61,7 @@ func (v VolumePathHandler) GetLoopDevice(path string) (string, error) {
 	cmd := exec.Command(losetupPath, args...)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		glog.V(2).Infof("Failed device discover command for path %s: %v", path, err)
+		glog.V(2).Infof("Failed device discover command for path %s: %v %s", path, err, out)
 		return "", err
 	}
 	return parseLosetupOutputForDevice(out)
@@ -72,7 +72,7 @@ func makeLoopDevice(path string) (string, error) {
 	cmd := exec.Command(losetupPath, args...)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		glog.V(2).Infof("Failed device create command for path %s: %v", path, err)
+		glog.V(2).Infof("Failed device create command for path: %s %v %s ", path, err, out)
 		return "", err
 	}
 	return parseLosetupOutputForDevice(out)