Merge pull request #14481 from spowelljr/updateBaseImages
ISO/Kicbase: Update base imagespull/14529/head
Steven Powell
GitHub
commit
381d0f1d10
2
Makefile
2
Makefile
|
|
@ -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.26.0-1656448385-14420
|
||||
ISO_VERSION ?= v1.26.0-1656700267-14481
|
||||
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
|
||||
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
|
||||
DEB_REVISION ?= 0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
FROM golang:1.8
|
||||
FROM golang:1.18
|
||||
ADD auto-pause-hook /auto-pause-hook
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
FROM ubuntu:18.04
|
||||
FROM ubuntu:20.04
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y apt dpkg apt-utils ca-certificates software-properties-common \
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
|
||||
# multi-stage docker build so we can build auto-pause for arm64
|
||||
FROM golang:1.17 as auto-pause
|
||||
FROM golang:1.18 as auto-pause
|
||||
WORKDIR /src
|
||||
# auto-pause depends on core minikube code so we need to pass the whole source code as the context
|
||||
# copy in the minimal amount of source code possible
|
||||
|
|
@ -36,7 +36,7 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui
|
|||
|
||||
# start from ubuntu 20.04, this image is reasonably small as a starting point
|
||||
# for a kubernetes node image, it doesn't contain much we don't need
|
||||
FROM ubuntu:focal-20220316 as kicbase
|
||||
FROM ubuntu:focal-20220531 as kicbase
|
||||
|
||||
ARG BUILDKIT_VERSION="v0.10.3"
|
||||
ARG FUSE_OVERLAYFS_VERSION="v1.7.1"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
# Includes tools used for kubernetes/minikube CI
|
||||
# NOTE: we attempt to avoid unnecessary tools and image layers while
|
||||
# supporting kubernetes builds, minikube installation, etc.
|
||||
FROM debian:buster
|
||||
FROM debian:bullseye
|
||||
|
||||
# arg that specifies the go version to install
|
||||
ARG GO_VERSION
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ import (
|
|||
|
||||
const (
|
||||
// Version is the current version of kic
|
||||
Version = "v0.0.32-1656350719-14420"
|
||||
Version = "v0.0.32-1656700284-14481"
|
||||
// SHA of the kic base image
|
||||
baseImageSHA = "e7b7f38d1a2eba7828afc2c4c3d24e1d391db431976e47aa6dc5c7a6b038ca4e"
|
||||
baseImageSHA = "96d18f055abcf72b9f587e13317d6f9b5bb6f60e9fa09d6c51e11defaf9bf842"
|
||||
// The name of the GCR kicbase repository
|
||||
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
|
||||
// The name of the Dockerhub kicbase repository
|
||||
|
|
|
|||
|
|
@ -41,7 +41,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-builds/iso/14420"
|
||||
isoBucket := "minikube-builds/iso/14481"
|
||||
return []string{
|
||||
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
|
||||
fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH),
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ minikube start [flags]
|
|||
--apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine
|
||||
--apiserver-port int The apiserver listening port (default 8443)
|
||||
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
|
||||
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.32-1656350719-14420@sha256:e7b7f38d1a2eba7828afc2c4c3d24e1d391db431976e47aa6dc5c7a6b038ca4e")
|
||||
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.32-1656700284-14481@sha256:96d18f055abcf72b9f587e13317d6f9b5bb6f60e9fa09d6c51e11defaf9bf842")
|
||||
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
|
||||
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
|
||||
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)
|
||||
|
|
@ -69,7 +69,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-builds/iso/14420/minikube-v1.26.0-1656448385-14420-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656448385-14420/minikube-v1.26.0-1656448385-14420-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656448385-14420-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14420/minikube-v1.26.0-1656448385-14420.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656448385-14420/minikube-v1.26.0-1656448385-14420.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656448385-14420.iso])
|
||||
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14481/minikube-v1.26.0-1656700267-14481-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656700267-14481/minikube-v1.26.0-1656700267-14481-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656700267-14481-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14481/minikube-v1.26.0-1656700267-14481.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1656700267-14481/minikube-v1.26.0-1656700267-14481.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1656700267-14481.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.24.2, 'latest' for v1.24.2). Defaults to 'stable'.
|
||||
--kvm-gpu Enable experimental NVIDIA GPU support in minikube
|
||||
|
|
|
|||
Loading…
Reference in New Issue