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

upgrade conmon to v2.0.24

pull/14265/head
Sharif Elgamal 2022-05-31 10:43:55 -07:00
parent 6902580a35
commit cd01efdf37
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/minikube/cmd/start.go
View File

@ -312,11 +312,6 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
return node.Starter{}, errors.Wrap(err, "Failed to generate config") return node.Starter{}, errors.Wrap(err, "Failed to generate config")
} }
// Bail cleanly for qemu2 until implemented
if driver.IsVM(cc.Driver) && runtime.GOARCH == "arm64" && cc.KubernetesConfig.ContainerRuntime != "docker" {
exit.Message(reason.Unimplemented, "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.")
}
// This is about as far as we can go without overwriting config files // This is about as far as we can go without overwriting config files
if viper.GetBool(dryRun) { if viper.GetBool(dryRun) {
out.Step(style.DryRun, `dry-run validation complete!`) out.Step(style.DryRun, `dry-run validation complete!`)

1
deploy/iso/minikube-iso/package/conmon/conmon.hash
View File

@ -8,3 +8,4 @@ sha256 93f7c127cb536fc60f4c08291fd34e99e492fdc6a36e6b0ddad97d868ecf10f7 29c33670
sha256 d82ad6c1e315f8310ed75fe6905f81dce61b61d55a156e9e04c9855e78e1e165 v2.0.6.tar.gz sha256 d82ad6c1e315f8310ed75fe6905f81dce61b61d55a156e9e04c9855e78e1e165 v2.0.6.tar.gz
sha256 abe4e1cc02505c81857c1eeced008a24b4dd41659d42a1e3395754fb063aef36 v2.0.7.tar.gz sha256 abe4e1cc02505c81857c1eeced008a24b4dd41659d42a1e3395754fb063aef36 v2.0.7.tar.gz
sha256 a116b8422c65778bd677c29f55b3ceaae07d09da336f71bdc68fc7bb83d50e03 v2.0.17.tar.gz sha256 a116b8422c65778bd677c29f55b3ceaae07d09da336f71bdc68fc7bb83d50e03 v2.0.17.tar.gz
sha256 e00bc44a8bd783fd417a5c90d3b8c15035ddc69b18350a31258e7f79aec8c697 v2.0.24.tar.gz

4
deploy/iso/minikube-iso/package/conmon/conmon.mk
View File

@ -4,8 +4,8 @@
# #
################################################################################ ################################################################################
CONMON_VERSION = v2.0.17 CONMON_VERSION = v2.0.24
CONMON_COMMIT = 41877362fc4685d55e0473d2e4a1cbe5e1debee0 CONMON_COMMIT = 9cbc71d699291dfb14e7c1e348a0d48feff7a27d
CONMON_SITE = https://github.com/containers/conmon/archive CONMON_SITE = https://github.com/containers/conmon/archive
CONMON_SOURCE = $(CONMON_VERSION).tar.gz CONMON_SOURCE = $(CONMON_VERSION).tar.gz
CONMON_LICENSE = Apache-2.0 CONMON_LICENSE = Apache-2.0