Skip to content

Commit 78d7a89

Browse files
authored
Merge branch 'master' into feat/add-translations
2 parents 6a571ab + b7f6cf2 commit 78d7a89

File tree

9 files changed

+58
-25
lines changed

9 files changed

+58
-25
lines changed

.github/workflows/update-flannel-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ jobs:
4444
title: 'CNI: Update flannel from ${{ steps.bumpFlannel.outputs.OLD_VERSION }} to ${{ steps.bumpFlannel.outputs.NEW_VERSION }}'
4545
labels: ok-to-test
4646
body: |
47-
The flannel project released a [new version](https://github.com/projectflannel/flannel)
47+
The flannel project released a [new version](https://github.com/flannel-io/flannel)
4848
4949
This PR was auto-generated by `make update-flannel-version` using [update-flannel-version.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows/update-flannel-version.yml) CI Workflow.

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ require (
6767
golang.org/x/term v0.10.0
6868
golang.org/x/text v0.11.0
6969
gonum.org/v1/plot v0.13.0
70-
google.golang.org/api v0.132.0
70+
google.golang.org/api v0.133.0
7171
gopkg.in/yaml.v2 v2.4.0
7272
k8s.io/api v0.27.4
7373
k8s.io/apimachinery v0.27.4
@@ -92,7 +92,7 @@ require (
9292
github.com/juju/mutex/v2 v2.0.0
9393
github.com/moby/patternmatcher v0.5.0
9494
github.com/opencontainers/runc v1.1.7
95-
github.com/santhosh-tekuri/jsonschema/v5 v5.3.0
95+
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
9696
)
9797

9898
require (
@@ -218,7 +218,7 @@ require (
218218
google.golang.org/appengine v1.6.7 // indirect
219219
google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect
220220
google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect
221-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
221+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771 // indirect
222222
google.golang.org/grpc v1.56.2 // indirect
223223
google.golang.org/protobuf v1.31.0 // indirect
224224
gopkg.in/inf.v0 v0.9.1 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,8 +1397,8 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb
13971397
github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
13981398
github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
13991399
github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
1400-
github.com/santhosh-tekuri/jsonschema/v5 v5.3.0 h1:uIkTLo0AGRc8l7h5l9r+GcYi9qfVPt6lD4/bhmzfiKo=
1401-
github.com/santhosh-tekuri/jsonschema/v5 v5.3.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0=
1400+
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=
1401+
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=
14021402
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
14031403
github.com/sayboras/dockerclient v1.0.0 h1:awHcxOzTP07Gl1SJAhkTCTagyJwgA6f/Az/Z4xMP2yg=
14041404
github.com/sayboras/dockerclient v1.0.0/go.mod h1:mUmEoqt0b+uQg57s006FsvL4mybi+N5wINLDBGtaPTY=
@@ -2177,8 +2177,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ
21772177
google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
21782178
google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
21792179
google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
2180-
google.golang.org/api v0.132.0 h1:8t2/+qZ26kAOGSmOiHwVycqVaDg7q3JDILrNi/Z6rvc=
2181-
google.golang.org/api v0.132.0/go.mod h1:AeTBC6GpJnJSRJjktDcPX0QwtS8pGYZOV6MSuSCusw0=
2180+
google.golang.org/api v0.133.0 h1:N7Ym5Hl0Dpn0I0o7R1z4UpVA1GCDyS8vbPu1/ObV73A=
2181+
google.golang.org/api v0.133.0/go.mod h1:sjRL3UnjTx5UqNQS9EWr9N8p7xbHpy1k0XGRLCf3Spk=
21822182
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
21832183
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
21842184
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -2301,8 +2301,8 @@ google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIY
23012301
google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y=
23022302
google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 h1:XVeBY8d/FaK4848myy41HBqnDwvxeV3zMZhwN1TvAMU=
23032303
google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:mPBs5jNgx2GuQGvFwUvVKqtn6HsUw9nP64BedgvqEsQ=
2304-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U=
2305-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
2304+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771 h1:Z8qdAF9GFsmcUuWQ5KVYIpP3PCKydn/YKORnghIalu4=
2305+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
23062306
google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
23072307
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
23082308
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=

netlify.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ command = "pwd && cd themes/docsy && npm install && git submodule update -f --in
55

66
[build.environment]
77
NODE_VERSION = "14.21.1"
8-
HUGO_VERSION = "v0.115.3"
8+
HUGO_VERSION = "v0.115.4"
99

1010
[context.production.environment]
1111
HUGO_ENV = "production"

pkg/minikube/assets/addons.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ var Addons = map[string]*Addon{
347347
"metrics-server-service.yaml",
348348
"0640"),
349349
}, false, "metrics-server", "Kubernetes", "", "", map[string]string{
350-
"MetricsServer": "metrics-server/metrics-server:v0.6.3@sha256:c60778fa1c44d0c5a0c4530ebe83f9243ee6fc02f4c3dc59226c201931350b10",
350+
"MetricsServer": "metrics-server/metrics-server:v0.6.4@sha256:ee4304963fb035239bb5c5e8c10f2f38ee80efc16ecbdb9feb7213c17ae2e86e",
351351
}, map[string]string{
352352
"MetricsServer": "registry.k8s.io",
353353
}),

pkg/minikube/cni/flannel.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ spec:
139139
serviceAccountName: flannel
140140
initContainers:
141141
- name: install-cni-plugin
142-
image: docker.io/flannel/flannel-cni-plugin:v1.1.2
143-
#image: docker.io/rancher/mirrored-flannelcni-flannel-cni-plugin:v1.1.2
142+
image: docker.io/flannel/flannel-cni-plugin:v1.2.0
144143
command:
145144
- cp
146145
args:
@@ -151,8 +150,7 @@ spec:
151150
- name: cni-plugin
152151
mountPath: /opt/cni/bin
153152
- name: install-cni
154-
image: docker.io/flannel/flannel:v0.22.0
155-
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0
153+
image: docker.io/flannel/flannel:v0.22.1
156154
command:
157155
- cp
158156
args:
@@ -166,8 +164,7 @@ spec:
166164
mountPath: /etc/kube-flannel/
167165
containers:
168166
- name: kube-flannel
169-
image: docker.io/flannel/flannel:v0.22.0
170-
#image: docker.io/rancher/mirrored-flannelcni-flannel:v0.22.0
167+
image: docker.io/flannel/flannel:v0.22.1
171168
command:
172169
- /opt/bin/flanneld
173170
args:

pkg/minikube/constants/constants_kubeadm_images.go

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,36 @@ package constants
1818

1919
var (
2020
KubeadmImages = map[string]map[string]string{
21+
"v1.28.0-rc.0": {
22+
"coredns/coredns": "v1.10.1",
23+
"etcd": "3.5.9-0",
24+
"pause": "3.9",
25+
},
26+
"v1.28.0-beta.0": {
27+
"coredns/coredns": "v1.10.1",
28+
"etcd": "3.5.9-0",
29+
"pause": "3.9",
30+
},
31+
"v1.27.4": {
32+
"coredns/coredns": "v1.10.1",
33+
"etcd": "3.5.7-0",
34+
"pause": "3.9",
35+
},
36+
"v1.26.7": {
37+
"coredns/coredns": "v1.9.3",
38+
"etcd": "3.5.6-0",
39+
"pause": "3.9",
40+
},
41+
"v1.25.12": {
42+
"coredns/coredns": "v1.9.3",
43+
"etcd": "3.5.6-0",
44+
"pause": "3.8",
45+
},
46+
"v1.24.16": {
47+
"coredns/coredns": "v1.8.6",
48+
"etcd": "3.5.6-0",
49+
"pause": "3.7",
50+
},
2151
"v1.28.0-alpha.4": {
2252
"coredns/coredns": "v1.10.1",
2353
"etcd": "3.5.9-0",

pkg/minikube/constants/constants_kubernetes_versions.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@ package constants
2121
// ValidKubernetesVersions is a list of Kubernetes versions in order from newest to oldest
2222
// This is used when outputting Kubernetes versions and to select the latest patch version when unspecified
2323
var ValidKubernetesVersions = []string{
24+
"v1.28.0-rc.0",
25+
"v1.28.0-beta.0",
2426
"v1.28.0-alpha.4",
2527
"v1.28.0-alpha.3",
2628
"v1.28.0-alpha.2",
2729
"v1.28.0-alpha.1",
30+
"v1.27.4",
2831
"v1.27.3",
2932
"v1.27.2",
3033
"v1.27.1",
@@ -35,6 +38,7 @@ var ValidKubernetesVersions = []string{
3538
"v1.27.0-alpha.3",
3639
"v1.27.0-alpha.2",
3740
"v1.27.0-alpha.1",
41+
"v1.26.7",
3842
"v1.26.6",
3943
"v1.26.5",
4044
"v1.26.4",
@@ -48,6 +52,7 @@ var ValidKubernetesVersions = []string{
4852
"v1.26.0-alpha.3",
4953
"v1.26.0-alpha.2",
5054
"v1.26.0-alpha.1",
55+
"v1.25.12",
5156
"v1.25.11",
5257
"v1.25.10",
5358
"v1.25.9",
@@ -66,6 +71,7 @@ var ValidKubernetesVersions = []string{
6671
"v1.25.0-alpha.3",
6772
"v1.25.0-alpha.2",
6873
"v1.25.0-alpha.1",
74+
"v1.24.16",
6975
"v1.24.15",
7076
"v1.24.14",
7177
"v1.24.13",

translations/zh-CN.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -430,15 +430,15 @@
430430
"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --vm-driver": "Hyperkit 的网络挂了。升级到最新的 hyperkit 版本以及/或者 Docker 桌面版。或者,你可以通过 --vm-driver 切换其他选项",
431431
"IP Address to use to expose ports (docker and podman driver only)": "用于暴露端口的IP地址(仅适用于docker和podman驱动程序)",
432432
"IP address (ssh driver only)": "ssh 主机IP地址(仅适用于SSH驱动程序)",
433-
"If present, writes to the provided file instead of stdout.": "",
433+
"If present, writes to the provided file instead of stdout.": "如果存在,则写入所提供的文件,而不是标准输出。",
434434
"If set, automatically updates drivers to the latest version. Defaults to true.": "如果设置为 true,将自动更新驱动到最新版本。默认为 true。",
435435
"If set, delete the current cluster if start fails and try again. Defaults to false.": "如果设置为 true,则在启动失败时删除当前群集,然后重试。默认为 false。",
436436
"If set, disables metrics reporting (CPU and memory usage), this can improve CPU usage. Defaults to false.": "如果设置为 true,则禁用指标报告(CPU和内存使用率),这可以提高 CPU 利用率。默认为 false。",
437437
"If set, disables optimizations that are set for local Kubernetes. Including decreasing CoreDNS replicas from 2 to 1. Defaults to false.": "如果设置为 true,则禁用为本地 Kubernetes 做设置的优化,包括将 CoreDNS 副本数从2减少到1。默认值为false。",
438438
"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "",
439439
"If set, force the container runtime to use systemd as cgroup manager. Defaults to false.": "如果设置为 true,则强制容器运行时使用 systemd 作为 cgroup 管理器。默认为false。",
440440
"If set, install addons. Defaults to true.": "如果设置为 true,则安装插件。默认为true。",
441-
"If set, minikube VM/container will start without starting or configuring Kubernetes. (only works on new clusters)": "",
441+
"If set, minikube VM/container will start without starting or configuring Kubernetes. (only works on new clusters)": "如果设置为 true,minikube虚拟机/容器将在不启动或配置Kubernetes的情况下启动。(只适用于新集群)",
442442
"If set, pause all namespaces": "如果设置为 true,则暂停所有 namespace",
443443
"If set, unpause all namespaces": "如果设置为 true,取消暂停所有 namespace",
444444
"If the above advice does not help, please let us know:": "如果上述建议无法帮助解决问题,请告知我们:",
@@ -450,23 +450,23 @@
450450
"If true, print web links to addons' documentation if using --output=list (default).": "如果为 true,则使用 --output=list(默认值)输出 web 链接到插件文档。",
451451
"If true, returns list of profiles faster by skipping validating the status of the cluster.": "如果为 true,则通过跳过验证群集的状态从而更快地返回配置文件列表。",
452452
"If true, the added node will be marked for work. Defaults to true.": "如果为true,则添加的节点将标记为 work,默认为 true。",
453-
"If true, will perform potentially dangerous operations. Use with discretion.": "",
454-
"If you are running minikube within a VM, consider using --driver=none:": "",
453+
"If true, will perform potentially dangerous operations. Use with discretion.": "如果为 true,将执行潜在的危险操作。谨慎使用。",
454+
"If you are running minikube within a VM, consider using --driver=none:": "如果您在VM中运行 minikube,请考虑使用 --driver=none:",
455455
"If you are still interested to make {{.driver_name}} driver work. The following suggestions might help you get passed this issue:": "",
456456
"If you don't want your credentials mounted into a specific pod, add a label with the `gcp-auth-skip-secret` key to your pod configuration.": "",
457457
"If you want existing pods to be mounted with credentials, either recreate them or rerun addons enable with --refresh.": "",
458458
"Ignoring empty custom image {{.name}}": "忽略空的自定义镜像 {{.name}}",
459459
"Ignoring invalid pair entry {{.pair}}": "忽略无效的配对条目 {{.pair}}",
460460
"Ignoring unknown custom image {{.name}}": "忽略未知的自定义镜像 {{.name}}",
461-
"Ignoring unknown custom registry {{.name}}": "",
461+
"Ignoring unknown custom registry {{.name}}": "忽略未知的自定义仓库 {{.name}}",
462462
"Image was not built for the current minikube version. To resolve this you can delete and recreate your minikube cluster using the latest images. Expected minikube version: {{.imageMinikubeVersion}} -\u003e Actual minikube version: {{.minikubeVersion}}": "",
463463
"Images Commands:": "镜像命令",
464-
"Images used by this addon. Separated by commas.": "",
464+
"Images used by this addon. Separated by commas.": "这个插件使用的镜像。以逗号分隔。",
465465
"In order to use the fall back image, you need to log in to the github packages registry": "为使用后备镜像,你需要登录到 github packages registry",
466466
"Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.": "传递给 Docker 守护进程的不安全 Docker Registry。 系统会自动添加默认 service CIDR 范围。",
467467
"Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.": "传递给 Docker 守护进程的不安全 Docker 注册表。系统会自动添加默认服务 CIDR 范围。",
468468
"Install VirtualBox and ensure it is in the path, or select an alternative value for --driver": "",
469-
"Install the latest hyperkit binary, and run 'minikube delete'": "",
469+
"Install the latest hyperkit binary, and run 'minikube delete'": "安装最新的 hyperkit 二进制文件,然后运行 'minikube delete'",
470470
"Invalid port": "",
471471
"Istio needs {{.minCPUs}} CPUs -- your configuration only allocates {{.cpus}} CPUs": "",
472472
"Istio needs {{.minMem}}MB of memory -- your configuration only allocates {{.memory}}MB": "Istio 需要 {{.minMem}}MB 内存,而你的配置只分配了 {{.memory}}MB",

0 commit comments

Comments
 (0)