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

Merge branch 'master' of github.com:kubernetes/minikube into fix-download-test

pull/10219/head
Sharif Elgamal 2021-01-25 12:23:15 -08:00
parent 3e7a72129f a3225d7dbf
commit e0143edad6
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -26,7 +26,7 @@ KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f
ISO_VERSION ?= v1.17.0 ISO_VERSION ?= v1.17.0
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
DEB_REVISION ?= 0 DEB_REVISION ?= 2
RPM_VERSION ?= $(DEB_VERSION) RPM_VERSION ?= $(DEB_VERSION)
RPM_REVISION ?= 0 RPM_REVISION ?= 0

3
site/content/en/docs/contrib/releasing/binaries.md
View File

@ -55,6 +55,9 @@ Update the version numbers in `Makefile`:
- beta releases use: `v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)` - beta releases use: `v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)`
- major/minor releases use: `v$(VERSION_MAJOR).$(VERSION_MINOR).0` - major/minor releases use: `v$(VERSION_MAJOR).$(VERSION_MINOR).0`
- if the ISO was updated, a patch release may use `v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)` - if the ISO was updated, a patch release may use `v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)`
* `DEB_REVISION`, `RPM_REVISION`
- for all major/minor releases, set to 0
- if updating .deb/.rpm files without a major/minor release, increment by 1
{{% alert title="Warning" color="warning" %}} {{% alert title="Warning" color="warning" %}}
Merge this PR only if all non-experimental integration tests pass! Merge this PR only if all non-experimental integration tests pass!

25
test/integration/functional_test.go
View File

@ -621,7 +621,16 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) {
t.Run("cache_reload", func(t *testing.T) { // deleting image inside minikube node manually and expecting reload to bring it back t.Run("cache_reload", func(t *testing.T) { // deleting image inside minikube node manually and expecting reload to bring it back
img := "k8s.gcr.io/pause:latest" img := "k8s.gcr.io/pause:latest"
// deleting image inside minikube node manually // deleting image inside minikube node manually
rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "sudo", "docker", "rmi", img))
var binary string
switch ContainerRuntime() {
case "docker":
binary = "docker"
case "containerd", "crio":
binary = "crictl"
}
rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "sudo", binary, "rmi", img))
if err != nil { if err != nil {
t.Errorf("failed to manually delete image %q : %v", rr.Command(), err) t.Errorf("failed to manually delete image %q : %v", rr.Command(), err)
@ -694,9 +703,19 @@ func validateLogsCmd(ctx context.Context, t *testing.T, profile string) {
if err != nil { if err != nil {
t.Errorf("%s failed: %v", rr.Command(), err) t.Errorf("%s failed: %v", rr.Command(), err)
} }
for _, word := range []string{"Docker", "apiserver", "Linux", "kubelet"} { expectedWords := []string{"apiserver", "Linux", "kubelet"}
switch ContainerRuntime() {
case "docker":
expectedWords = append(expectedWords, "Docker")
case "containerd":
expectedWords = append(expectedWords, "containerd")
case "crio":
expectedWords = append(expectedWords, "crio")
}
for _, word := range expectedWords {
if !strings.Contains(rr.Stdout.String(), word) { if !strings.Contains(rr.Stdout.String(), word) {
t.Errorf("excpeted minikube logs to include word: -%q- but got \n***%s***\n", word, rr.Output()) t.Errorf("expected minikube logs to include word: -%q- but got \n***%s***\n", word, rr.Output())
} }
} }
} }