Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
14ef5f6b
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
14ef5f6b
编写于
2月 04, 2018
作者:
A
adolphlwq
提交者:
dlorenc
2月 05, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use better package name according to
https://blog.golang.org/package-names
上级
9dc3795e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
19 addition
and
19 deletion
+19
-19
pkg/localkube/storage_provisioner.go
pkg/localkube/storage_provisioner.go
+2
-2
pkg/minikube/service/service.go
pkg/minikube/service/service.go
+9
-9
pkg/minikube/service/service_test.go
pkg/minikube/service/service_test.go
+6
-6
pkg/minikube/storageclass/storageclass.go
pkg/minikube/storageclass/storageclass.go
+2
-2
未找到文件。
pkg/localkube/storage_provisioner.go
浏览文件 @
14ef5f6b
...
...
@@ -25,7 +25,7 @@ import (
"github.com/pkg/errors"
"github.com/r2d4/external-storage/lib/controller"
"k8s.io/api/core/v1"
meta
_
v1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/apimachinery/pkg/util/wait"
...
...
@@ -67,7 +67,7 @@ func (p *hostPathProvisioner) Provision(options controller.VolumeOptions) (*v1.P
}
pv
:=
&
v1
.
PersistentVolume
{
ObjectMeta
:
meta
_
v1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
options
.
PVName
,
Annotations
:
map
[
string
]
string
{
"hostPathProvisionerIdentity"
:
string
(
p
.
identity
),
...
...
pkg/minikube/service/service.go
浏览文件 @
14ef5f6b
...
...
@@ -28,7 +28,7 @@ import (
"github.com/pkg/browser"
"github.com/pkg/errors"
"k8s.io/api/core/v1"
meta
_
v1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
corev1
"k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/tools/clientcmd"
...
...
@@ -114,7 +114,7 @@ func GetServiceURLs(api libmachine.API, namespace string, t *template.Template)
serviceInterface
:=
client
.
Services
(
namespace
)
svcs
,
err
:=
serviceInterface
.
List
(
meta
_
v1
.
ListOptions
{})
svcs
,
err
:=
serviceInterface
.
List
(
metav1
.
ListOptions
{})
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -158,7 +158,7 @@ func printURLsForService(c corev1.CoreV1Interface, ip, service, namespace string
}
s
:=
c
.
Services
(
namespace
)
svc
,
err
:=
s
.
Get
(
service
,
meta
_
v1
.
GetOptions
{})
svc
,
err
:=
s
.
Get
(
service
,
metav1
.
GetOptions
{})
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"service '%s' could not be found running"
,
service
)
}
...
...
@@ -211,14 +211,14 @@ func CheckService(namespace string, service string) error {
}
func
validateService
(
s
corev1
.
ServiceInterface
,
service
string
)
error
{
if
_
,
err
:=
s
.
Get
(
service
,
meta
_
v1
.
GetOptions
{});
err
!=
nil
{
if
_
,
err
:=
s
.
Get
(
service
,
metav1
.
GetOptions
{});
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"Error getting service %s"
,
service
)
}
return
nil
}
func
checkEndpointReady
(
endpoints
corev1
.
EndpointsInterface
,
service
string
)
error
{
endpoint
,
err
:=
endpoints
.
Get
(
service
,
meta
_
v1
.
GetOptions
{})
endpoint
,
err
:=
endpoints
.
Get
(
service
,
metav1
.
GetOptions
{})
if
err
!=
nil
{
return
&
util
.
RetriableError
{
Err
:
errors
.
Errorf
(
"Error getting endpoints for service %s"
,
service
)}
}
...
...
@@ -274,7 +274,7 @@ func GetServiceListByLabel(namespace string, key string, value string) (*v1.Serv
func
getServiceListFromServicesByLabel
(
services
corev1
.
ServiceInterface
,
key
string
,
value
string
)
(
*
v1
.
ServiceList
,
error
)
{
selector
:=
labels
.
SelectorFromSet
(
labels
.
Set
(
map
[
string
]
string
{
key
:
value
}))
serviceList
,
err
:=
services
.
List
(
meta
_
v1
.
ListOptions
{
LabelSelector
:
selector
.
String
()})
serviceList
,
err
:=
services
.
List
(
metav1
.
ListOptions
{
LabelSelector
:
selector
.
String
()})
if
err
!=
nil
{
return
&
v1
.
ServiceList
{},
&
util
.
RetriableError
{
Err
:
err
}
}
...
...
@@ -293,7 +293,7 @@ func CreateSecret(namespace, name string, dataValues map[string]string, labels m
return
&
util
.
RetriableError
{
Err
:
err
}
}
secret
,
_
:=
secrets
.
Get
(
name
,
meta
_
v1
.
GetOptions
{})
secret
,
_
:=
secrets
.
Get
(
name
,
metav1
.
GetOptions
{})
// Delete existing secret
if
len
(
secret
.
Name
)
>
0
{
...
...
@@ -311,7 +311,7 @@ func CreateSecret(namespace, name string, dataValues map[string]string, labels m
// Create Secret
secretObj
:=
&
v1
.
Secret
{
ObjectMeta
:
meta
_
v1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
name
,
Labels
:
labels
,
},
...
...
@@ -340,7 +340,7 @@ func DeleteSecret(namespace, name string) error {
return
&
util
.
RetriableError
{
Err
:
err
}
}
err
=
secrets
.
Delete
(
name
,
&
meta
_
v1
.
DeleteOptions
{})
err
=
secrets
.
Delete
(
name
,
&
metav1
.
DeleteOptions
{})
if
err
!=
nil
{
return
&
util
.
RetriableError
{
Err
:
err
}
}
...
...
pkg/minikube/service/service_test.go
浏览文件 @
14ef5f6b
...
...
@@ -26,7 +26,7 @@ import (
"github.com/docker/machine/libmachine/host"
"github.com/pkg/errors"
"k8s.io/api/core/v1"
meta
_
v1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
corev1
"k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/kubernetes/typed/core/v1/fake"
...
...
@@ -61,7 +61,7 @@ var defaultNamespaceServiceInterface = &MockServiceInterface{
ServiceList
:
&
v1
.
ServiceList
{
Items
:
[]
v1
.
Service
{
{
ObjectMeta
:
meta
_
v1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"mock-dashboard"
,
Namespace
:
"default"
,
},
...
...
@@ -73,7 +73,7 @@ var defaultNamespaceServiceInterface = &MockServiceInterface{
},
},
{
ObjectMeta
:
meta
_
v1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"mock-dashboard-no-ports"
,
Namespace
:
"default"
,
},
...
...
@@ -125,7 +125,7 @@ var endpointMap = map[string]*v1.Endpoints{
},
}
func
(
e
MockEndpointsInterface
)
Get
(
name
string
,
_
meta
_
v1
.
GetOptions
)
(
*
v1
.
Endpoints
,
error
)
{
func
(
e
MockEndpointsInterface
)
Get
(
name
string
,
_
metav1
.
GetOptions
)
(
*
v1
.
Endpoints
,
error
)
{
endpoint
,
ok
:=
endpointMap
[
name
]
if
!
ok
{
return
nil
,
errors
.
New
(
"Endpoint not found"
)
...
...
@@ -176,7 +176,7 @@ type MockServiceInterface struct {
ServiceList
*
v1
.
ServiceList
}
func
(
s
MockServiceInterface
)
List
(
opts
meta
_
v1
.
ListOptions
)
(
*
v1
.
ServiceList
,
error
)
{
func
(
s
MockServiceInterface
)
List
(
opts
metav1
.
ListOptions
)
(
*
v1
.
ServiceList
,
error
)
{
serviceList
:=
&
v1
.
ServiceList
{
Items
:
[]
v1
.
Service
{},
}
...
...
@@ -195,7 +195,7 @@ func (s MockServiceInterface) List(opts meta_v1.ListOptions) (*v1.ServiceList, e
return
s
.
ServiceList
,
nil
}
func
(
s
MockServiceInterface
)
Get
(
name
string
,
_
meta
_
v1
.
GetOptions
)
(
*
v1
.
Service
,
error
)
{
func
(
s
MockServiceInterface
)
Get
(
name
string
,
_
metav1
.
GetOptions
)
(
*
v1
.
Service
,
error
)
{
for
_
,
svc
:=
range
s
.
ServiceList
.
Items
{
if
svc
.
ObjectMeta
.
Name
==
name
{
return
&
svc
,
nil
...
...
pkg/minikube/storageclass/storageclass.go
浏览文件 @
14ef5f6b
...
...
@@ -18,7 +18,7 @@ package storageclass
import
(
"github.com/pkg/errors"
meta
_
v1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
...
...
@@ -39,7 +39,7 @@ func DisableDefaultStorageClass() error {
return
errors
.
Wrap
(
err
,
"Error creating new client from kubeConfig.ClientConfig()"
)
}
err
=
client
.
Storage
()
.
StorageClasses
()
.
Delete
(
constants
.
DefaultStorageClassProvisioner
,
&
meta
_
v1
.
DeleteOptions
{})
err
=
client
.
Storage
()
.
StorageClasses
()
.
Delete
(
constants
.
DefaultStorageClassProvisioner
,
&
metav1
.
DeleteOptions
{})
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"Error deleting default storage class %s"
,
constants
.
DefaultStorageClassProvisioner
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录