github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-29 19:51:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84770 from mikedanese/uuid

Browse Source 
remove github.com/pborman/uuid
This commit is contained in:
Kubernetes Prow Robot
2019-11-05 08:47:05 -08:00
committed by GitHub
parent a9fb448723 f0d45ee31f
commit b01ac96bd4
53 changed files with 51 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/quobyte/BUILD
View File

@@ -23,7 +23,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library",
"//vendor/github.com/pborman/uuid:go_default_library",
"//vendor/github.com/google/uuid:go_default_library",
"//vendor/github.com/quobyte/api:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/utils/strings:go_default_library",

4
pkg/volume/quobyte/quobyte.go
View File

@@ -22,7 +22,7 @@ import (
"path/filepath"
gostrings "strings"
"github.com/pborman/uuid"
"github.com/google/uuid"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -408,7 +408,7 @@ func (provisioner *quobyteVolumeProvisioner) Provision(selectedNode *v1.Node, al
}
// create random image name
provisioner.volume = fmt.Sprintf("kubernetes-dynamic-pvc-%s", uuid.NewUUID())
provisioner.volume = fmt.Sprintf("kubernetes-dynamic-pvc-%s", uuid.New().String())
manager := &quobyteVolumeManager{
config: cfg,