Skip to content

Commit 6ef4f44

Browse files
author
Priya Wadhwa
committed
Small changes
1 parent 71b38d1 commit 6ef4f44

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

deploy/addons/storage-provisioner/storage-provisioner.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ metadata:
1919
namespace: kube-system
2020
labels:
2121
integration-test: storage-provisioner
22-
addonmanager.kubernetes.io/mode: Reconcile
22+
addonmanager.kubernetes.io/mode: EnsureExists
2323
kubernetes.io/minikube-addons: storage-provisioner
2424
spec:
2525
hostNetwork: true

deploy/storage-provisioner/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM ubuntu:16.04
16-
15+
FROM scratch
1716
COPY main main
18-
1917
CMD ["/main"]
2018

pkg/minikube/constants/constants.go

+6
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ var LocalkubeCachedImages = []string{
181181

182182
// Pause
183183
"gcr.io/google_containers/pause-amd64:3.0",
184+
185+
//Storage Provisioner
186+
"gcr.io/k8s-minikube/storage-provisioner:v1.8.0",
184187
}
185188

186189
func GetKubeadmCachedImages(version string) []string {
@@ -206,6 +209,9 @@ func GetKubeadmCachedImages(version string) []string {
206209
"gcr.io/google_containers/kube-scheduler-amd64:" + version,
207210
"gcr.io/google_containers/kube-controller-manager-amd64:" + version,
208211
"gcr.io/google_containers/kube-apiserver-amd64:" + version,
212+
213+
//Storage Provisioner
214+
"gcr.io/k8s-minikube/storage-provisioner:v1.8.0",
209215
}
210216
}
211217

test/integration/functional_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ func TestFunctional(t *testing.T) {
3535
t.Run("Addons", testAddons)
3636
t.Run("Dashboard", testDashboard)
3737
t.Run("ServicesList", testServicesList)
38-
39-
// Don't run this test on kubeadm bootstrapper for now.
40-
if !strings.Contains(*args, "--bootstrapper=kubeadm") {
41-
t.Run("Provisioning", testProvisioning)
42-
}
38+
t.Run("Provisioning", testProvisioning)
4339

4440
if !strings.Contains(minikubeRunner.StartArgs, "--vm-driver=none") {
4541
t.Run("EnvVars", testClusterEnv)

0 commit comments

Comments
 (0)