Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ISO: Update conmon from v2.0.24 to v2.1.2 #14545

Merged
merged 2 commits into from
Jul 29, 2022
Merged

ISO: Update conmon from v2.0.24 to v2.1.2 #14545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73f231c
update conmon from v2.0.24 to v2.1.2
spowelljr Jul 11, 2022
0539506
Updating ISO to v1.26.0-1657933211-14545
minikube-bot Jul 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-1657340101-14534
ISO_VERSION ?= v1.26.0-1657933211-14545
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
DEB_REVISION ?= 0
Expand Down
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/package/conmon/conmon.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ sha256 d82ad6c1e315f8310ed75fe6905f81dce61b61d55a156e9e04c9855e78e1e165 v2.0.6.t
sha256 abe4e1cc02505c81857c1eeced008a24b4dd41659d42a1e3395754fb063aef36 v2.0.7.tar.gz
sha256 a116b8422c65778bd677c29f55b3ceaae07d09da336f71bdc68fc7bb83d50e03 v2.0.17.tar.gz
sha256 e00bc44a8bd783fd417a5c90d3b8c15035ddc69b18350a31258e7f79aec8c697 v2.0.24.tar.gz
sha256 8ba76eb54c319197235fd39c3a5b5a975b5a21e02cd4be985b8619220a497a0e v2.1.2.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/package/conmon/conmon.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

CONMON_VERSION = v2.0.24
CONMON_COMMIT = 9cbc71d699291dfb14e7c1e348a0d48feff7a27d
CONMON_VERSION = v2.1.2
CONMON_COMMIT = 2bc95ee697e87d5f7b77063cf83fc32739addafe
CONMON_SITE = https://github.com/containers/conmon/archive
CONMON_SOURCE = $(CONMON_VERSION).tar.gz
CONMON_LICENSE = Apache-2.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/download/iso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/14534"
isoBucket := "minikube-builds/iso/14545"
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),
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/commands/start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/14534/minikube-v1.26.0-1657340101-14534-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657340101-14534/minikube-v1.26.0-1657340101-14534-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657340101-14534-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14534/minikube-v1.26.0-1657340101-14534.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657340101-14534/minikube-v1.26.0-1657340101-14534.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657340101-14534.iso])
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/14545/minikube-v1.26.0-1657933211-14545-amd64.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657933211-14545/minikube-v1.26.0-1657933211-14545-amd64.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657933211-14545-amd64.iso,https://storage.googleapis.com/minikube-builds/iso/14545/minikube-v1.26.0-1657933211-14545.iso,https://github.com/kubernetes/minikube/releases/download/v1.26.0-1657933211-14545/minikube-v1.26.0-1657933211-14545.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.26.0-1657933211-14545.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
Expand Down