kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13191 from afbjorklund/cri-dockerd-bin 

ISO: Add packaging for cri-dockerd
pull/13554/head
Sharif Elgamal 2022-02-03 11:30:13 -08:00 committed by GitHub
parent 3a923b245e 89ec289ec7
commit 4cc5dd0dce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
ISO_VERSION ?= v1.25.0
ISO_VERSION ?= v1.25.0-1643824279-13191
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
DEB_REVISION ?= 0

1
deploy/iso/minikube-iso/package/Config.in
View File

@ -6,6 +6,7 @@ menu "System tools"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crictl-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/docker-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cri-dockerd/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-plugins/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hyperv-daemons/Config.in"

8
deploy/iso/minikube-iso/package/cri-dockerd/Config.in Normal file
View File

@ -0,0 +1,8 @@
config BR2_PACKAGE_CRI_DOCKERD
bool "cri-dockerd"
default y
depends on BR2_x86_64
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_DOCKER_BIN

2
deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.hash Normal file
View File

@ -0,0 +1,2 @@
sha256 4acd7605a0cb95a6ad50314d1f2497b92ee0f07382062d0c18a5434c1a3b9513 542e27dee12db61d6e96d2a83a20359474a5efa2.tar.gz
sha256 b2a082a8846ac74b8482ee6353d480cea0dec017bbec2b59b16e3f91efa2f5ca eb0c48ef49856f7d098ec005ddebcae197e08e49.tar.gz

44
deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk Normal file
View File

@ -0,0 +1,44 @@
################################################################################
#
# cri-dockerd
#
################################################################################
# 0.2.0
CRI_DOCKERD_VERSION = eb0c48ef49856f7d098ec005ddebcae197e08e49
CRI_DOCKERD_SITE = https://github.com/Mirantis/cri-dockerd/archive
CRI_DOCKERD_SOURCE = $(CRI_DOCKERD_VERSION).tar.gz
CRI_DOCKERD_DEPENDENCIES = host-go
CRI_DOCKERD_GOPATH = $(@D)/_output
CRI_DOCKERD_ENV = \
$(GO_TARGET_ENV) \
CGO_ENABLED=0 \
GO111MODULE=on \
GOPATH="$(CRI_DOCKERD_GOPATH)" \
GOBIN="$(CRI_DOCKERD_GOPATH)/bin" \
PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH)
CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd
define CRI_DOCKERD_BUILD_CMDS
$(CRI_DOCKERD_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) static-linux
endef
define CRI_DOCKERD_INSTALL_TARGET_CMDS
$(INSTALL) -Dm755 \
$(@D)/packaging/static/build/linux/cri-dockerd/cri-dockerd \
$(TARGET_DIR)/usr/bin/cri-dockerd
endef
define CRI_DOCKERD_INSTALL_INIT_SYSTEMD
$(INSTALL) -Dm644 \
$(@D)/packaging/systemd/cri-docker.service \
$(TARGET_DIR)/usr/lib/systemd/system/cri-docker.service
$(INSTALL) -Dm644 \
$(@D)/packaging/systemd/cri-docker.socket \
$(TARGET_DIR)/usr/lib/systemd/system/cri-docker.socket
endef
$(eval $(generic-package))

2
pkg/minikube/download/iso.go
View File

@ -40,7 +40,7 @@ const fileScheme = "file"
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
func DefaultISOURLs() []string {
v := version.GetISOVersion()
isoBucket := "minikube/iso"
isoBucket := "minikube-builds/iso/13191"
return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", isoBucket, v),
fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s.iso", v, v),

2
site/content/en/docs/commands/start.md
View File

@ -68,7 +68,7 @@ minikube start [flags]
--insecure-registry strings Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.
--install-addons If set, install addons. Defaults to true. (default true)
--interactive Allow user prompts for more information (default true)
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube/iso/minikube-v1.25.0.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.0/minikube-v1.25.0.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.0.iso])
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13191/minikube-v1.25.0-1643824279-13191.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.0-1643824279-13191/minikube-v1.25.0-1643824279-13191.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.0-1643824279-13191.iso])
--keep-context This will keep the existing kubectl context and will create a minikube context.
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.23.2, 'latest' for v1.23.3-rc.0). Defaults to 'stable'.
--kvm-gpu Enable experimental NVIDIA GPU support in minikube