提交 7098431c 编写于 作者: P Priya Wadhwa

Small changes

上级 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.
*/
package main
import (
......
......@@ -19,7 +19,7 @@ metadata:
namespace: kube-system
labels:
integration-test: storage-provisioner
addonmanager.kubernetes.io/mode: Reconcile
addonmanager.kubernetes.io/mode: EnsureExists
kubernetes.io/minikube-addons: storage-provisioner
spec:
hostNetwork: true
......
......@@ -12,9 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM ubuntu:16.04
FROM scratch
COPY main main
CMD ["/main"]
......@@ -181,6 +181,9 @@ var LocalkubeCachedImages = []string{
// Pause
"gcr.io/google_containers/pause-amd64:3.0",
//Storage Provisioner
"gcr.io/k8s-minikube/storage-provisioner:v1.8.0",
}
func GetKubeadmCachedImages(version string) []string {
......@@ -206,6 +209,9 @@ func GetKubeadmCachedImages(version string) []string {
"gcr.io/google_containers/kube-scheduler-amd64:" + version,
"gcr.io/google_containers/kube-controller-manager-amd64:" + version,
"gcr.io/google_containers/kube-apiserver-amd64:" + version,
//Storage Provisioner
"gcr.io/k8s-minikube/storage-provisioner:v1.8.0",
}
}
......
......@@ -35,11 +35,7 @@ func TestFunctional(t *testing.T) {
t.Run("Addons", testAddons)
t.Run("Dashboard", testDashboard)
t.Run("ServicesList", testServicesList)
// Don't run this test on kubeadm bootstrapper for now.
if !strings.Contains(*args, "--bootstrapper=kubeadm") {
t.Run("Provisioning", testProvisioning)
}
t.Run("Provisioning", testProvisioning)
if !strings.Contains(minikubeRunner.StartArgs, "--vm-driver=none") {
t.Run("EnvVars", testClusterEnv)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册