Change default ISO to minikube-iso v1.0.1 (buildroot)
parent
d1bd1db5f1
commit
427bde79ca
|
@ -36,18 +36,6 @@ $ make minikube-iso
|
||||||
|
|
||||||
The bootable ISO image will be available in `out/buildroot/output/images/rootfs.iso9660`.
|
The bootable ISO image will be available in `out/buildroot/output/images/rootfs.iso9660`.
|
||||||
|
|
||||||
### Testing local minikube changes
|
|
||||||
|
|
||||||
To test a local build of minikube, include a `kubernetes-version` flag with a path to the `localkube` output from your source build directory:
|
|
||||||
|
|
||||||
```
|
|
||||||
$ cd minikube
|
|
||||||
$ ./out/minikube start \
|
|
||||||
--container-runtime=rkt \
|
|
||||||
--network-plugin=cni \
|
|
||||||
--iso-url=http://storage.googleapis.com/minikube/iso/buildroot/minikube-v0.0.6.iso
|
|
||||||
```
|
|
||||||
|
|
||||||
### Testing local minikube-iso changes
|
### Testing local minikube-iso changes
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
|
@ -25,7 +25,7 @@ minikube start
|
||||||
--host-only-cidr string The CIDR to be used for the minikube VM (only supported with Virtualbox driver) (default "192.168.99.1/24")
|
--host-only-cidr string The CIDR to be used for the minikube VM (only supported with Virtualbox driver) (default "192.168.99.1/24")
|
||||||
--hyperv-virtual-switch string The hyperv virtual switch name. Defaults to first found. (only supported with HyperV driver)
|
--hyperv-virtual-switch string The hyperv virtual switch name. Defaults to first found. (only supported with HyperV driver)
|
||||||
--insecure-registry stringSlice Insecure Docker registries to pass to the Docker daemon
|
--insecure-registry stringSlice Insecure Docker registries to pass to the Docker daemon
|
||||||
--iso-url string Location of the minikube iso (default "https://storage.googleapis.com/minikube/minikube-0.7.iso")
|
--iso-url string Location of the minikube iso (default "https://storage.googleapis.com/minikube/iso/minikube-v1.0.1.iso")
|
||||||
--kubernetes-version string The kubernetes version that the minikube VM will use (ex: v1.2.3)
|
--kubernetes-version string The kubernetes version that the minikube VM will use (ex: v1.2.3)
|
||||||
OR a URI which contains a localkube binary (ex: https://storage.googleapis.com/minikube/k8sReleases/v1.3.0/localkube-linux-amd64) (default "v1.5.1")
|
OR a URI which contains a localkube binary (ex: https://storage.googleapis.com/minikube/k8sReleases/v1.3.0/localkube-linux-amd64) (default "v1.5.1")
|
||||||
--kvm-network string The KVM network name. (only supported with KVM driver) (default "default")
|
--kvm-network string The KVM network name. (only supported with KVM driver) (default "default")
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
set -e
|
set -e
|
||||||
set +x
|
set +x
|
||||||
|
|
||||||
for job in "OSX-Virtualbox" "OSX-XHyve" "OSX-Virtualbox-SystemD" "Linux-Virtualbox" "Linux-KVM" "Windows-HyperV"; do
|
for job in "OSX-Virtualbox" "OSX-XHyve" "Linux-Virtualbox" "Linux-KVM" "Windows-HyperV"; do
|
||||||
target_url="https://storage.googleapis.com/minikube-builds/logs/${ghprbPullId}/${job}.txt"
|
target_url="https://storage.googleapis.com/minikube-builds/logs/${ghprbPullId}/${job}.txt"
|
||||||
curl "https://api.github.com/repos/kubernetes/minikube/statuses/${ghprbActualCommit}?access_token=$access_token" \
|
curl "https://api.github.com/repos/kubernetes/minikube/statuses/${ghprbActualCommit}?access_token=$access_token" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
|
|
|
@ -1,56 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# 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.
|
|
||||||
|
|
||||||
|
|
||||||
# This script runs the integration tests on an OSX machine for the Virtualbox Driver
|
|
||||||
|
|
||||||
# The script expects the following env variabls:
|
|
||||||
# MINIKUBE_LOCATION: GIT_COMMIT from upstream build.
|
|
||||||
# COMMIT: Actual commit ID from upstream build
|
|
||||||
# EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests
|
|
||||||
# access_token: The Github API access token. Injected by the Jenkins credential provider.
|
|
||||||
|
|
||||||
|
|
||||||
set -e
|
|
||||||
OS_ARCH="darwin-amd64"
|
|
||||||
|
|
||||||
# Download files and set permissions
|
|
||||||
source common.sh
|
|
||||||
|
|
||||||
./out/minikube-${OS_ARCH} delete || true
|
|
||||||
rm -rf $HOME/.minikube || true
|
|
||||||
|
|
||||||
# Allow this to fail, we'll switch on the return code below.
|
|
||||||
set +e
|
|
||||||
out/e2e-${OS_ARCH} -minikube-args="--vm-driver=virtualbox --cpus=4 --show-libmachine-logs --v=100 ${EXTRA_BUILD_ARGS} --iso-url=http://storage.googleapis.com/minikube/iso/buildroot/minikube-v0.0.5.iso" -test.v -test.timeout=60m -binary=out/minikube-${OS_ARCH}
|
|
||||||
result=$?
|
|
||||||
set -e
|
|
||||||
|
|
||||||
if [[ $result -eq 0 ]]; then
|
|
||||||
status="success"
|
|
||||||
else
|
|
||||||
status="failure"
|
|
||||||
fi
|
|
||||||
|
|
||||||
set +x
|
|
||||||
target_url="https://storage.googleapis.com/minikube-builds/logs/${MINIKUBE_LOCATION}/OSX-Virtualbox-SystemD.txt"
|
|
||||||
curl "https://api.github.com/repos/kubernetes/minikube/statuses/${COMMIT}?access_token=$access_token" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-X POST \
|
|
||||||
-d "{\"state\": \"$status\", \"description\": \"Jenkins\", \"target_url\": \"$target_url\", \"context\": \"OSX-VirtualBox-SystemD\"}"
|
|
||||||
set -x
|
|
||||||
|
|
||||||
exit $result
|
|
|
@ -59,7 +59,7 @@ var LogFlags = [...]string{
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
DefaultIsoUrl = "https://storage.googleapis.com/minikube/minikube-0.7.iso"
|
DefaultIsoUrl = "https://storage.googleapis.com/minikube/iso/minikube-v1.0.1.iso"
|
||||||
ShaSuffix = ".sha256"
|
ShaSuffix = ".sha256"
|
||||||
DefaultIsoShaUrl = DefaultIsoUrl + ShaSuffix
|
DefaultIsoShaUrl = DefaultIsoUrl + ShaSuffix
|
||||||
DefaultMemory = 2048
|
DefaultMemory = 2048
|
||||||
|
|
Loading…
Reference in New Issue