Merge branch 'master' into podman-1.3

kubernetes · May 20, 2019 · d3c088a · d3c088a
2 parents d643431 + 9d09ff0
commit d3c088a
Show file tree

Hide file tree

Showing 2,343 changed files with 3,143 additions and 930,838 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 *.so
 
 # Folders
+.cache
 _obj
 _test
 
@@ -29,15 +30,6 @@ _testmain.go
 /_gopath
 
 
-#.yaml files specific to deploy's .template extensions
-deploy/addons/addon-manager.yaml                           
-deploy/addons/dashboard/dashboard-dp.yaml                  
-deploy/addons/heapster/heapster-rc.yaml                    
-deploy/addons/heapster/influx-grafana-rc.yaml              
-deploy/addons/ingress/ingress-dp.yaml                      
-deploy/addons/metrics-server/metrics-server-deployment.yaml
-deploy/addons/storage-provisioner/storage-provisioner.yaml 
-
 #iso version file
 deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/VERSION
 

diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,9 @@ sudo: required
 
 go:
   - 1.x
-go_import_path: k8s.io/minikube
 
+before_install:
+  - sudo apt-get install -y libvirt-dev
 install:
   - echo "Don't run anything."
 script: