Skip to content

Commit 6acec84

Browse files
authored
Merge branch 'kubernetes:master' into main
2 parents b497115 + 804c01a commit 6acec84

File tree

13 files changed

+30
-14
lines changed

13 files changed

+30
-14
lines changed

cmd/minikube/cmd/config/kubernetes_version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"net/http"
2222

23-
"github.com/google/go-github/v72/github"
23+
"github.com/google/go-github/v73/github"
2424
"golang.org/x/mod/semver"
2525
"k8s.io/minikube/pkg/minikube/constants"
2626
)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
2929
github.com/google/go-cmp v0.7.0
3030
github.com/google/go-containerregistry v0.20.3
31-
github.com/google/go-github/v72 v72.0.0
31+
github.com/google/go-github/v73 v73.0.0
3232
github.com/google/slowjam v1.1.2
3333
github.com/google/uuid v1.6.0
3434
github.com/hashicorp/go-getter v1.7.8

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,8 +1337,8 @@ github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYV
13371337
github.com/google/go-containerregistry v0.20.3 h1:oNx7IdTI936V8CQRveCjaxOiegWwvM7kqkbXTpyiovI=
13381338
github.com/google/go-containerregistry v0.20.3/go.mod h1:w00pIgBRDVUDFM6bq+Qx8lwNWK+cxgCuX1vd3PIBDNI=
13391339
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
1340-
github.com/google/go-github/v72 v72.0.0 h1:FcIO37BLoVPBO9igQQ6tStsv2asG4IPcYFi655PPvBM=
1341-
github.com/google/go-github/v72 v72.0.0/go.mod h1:WWtw8GMRiL62mvIquf1kO3onRHeWWKmK01qdCY8c5fg=
1340+
github.com/google/go-github/v73 v73.0.0 h1:aR+Utnh+Y4mMkS+2qLQwcQ/cF9mOTpdwnzlaw//rG24=
1341+
github.com/google/go-github/v73 v73.0.0/go.mod h1:fa6w8+/V+edSU0muqdhCVY7Beh1M8F1IlQPZIANKIYw=
13421342
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
13431343
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
13441344
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=

hack/preload-images/kubernetes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"strings"
2222

23-
"github.com/google/go-github/v72/github"
23+
"github.com/google/go-github/v73/github"
2424

2525
"k8s.io/klog/v2"
2626
)

hack/update/github.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"golang.org/x/mod/semver"
2525

26-
"github.com/google/go-github/v72/github"
26+
"github.com/google/go-github/v73/github"
2727
)
2828

2929
const (

hack/update/ingress_version/update_ingress_version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"strings"
2626
"time"
2727

28-
"github.com/google/go-github/v72/github"
28+
"github.com/google/go-github/v73/github"
2929
"golang.org/x/mod/semver"
3030
"k8s.io/klog/v2"
3131

hack/update/kubeadm_constants/update_kubeadm_constants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"text/template"
3030
"time"
3131

32-
"github.com/google/go-github/v72/github"
32+
"github.com/google/go-github/v73/github"
3333
"golang.org/x/mod/semver"
3434
"k8s.io/klog/v2"
3535
"k8s.io/minikube/hack/update"

hack/update/kubernetes_versions_list/update_kubernetes_versions_list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"sort"
2424
"time"
2525

26-
"github.com/google/go-github/v72/github"
26+
"github.com/google/go-github/v73/github"
2727
"golang.org/x/mod/semver"
2828
"k8s.io/klog/v2"
2929
"k8s.io/minikube/hack/update"

hack/update/site_node_version/update_site_node_version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"strings"
2323
"time"
2424

25-
"github.com/google/go-github/v72/github"
25+
"github.com/google/go-github/v73/github"
2626
"golang.org/x/mod/semver"
2727
"k8s.io/klog/v2"
2828
"k8s.io/minikube/hack/update"

pkg/drivers/vmnet/vmnet.go

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ type Helper struct {
5555
// will obtain the same MAC address from vmnet.
5656
InterfaceID string
5757

58+
// Offloading is required for krunkit, doss not work with vfkit.
59+
// We must use this until libkrun add support for disabling offloading:
60+
// https://github.com/containers/libkrun/issues/264
61+
Offloading bool
62+
5863
// Set when vmnet interface is started.
5964
macAddress string
6065
}
@@ -115,13 +120,18 @@ func ValidateHelper() error {
115120
// machine. The helper will create a unix datagram socket at the specfied path.
116121
// The client (e.g. vfkit) will connect to this socket.
117122
func (h *Helper) Start(socketPath string) error {
118-
cmd := exec.Command(
119-
"sudo",
123+
args := []string{
120124
"--non-interactive",
121125
executablePath,
122126
"--socket", socketPath,
123127
"--interface-id", h.InterfaceID,
124-
)
128+
}
129+
130+
if h.Offloading {
131+
args = append(args, "--enable-tso", "--enable-checksum-offload")
132+
}
133+
134+
cmd := exec.Command("sudo", args...)
125135

126136
// Create vmnet-helper in a new process group so it is not harmed when
127137
// terminating the minikube process group.

0 commit comments

Comments
 (0)