Skip to content

Commit 2623cfe

Browse files
authored
Merge pull request #2340 from braderhart/master
Updated to use new Minikube-maintained KVM driver
2 parents 2d8dda2 + c54e695 commit 2623cfe

File tree

4 files changed

+65
-2
lines changed

4 files changed

+65
-2
lines changed

hack/jenkins/release_update_installers.sh

+18-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ git config --global user.email "[email protected]"
1919

2020
REPLACE_PKG_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}
2121
REPLACE_MINIKUBE_LINUX_SHA256=$(awk '{ print $1 }' out/minikube-linux-amd64.sha256)
22+
REPLACE_MINIKUBE_DRIVER_KVM_SHA256=$(awk '{ print $1 }' out/docker-machine-driver-kvm2.sha256)
2223
REPLACE_MINIKUBE_DARWIN_SHA256=$(awk '{ print $1 }' out/minikube-darwin-amd64.sha256)
2324
REPLACE_CASK_CHECKPOINT=$(curl \
2425
--compressed \
@@ -44,6 +45,22 @@ pushd aur-minikube >/dev/null
4445

4546
popd >/dev/null
4647

48+
49+
git clone ssh://[email protected]/minikube.git aur-minikube-driver-kvm
50+
pushd aur-minikube-driver-kvm >/dev/null
51+
sed -e "s/\$PKG_VERSION/${REPLACE_PKG_VERSION}/g" \
52+
sed -e "s/\$MINIKUBE_DRIVER_KVM_SHA256/${REPLACE_MINIKUBE_DRIVER_KVM_SHA256}/g" \
53+
$MINIKUBE_ROOT/installers/linux/archlinux-drivers/
54+
sed -e "s/\$PKG_VERSION/${REPLACE_PKG_VERSION}/g" \
55+
-e "s/\$MINIKUBE_DRIVER_KVM_SHA256/${REPLACE_MINIKUBE_DRIVER_KVM_SHA256}/g" \
56+
$MINIKUBE_ROOT/installers/linux/archlinux-drivers/.SRCINFO > .SRCINFO
57+
git add PKGBUILD .SRCINFO
58+
git commit -m "Upgrade to version ${REPLACE_PKG_VERSION}"
59+
60+
git push origin master
61+
62+
popd >/dev/null
63+
4764
git clone --depth 1 [email protected]:minikube-bot/homebrew-cask.git # dont't pull entire history
4865

4966
pushd homebrew-cask >/dev/null
@@ -78,4 +95,4 @@ EOF
7895
EOF
7996
popd >/dev/null
8097

81-
rm -rf aur-minikube homebrew-cask
98+
rm -rf aur-minikube aur-minikube-driver-kvm homebrew-cask
+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
pkgbase = docker-machine-driver-kvm2
2+
pkgdesc = Minikube-maintained KVM driver for docker-machine
3+
pkgver = $PKG_VERSION
4+
pkgrel = 1
5+
url = https://github.com/kubernetes/minikube
6+
arch = x86_64
7+
license = Apache
8+
depends = docker-machine
9+
depends = libvirt
10+
depends = ebtables
11+
depends = dnsmasq
12+
optdepends = docker: to manage the containers in the machine
13+
source = https://github.com/kubernetes/minikube/releases/download/v$PKG_VERSION/docker-machine-driver-kvm2
14+
sha256sums = $MINIKUBE_DRIVER_KVM_SHA256
15+
16+
pkgname = docker-machine-driver-kvm2
17+
+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Maintainer: Brad Erhart <[email protected]>
2+
# Contributor: Matt Rickard <[email protected]>
3+
pkgname=docker-machine-driver-kvm2
4+
pkgver=$PKG_VERSION
5+
pkgrel=1
6+
pkgdesc="Minikube-maintained KVM driver for docker-machine"
7+
url="https://github.com/kubernetes/minikube"
8+
license=('Apache')
9+
arch=('x86_64')
10+
depends=(
11+
'docker-machine'
12+
'libvirt'
13+
'ebtables'
14+
'dnsmasq'
15+
)
16+
optdepends=(
17+
'docker: to manage the containers in the machine'
18+
)
19+
makedepends=()
20+
21+
source=("https://github.com/kubernetes/minikube/releases/download/v$pkgver/docker-machine-driver-kvm2")
22+
sha256sums=('$MINIKUBE_DRIVER_KVM_SHA256')
23+
24+
package() {
25+
cd "$srcdir"
26+
install -d "$pkgdir/usr/bin"
27+
install -m755 docker-machine-driver-kvm2 "$pkgdir/usr/bin/docker-machine-driver-kvm2"
28+
}

installers/linux/archlinux/PKGBUILD

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# vim: ts=2 sts=2 sw=2 et ft=sh
22
# Maintainer: Matt Rickard <[email protected]>
3+
# Contributor: Brad Erhart <[email protected]>
34

45
pkgname=minikube
56
pkgver=$PKG_VERSION
@@ -14,7 +15,7 @@ depends=(
1415
optdepends=(
1516
'kubectl-bin: to manage the cluster'
1617
'virtualbox'
17-
'docker-machine-kvm'
18+
'docker-machine-driver-kvm2'
1819
)
1920
makedepends=()
2021

0 commit comments

Comments
 (0)