Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
71b38d1e
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,发现更多精彩内容 >>
提交
71b38d1e
编写于
10月 30, 2017
作者:
P
Priya Wadhwa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Tests passing with storage-provisioner in addons
上级
a8fedc86
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
60 addition
and
6 deletion
+60
-6
Makefile
Makefile
+2
-4
cmd/localkube/cmd/start.go
cmd/localkube/cmd/start.go
+0
-2
deploy/addons/storage-provisioner/storage-provisioner.yaml
deploy/addons/storage-provisioner/storage-provisioner.yaml
+29
-0
pkg/minikube/assets/addons.go
pkg/minikube/assets/addons.go
+7
-0
test/integration/pv_test.go
test/integration/pv_test.go
+22
-0
未找到文件。
Makefile
浏览文件 @
71b38d1e
...
...
@@ -300,15 +300,13 @@ $(ISO_BUILD_IMAGE): deploy/iso/minikube-iso/Dockerfile
@
echo
""
@
echo
"
$
(@) successfully built"
out/
storage-provisioner-main
:
cmd/storage-provisioner/main.go
storage-provisioner-main
:
cmd/storage-provisioner/main.go
go build cmd/storage-provisioner/main.go
.PHONY
:
storage-provisioner-image
storage-provisioner-image
:
out/
storage-provisioner-main
storage-provisioner-image
:
storage-provisioner-main
docker build
-t
$(REGISTRY)
/storage-provisioner:
$(TAG)
-f
deploy/storage-provisioner/Dockerfile .
gcloud docker
--
push
$(REGISTRY)
/storage-provisioner:
$(TAG)
# docker build -t gcr.io/priya-wadhwa/storage-provisioner:
$(TAG)
-f
deploy/storage-provisioner/Dockerfile .
# gcloud docker -- push gcr.io/priya-wadhwa/storage-provisioner:
$(TAG)
.PHONY
:
release-iso
release-iso
:
minikube_iso checksum
...
...
cmd/localkube/cmd/start.go
浏览文件 @
71b38d1e
...
...
@@ -139,6 +139,4 @@ func SetupServer(s *localkube.LocalkubeServer) {
proxy
:=
s
.
NewProxyServer
()
s
.
AddServer
(
proxy
)
storageProvisioner
:=
s
.
NewStorageProvisionerServer
()
s
.
AddServer
(
storageProvisioner
)
}
deploy/addons/storage-provisioner/storage-provisioner.yaml
0 → 100644
浏览文件 @
71b38d1e
# Copyright 2016 The Kubernetes Authors All rights reserved.
#
# 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.
apiVersion
:
v1
kind
:
Pod
metadata
:
name
:
storage-provisioner
namespace
:
kube-system
labels
:
integration-test
:
storage-provisioner
addonmanager.kubernetes.io/mode
:
Reconcile
kubernetes.io/minikube-addons
:
storage-provisioner
spec
:
hostNetwork
:
true
containers
:
-
name
:
storage-provisioner
image
:
gcr.io/k8s-minikube/storage-provisioner:v1.8.0
imagePullPolicy
:
IfNotPresent
pkg/minikube/assets/addons.go
浏览文件 @
71b38d1e
...
...
@@ -82,6 +82,13 @@ var Addons = map[string]*Addon{
"storageclass.yaml"
,
"0640"
),
},
true
,
"default-storageclass"
),
"storage-provisioner"
:
NewAddon
([]
*
BinDataAsset
{
NewBinDataAsset
(
"deploy/addons/storage-provisioner/storage-provisioner.yaml"
,
constants
.
AddonsPath
,
"storage-provisioner.yaml"
,
"0640"
),
},
true
,
"storage-provisioner"
),
"coredns"
:
NewAddon
([]
*
BinDataAsset
{
NewBinDataAsset
(
"deploy/addons/coredns/coreDNS-controller.yaml"
,
...
...
test/integration/pv_test.go
浏览文件 @
71b38d1e
...
...
@@ -20,12 +20,15 @@ package integration
import
(
"fmt"
"github.com/pkg/errors"
"path/filepath"
"testing"
"time"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/storage"
commonutil
"k8s.io/minikube/pkg/util"
"k8s.io/minikube/test/integration/util"
)
...
...
@@ -58,6 +61,25 @@ func testProvisioning(t *testing.T) {
t
.
Fatalf
(
"No default storage class: %s"
,
err
)
}
// Check that the storage provisioner pod is running
checkPodRunning
:=
func
()
error
{
client
,
err
:=
commonutil
.
GetClient
()
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"getting kubernetes client"
)
}
selector
:=
labels
.
SelectorFromSet
(
labels
.
Set
(
map
[
string
]
string
{
"integration-test"
:
"storage-provisioner"
}))
if
err
:=
commonutil
.
WaitForPodsWithLabelRunning
(
client
,
"kube-system"
,
selector
);
err
!=
nil
{
return
err
}
return
nil
}
if
err
:=
checkPodRunning
();
err
!=
nil
{
t
.
Fatal
(
"Check storage-provisioner pod running failed with error: "
,
err
)
}
// Now create the PVC
pvcPath
:=
filepath
.
Join
(
*
testdataDir
,
"pvc.yaml"
)
if
_
,
err
:=
kubectlRunner
.
RunCommand
([]
string
{
"create"
,
"-f"
,
pvcPath
});
err
!=
nil
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录