Merge branch 'master' of github.com:kubernetes/minikube into hyperv-test
Sharif Elgamal
commit
f1f43eab51
4
Makefile
4
Makefile
|
|
@ -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.23.1
|
||||
ISO_VERSION ?= v1.23.1-1633115168-12081
|
||||
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
|
||||
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
|
||||
DEB_REVISION ?= 0
|
||||
|
|
@ -286,7 +286,7 @@ minikube_iso: deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/b
|
|||
if [ ! -d $(BUILD_DIR)/buildroot ]; then \
|
||||
mkdir -p $(BUILD_DIR); \
|
||||
git clone --depth=1 --branch=$(BUILDROOT_BRANCH) https://github.com/buildroot/buildroot $(BUILD_DIR)/buildroot; \
|
||||
cp $(PWD)/deploy/iso/minikube-iso/go.hash $(BUILD_DIR)/buildroot/package/go/go.hash; \
|
||||
cp deploy/iso/minikube-iso/go.hash $(BUILD_DIR)/buildroot/package/go/go.hash; \
|
||||
fi;
|
||||
$(MAKE) BR2_EXTERNAL=../../deploy/iso/minikube-iso minikube_defconfig -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS)
|
||||
$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) host-python
|
||||
|
|
|
|||
|
|
@ -100,9 +100,7 @@ var logsCmd = &cobra.Command{
|
|||
err = logs.Output(cr, bs, *co.Config, co.CP.Runner, numberOfLines, logOutput)
|
||||
if err != nil {
|
||||
out.Ln("")
|
||||
// Avoid exit.Error, since it outputs the issue URL
|
||||
out.WarningT("{{.error}}", out.V{"error": err})
|
||||
os.Exit(reason.ExSvcError)
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
docker 1000 docker 1000 =tcuser /home/docker /bin/bash wheel,vboxsf,podman -
|
||||
docker 1000 docker 1000 =tcuser /home/docker /bin/bash wheel,vboxsf,podman,buildkit -
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
disable buildkit.service
|
||||
|
|
@ -12,6 +12,10 @@ BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz
|
|||
# https://github.com/opencontainers/runc.git
|
||||
BUILDKIT_RUNC_VERSION = 12644e614e25b05da6fd08a38ffa0cfe1903fdec
|
||||
|
||||
define BUILDKIT_BIN_USERS
|
||||
- -1 buildkit -1 - - - - -
|
||||
endef
|
||||
|
||||
define BUILDKIT_BIN_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -D -m 0755 \
|
||||
$(@D)/buildctl \
|
||||
|
|
@ -25,6 +29,24 @@ define BUILDKIT_BIN_INSTALL_TARGET_CMDS
|
|||
$(INSTALL) -D -m 0755 \
|
||||
$(@D)/buildkitd \
|
||||
$(TARGET_DIR)/usr/sbin
|
||||
$(INSTALL) -D -m 644 \
|
||||
$(BUILDKIT_BIN_PKGDIR)/buildkit.conf \
|
||||
$(TARGET_DIR)/usr/lib/tmpfiles.d/buildkit.conf
|
||||
$(INSTALL) -D -m 644 \
|
||||
$(BUILDKIT_BIN_PKGDIR)/buildkitd.toml \
|
||||
$(TARGET_DIR)/etc/buildkit/buildkitd.toml
|
||||
endef
|
||||
|
||||
define BUILDKIT_BIN_INSTALL_INIT_SYSTEMD
|
||||
$(INSTALL) -D -m 644 \
|
||||
$(BUILDKIT_BIN_PKGDIR)/buildkit.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/buildkit.service
|
||||
$(INSTALL) -D -m 644 \
|
||||
$(BUILDKIT_BIN_PKGDIR)/buildkit.socket \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/buildkit.socket
|
||||
$(INSTALL) -D -m 644 \
|
||||
$(BUILDKIT_BIN_PKGDIR)/51-buildkit.preset \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system-preset/51-buildkit.preset
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
d /run/buildkit 0770 root buildkit
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[Unit]
|
||||
Description=BuildKit
|
||||
Requires=buildkit.socket
|
||||
After=buildkit.socket
|
||||
Documentation=https://github.com/moby/buildkit
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/sbin/buildkitd --addr fd://
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
[Unit]
|
||||
Description=BuildKit
|
||||
Documentation=https://github.com/moby/buildkit
|
||||
|
||||
[Socket]
|
||||
ListenStream=%t/buildkit/buildkitd.sock
|
||||
SocketMode=0660
|
||||
SocketUser=root
|
||||
SocketGroup=buildkit
|
||||
|
||||
[Install]
|
||||
WantedBy=sockets.target
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
[worker.oci]
|
||||
enabled = false
|
||||
[worker.containerd]
|
||||
enabled = true
|
||||
namespace = "k8s.io"
|
||||
|
|
@ -21,5 +21,5 @@ sha256 74a4e916acddc6cf47ab5752bdebb6732ce2c028505ef57b7edc21d2da9039b6 v1.18.4.
|
|||
sha256 fc8a8e61375e3ce30563eeb0fd6534c4f48fc20300a72e6ff51cc99cb2703516 v1.19.0.tar.gz
|
||||
sha256 6165c5b8212ea03be2a465403177318bfe25a54c3e8d66d720344643913a0223 v1.19.1.tar.gz
|
||||
sha256 76fd7543bc92d4364a11060f43a5131893a76c6e6e9d6de3a6bb6292c110b631 v1.20.0.tar.gz
|
||||
sha256 1c01d4a76cdcfe3ac24147eb1d5f6ebd782bd98fb0ac0c19b79bd5a6560b1481 v1.20.2.tar.gz
|
||||
sha256 36d9f4cf4966342e2d4099e44d8156c55c6a10745c67ce4f856aa9f6dcc2d9ba v1.20.2.tar.gz
|
||||
sha256 bc53ea8977e252bd9812974c33ff654ee22076598e901464468c5c105a5ef773 v1.22.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -142,14 +142,21 @@ COPY deploy/kicbase/containerd-fuse-overlayfs.service /etc/systemd/system/contai
|
|||
# install buildkit
|
||||
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') \
|
||||
&& echo "Installing buildkit ..." \
|
||||
&& addgroup --system buildkit \
|
||||
&& export BUILDKIT_BASE_URL="https://github.com/moby/buildkit/releases/download/${BUILDKIT_VERSION}" \
|
||||
&& curl -sSL --retry 5 --output /tmp/buildkit.tgz "${BUILDKIT_BASE_URL}/buildkit-${BUILDKIT_VERSION}.linux-${ARCH}.tar.gz" \
|
||||
&& tar -C /usr/local -xzvf /tmp/buildkit.tgz \
|
||||
&& rm -rf /tmp/buildkit.tgz \
|
||||
&& mkdir -p /usr/local/lib/systemd/system \
|
||||
&& curl -L --retry 5 --output /usr/local/lib/systemd/system/buildkit.service "https://raw.githubusercontent.com/moby/buildkit/${BUILDKIT_VERSION}/examples/systemd/buildkit.service" \
|
||||
&& curl -L --retry 5 --output /usr/local/lib/systemd/system/buildkit.socket "https://raw.githubusercontent.com/moby/buildkit/${BUILDKIT_VERSION}/examples/systemd/buildkit.socket" \
|
||||
&& mkdir -p /etc/buildkit \
|
||||
&& echo "[worker.oci]\n enabled = false\n[worker.containerd]\n enabled = true\n namespace = \"k8s.io\"" > /etc/buildkit/buildkitd.toml \
|
||||
&& chmod 755 /usr/local/bin/buildctl \
|
||||
&& chmod 755 /usr/local/bin/buildkit-runc \
|
||||
&& chmod 755 /usr/local/bin/buildkit-qemu-* \
|
||||
&& chmod 755 /usr/local/bin/buildkitd
|
||||
&& chmod 755 /usr/local/bin/buildkitd \
|
||||
&& systemctl enable buildkit.socket
|
||||
|
||||
# Install cri-o/podman dependencies:
|
||||
RUN sh -c "echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
|
||||
|
|
@ -210,6 +217,7 @@ EXPOSE 22
|
|||
RUN adduser --ingroup docker --disabled-password --gecos '' docker
|
||||
RUN adduser docker sudo
|
||||
RUN adduser docker podman
|
||||
RUN adduser docker buildkit
|
||||
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||
USER docker
|
||||
RUN mkdir /home/docker/.ssh
|
||||
|
|
|
|||
8
go.mod
8
go.mod
|
|
@ -3,7 +3,7 @@ module k8s.io/minikube
|
|||
go 1.17
|
||||
|
||||
require (
|
||||
cloud.google.com/go/storage v1.16.1
|
||||
cloud.google.com/go/storage v1.17.0
|
||||
contrib.go.opencensus.io/exporter/stackdriver v0.12.1
|
||||
github.com/Delta456/box-cli-maker/v2 v2.2.2
|
||||
github.com/GoogleCloudPlatform/docker-credential-gcr v0.0.0-20210713212222-faed5e8b8ca2
|
||||
|
|
@ -19,7 +19,7 @@ require (
|
|||
github.com/cloudevents/sdk-go/v2 v2.5.0
|
||||
github.com/cloudfoundry-attic/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
|
||||
github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 // indirect
|
||||
github.com/docker/docker v20.10.7+incompatible
|
||||
github.com/docker/docker v20.10.9+incompatible
|
||||
github.com/docker/go-units v0.4.0
|
||||
github.com/docker/machine v0.16.2
|
||||
github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e
|
||||
|
|
@ -66,7 +66,7 @@ require (
|
|||
github.com/pmezard/go-difflib v1.0.0
|
||||
github.com/russross/blackfriday v1.5.3-0.20200218234912-41c5fccfd6f6 // indirect
|
||||
github.com/samalba/dockerclient v0.0.0-20160414174713-91d7393ff859 // indirect
|
||||
github.com/shirou/gopsutil/v3 v3.21.8
|
||||
github.com/shirou/gopsutil/v3 v3.21.9
|
||||
github.com/spf13/cobra v1.2.1
|
||||
github.com/spf13/pflag v1.0.5
|
||||
github.com/spf13/viper v1.9.0
|
||||
|
|
@ -194,7 +194,7 @@ require (
|
|||
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
|
||||
google.golang.org/appengine v1.6.7 // indirect
|
||||
google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83 // indirect
|
||||
google.golang.org/genproto v0.0.0-20210921142501-181ce0d877f6 // indirect
|
||||
google.golang.org/grpc v1.40.0 // indirect
|
||||
google.golang.org/protobuf v1.27.1 // indirect
|
||||
gopkg.in/inf.v0 v0.9.1 // indirect
|
||||
|
|
|
|||
15
go.sum
15
go.sum
|
|
@ -55,8 +55,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
|
|||
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
|
||||
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
|
||||
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
|
||||
cloud.google.com/go/storage v1.16.1 h1:sMEIc4wxvoY3NXG7Rn9iP7jb/2buJgWR1vNXCR/UPfs=
|
||||
cloud.google.com/go/storage v1.16.1/go.mod h1:LaNorbty3ehnU3rEjXSNV/NRgQA0O8Y+uh6bPe5UOk4=
|
||||
cloud.google.com/go/storage v1.17.0 h1:CDpe3jS3EiD5nGlbtvyA4EUfkF6k9GMrxLR8+hLmoec=
|
||||
cloud.google.com/go/storage v1.17.0/go.mod h1:0wRtHSM3Npk/QJYdwcpRNVRVJlH2OxyWF9Dws3J+MtE=
|
||||
cloud.google.com/go/trace v0.1.0 h1:nUGUK79FOkN0UGUXhBmVBkbu1PYsHe0YyFSPLOD9Npg=
|
||||
cloud.google.com/go/trace v0.1.0/go.mod h1:wxEwsoeRVPbeSkt7ZC9nWCgmoKQRAoySN7XHW2AmI7g=
|
||||
contrib.go.opencensus.io/exporter/stackdriver v0.12.1 h1:Dll2uFfOVI3fa8UzsHyP6z0M6fEc9ZTAMo+Y3z282Xg=
|
||||
|
|
@ -366,8 +366,9 @@ github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc
|
|||
github.com/docker/docker v17.12.0-ce-rc1.0.20181225093023-5ddb1d410a8b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/docker v17.12.0-ce-rc1.0.20190115220918-5ec31380a5d3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/docker v20.10.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/docker v20.10.7+incompatible h1:Z6O9Nhsjv+ayUEeI1IojKbYcsGdgYSNqxe1s2MYzUhQ=
|
||||
github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/docker v20.10.9+incompatible h1:JlsVnETOjM2RLQa0Cc1XCIspUdXW3Zenq9P54uXBm6k=
|
||||
github.com/docker/docker v20.10.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ=
|
||||
github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
|
||||
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
|
||||
|
|
@ -1052,8 +1053,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg
|
|||
github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
|
||||
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
|
||||
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
|
||||
github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA=
|
||||
github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
|
||||
github.com/shirou/gopsutil/v3 v3.21.9 h1:Vn4MUz2uXhqLSiCbGFRc0DILbMVLAY92DSkT8bsYrHg=
|
||||
github.com/shirou/gopsutil/v3 v3.21.9/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
|
||||
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
|
||||
github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
|
||||
github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
|
||||
|
|
@ -1702,11 +1703,11 @@ google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKr
|
|||
google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
|
||||
google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
|
||||
google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
|
||||
google.golang.org/genproto v0.0.0-20210825212027-de86158e7fda/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
|
||||
google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
|
||||
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
|
||||
google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83 h1:3V2dxSZpz4zozWWUq36vUxXEKnSYitEH2LdsAx+RUmg=
|
||||
google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
|
||||
google.golang.org/genproto v0.0.0-20210921142501-181ce0d877f6 h1:2ncG/LajxmrclaZH+ppVi02rQxz4eXYJzGHdFN4Y9UA=
|
||||
google.golang.org/genproto v0.0.0-20210921142501-181ce0d877f6/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
|
||||
google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
|
||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ type benchmark struct {
|
|||
App float64 `json:"app"`
|
||||
DNSAns float64 `json:"dnsAns"`
|
||||
Total float64 `json:"total"`
|
||||
CPU float64 `json:"cpu"`
|
||||
}
|
||||
|
||||
// benchmarks contains a list of benchmarks, used for storing benchmark results to JSON
|
||||
|
|
@ -70,8 +71,8 @@ func readInLatestBenchmark(latestBenchmarkPath string) benchmark {
|
|||
log.Fatal(err)
|
||||
}
|
||||
|
||||
var cmd, api, k8s, dnsSvc, app, dnsAns float64
|
||||
steps := []*float64{&cmd, &api, &k8s, &dnsSvc, &app, &dnsAns}
|
||||
var cmd, api, k8s, dnsSvc, app, dnsAns, cpu float64
|
||||
steps := []*float64{&cmd, &api, &k8s, &dnsSvc, &app, &dnsAns, &cpu}
|
||||
count := 0
|
||||
|
||||
r := csv.NewReader(f)
|
||||
|
|
@ -91,8 +92,13 @@ func readInLatestBenchmark(latestBenchmarkPath string) benchmark {
|
|||
|
||||
values := []float64{}
|
||||
|
||||
// 8-13 contain the benchmark results
|
||||
// 8-13 and 16 contain the benchmark results
|
||||
var idx []int
|
||||
for i := 8; i <= 13; i++ {
|
||||
idx = append(idx, i)
|
||||
}
|
||||
idx = append(idx, 16)
|
||||
for _, i := range idx {
|
||||
v, err := strconv.ParseFloat(line[i], 64)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
|
|
@ -108,10 +114,14 @@ func readInLatestBenchmark(latestBenchmarkPath string) benchmark {
|
|||
var total float64
|
||||
for _, step := range steps {
|
||||
*step /= float64(count)
|
||||
// Don't add CPU time to the total time.
|
||||
if step == &cpu {
|
||||
continue
|
||||
}
|
||||
total += *step
|
||||
}
|
||||
|
||||
return benchmark{time.Now(), cmd, api, k8s, dnsSvc, app, dnsAns, total}
|
||||
return benchmark{time.Now(), cmd, api, k8s, dnsSvc, app, dnsAns, total, cpu}
|
||||
}
|
||||
|
||||
// readInPastBenchmarks reads in the past benchmark results from a JSON file
|
||||
|
|
@ -144,8 +154,8 @@ func updateRunsFile(h *benchmarks, pastRunsPath string) {
|
|||
// createChart creates a time series chart of the benchmarks
|
||||
func createChart(benchmarks []benchmark, chartOutputPath string) {
|
||||
n := len(benchmarks)
|
||||
var cmdXYs, apiXYs, k8sXYs, dnsSvcXYs, appXYs, dnsAnsXYs, totalXYs plotter.XYs
|
||||
xys := []*plotter.XYs{&cmdXYs, &apiXYs, &k8sXYs, &dnsSvcXYs, &appXYs, &dnsAnsXYs, &totalXYs}
|
||||
var cmdXYs, apiXYs, k8sXYs, dnsSvcXYs, appXYs, dnsAnsXYs, totalXYs, cpuXYs plotter.XYs
|
||||
xys := []*plotter.XYs{&cmdXYs, &apiXYs, &k8sXYs, &dnsSvcXYs, &appXYs, &dnsAnsXYs, &totalXYs, &cpuXYs}
|
||||
|
||||
for _, xy := range xys {
|
||||
*xy = make(plotter.XYs, n)
|
||||
|
|
@ -164,6 +174,7 @@ func createChart(benchmarks []benchmark, chartOutputPath string) {
|
|||
{&appXYs, b.App},
|
||||
{&dnsAnsXYs, b.DNSAns},
|
||||
{&totalXYs, b.Total},
|
||||
{&cpuXYs, b.CPU},
|
||||
}
|
||||
for _, xyValue := range xyValues {
|
||||
xy := &(*xyValue.xys)[i]
|
||||
|
|
@ -193,6 +204,7 @@ func createChart(benchmarks []benchmark, chartOutputPath string) {
|
|||
{appXYs, color.RGBA{R: 255, G: 255, A: 255}, "App Running"},
|
||||
{dnsAnsXYs, color.RGBA{G: 255, B: 255, A: 255}, "DNS Answering"},
|
||||
{totalXYs, color.RGBA{B: 255, R: 140, A: 255}, "Total"},
|
||||
{cpuXYs, color.RGBA{B: 57, R: 127, G: 85, A: 255}, "CPU"},
|
||||
}
|
||||
|
||||
for _, step := range steps {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit f6f6b2db9e718f7c9af698b6247b232a7251522f
|
||||
Subproject commit 6e6133456e56553c341fd1a8a465fd302d85123d
|
||||
|
|
@ -123,10 +123,8 @@ func tryCreateDockerNetwork(ociBin string, subnet *network.Parameters, mtu int,
|
|||
args = append(args, "-o")
|
||||
args = append(args, fmt.Sprintf("com.docker.network.driver.mtu=%d", mtu))
|
||||
}
|
||||
|
||||
args = append(args, fmt.Sprintf("--label=%s=%s", CreatedByLabelKey, "true"))
|
||||
}
|
||||
args = append(args, name)
|
||||
args = append(args, fmt.Sprintf("--label=%s=%s", CreatedByLabelKey, "true"), name)
|
||||
|
||||
rr, err := runCmd(exec.Command(ociBin, args...))
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ import (
|
|||
|
||||
const (
|
||||
// Version is the current version of kic
|
||||
Version = "v0.0.27"
|
||||
Version = "v0.0.27-1633027942-12081"
|
||||
// SHA of the kic base image
|
||||
baseImageSHA = "89b4738ee74ba28684676e176752277f0db46f57d27f0e08c3feec89311e22de"
|
||||
baseImageSHA = "4780f1897569d2bf77aafb3d133a08d42b4fe61127f06fcfc90c2c5d902d893c"
|
||||
// The name of the GCR kicbase repository
|
||||
gcrRepo = "gcr.io/k8s-minikube/kicbase"
|
||||
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
|
||||
// The name of the Dockerhub kicbase repository
|
||||
dockerhubRepo = "docker.io/kicbase/stable"
|
||||
dockerhubRepo = "docker.io/kicbase/build"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
|||
|
|
@ -467,7 +467,7 @@ var Addons = map[string]*Addon{
|
|||
"helm-tiller-svc.yaml",
|
||||
"0640"),
|
||||
}, false, "helm-tiller", "", map[string]string{
|
||||
"Tiller": "helm/tiller:v2.16.12@sha256:6003775d503546087266eda39418d221f9afb5ccfe35f637c32a1161619a3f9c",
|
||||
"Tiller": "helm/tiller:v2.17.0@sha256:4c43eb385032945cad047d2350e4945d913b90b3ab43ee61cecb32a495c6df0f",
|
||||
}, map[string]string{
|
||||
// GCR is deprecated in helm
|
||||
// https://github.com/helm/helm/issues/10004#issuecomment-894478908
|
||||
|
|
|
|||
|
|
@ -393,10 +393,6 @@ func downloadRemote(cr CommandRunner, src string) (string, error) {
|
|||
|
||||
// BuildImage builds an image into this runtime
|
||||
func (r *Containerd) BuildImage(src string, file string, tag string, push bool, env []string, opts []string) error {
|
||||
if err := r.initBuildkitDaemon(); err != nil {
|
||||
return fmt.Errorf("failed to init buildkit daemon: %v", err)
|
||||
}
|
||||
|
||||
// download url if not already present
|
||||
dir, err := downloadRemote(r.Runner, src)
|
||||
if err != nil {
|
||||
|
|
@ -456,24 +452,6 @@ func (r *Containerd) PushImage(name string) error {
|
|||
}
|
||||
return nil
|
||||
}
|
||||
func (r *Containerd) initBuildkitDaemon() error {
|
||||
// if daemon is already running, do nothing
|
||||
cmd := exec.Command("pgrep", "buildkitd")
|
||||
if _, err := r.Runner.RunCmd(cmd); err == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
// otherwise, start daemon
|
||||
cmd = exec.Command("/bin/bash", "-c", "sudo -b buildkitd --oci-worker false --containerd-worker true --containerd-worker-namespace k8s.io &> /dev/null")
|
||||
if _, err := r.Runner.RunCmd(cmd); err != nil {
|
||||
return fmt.Errorf("failed to start buildkit daemon: %v", err)
|
||||
}
|
||||
|
||||
// give the daemon time to finish starting up or image build will fail
|
||||
time.Sleep(1 * time.Second)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// CGroupDriver returns cgroup driver ("cgroupfs" or "systemd")
|
||||
func (r *Containerd) CGroupDriver() (string, error) {
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ import (
|
|||
"k8s.io/minikube/pkg/minikube/style"
|
||||
)
|
||||
|
||||
// PossibleLeftOvers deletes KIC & non-KIC drivers left
|
||||
// PossibleLeftOvers deletes KIC driver left overs
|
||||
func PossibleLeftOvers(ctx context.Context, cname string, driverName string) {
|
||||
bin := ""
|
||||
switch driverName {
|
||||
|
|
|
|||
|
|
@ -40,7 +40,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/iso"
|
||||
isoBucket := "minikube-builds/iso/12081"
|
||||
return []string{
|
||||
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", isoBucket, v),
|
||||
fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s.iso", v, v),
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ minikube start [flags]
|
|||
--apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine
|
||||
--apiserver-port int The apiserver listening port (default 8443)
|
||||
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
|
||||
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase:v0.0.27@sha256:89b4738ee74ba28684676e176752277f0db46f57d27f0e08c3feec89311e22de")
|
||||
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.27-1633027942-12081@sha256:4780f1897569d2bf77aafb3d133a08d42b4fe61127f06fcfc90c2c5d902d893c")
|
||||
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
|
||||
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)
|
||||
--cni string CNI plug-in to use. Valid options: auto, bridge, calico, cilium, flannel, kindnet, or path to a CNI manifest (default: auto)
|
||||
|
|
@ -66,7 +66,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/iso/minikube-v1.23.1.iso,https://github.com/kubernetes/minikube/releases/download/v1.23.1/minikube-v1.23.1.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.23.1.iso])
|
||||
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/12081/minikube-v1.23.1-1633115168-12081.iso,https://github.com/kubernetes/minikube/releases/download/v1.23.1-1633115168-12081/minikube-v1.23.1-1633115168-12081.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.23.1-1633115168-12081.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.22.2, 'latest' for v1.22.3-rc.0). Defaults to 'stable'.
|
||||
--kvm-gpu Enable experimental NVIDIA GPU support in minikube
|
||||
|
|
|
|||
|
|
@ -255,6 +255,10 @@ func validateImageCommands(ctx context.Context, t *testing.T, profile string) {
|
|||
t.Run("ImageBuild", func(t *testing.T) {
|
||||
MaybeParallel(t)
|
||||
|
||||
if _, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "pgrep", "buildkitd")); err == nil {
|
||||
t.Errorf("buildkitd process is running, should not be running until `minikube image build` is ran")
|
||||
}
|
||||
|
||||
newImage := fmt.Sprintf("localhost/my-image:%s", profile)
|
||||
|
||||
// try to build the new image with minikube
|
||||
|
|
|
|||
|
|
@ -173,6 +173,13 @@ func validateVerifyDeleted(ctx context.Context, t *testing.T, profile string) {
|
|||
t.Errorf("expected to see error and volume %q to not exist after deletion but got no error and this output: %s", rr.Command(), rr.Output())
|
||||
}
|
||||
|
||||
rr, err = Run(t, exec.CommandContext(ctx, "sudo", bin, "network", "ls"))
|
||||
if err != nil {
|
||||
t.Errorf("failed to get list of networks: %v", err)
|
||||
}
|
||||
if strings.Contains(rr.Output(), profile) {
|
||||
t.Errorf("expected network %q to not exist after deletion but contained: %s", profile, rr.Output())
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ spec:
|
|||
- name: busybox
|
||||
# flaky nslookup in busybox versions newer than 1.28:
|
||||
# https://github.com/docker-library/busybox/issues/48
|
||||
# note: gcr.io/kubernetes-e2e-test-images/dnsutils:1.3
|
||||
# note: k8s.gcr.io/e2e-test-images/agnhost:2.32
|
||||
# has similar issues (ie, resolves but returns exit code 1)
|
||||
image: busybox:1.28
|
||||
command:
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ spec:
|
|||
containers:
|
||||
# dnsutils is easier to debug DNS issues with than the standard busybox image
|
||||
- name: dnsutils
|
||||
image: gcr.io/kubernetes-e2e-test-images/dnsutils
|
||||
image: k8s.gcr.io/e2e-test-images/agnhost:2.32
|
||||
command:
|
||||
["/bin/sh", "-c", "while true; do echo hello | nc -l -p 8080; done"]
|
||||
affinity:
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ spec:
|
|||
containers:
|
||||
# dnsutils is easier to debug DNS issues with than the standard busybox image
|
||||
- name: dnsutils
|
||||
image: gcr.io/kubernetes-e2e-test-images/dnsutils:1.3
|
||||
image: k8s.gcr.io/e2e-test-images/agnhost:2.32
|
||||
command:
|
||||
["/bin/sh", "-c", "while true; do echo hello | nc -l -p 8080; done"]
|
||||
---
|
||||
|
|
|
|||
|
|
@ -597,53 +597,53 @@
|
|||
"Suggestion: {{.advice}}": "提案: {{.advice}}",
|
||||
"Suggestion: {{.fix}}": "提案: {{.fix}}",
|
||||
"System only has {{.size}}MiB available, less than the required {{.req}}MiB for Kubernetes": "",
|
||||
"Tag images": "",
|
||||
"Tag to apply to the new image (optional)": "",
|
||||
"Target directory {{.path}} must be an absolute path": "",
|
||||
"Target {{.path}} can not be empty": "",
|
||||
"Test docs have been saved at - {{.path}}": "",
|
||||
"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "「{{.driver_name}}」ドライバにはルート権限が必要です。「sudo minikube --vm-driver={{.driver_name}}」を使用して minikube を実行してください",
|
||||
"The \"{{.driver_name}}\" driver should not be used with root privileges.": "",
|
||||
"The \"{{.name}}\" cluster has been deleted.": "「{{.name}}」クラスタが削除されました",
|
||||
"The \"{{.name}}\" cluster has been deleted.__1": "「{{.name}}」クラスタが削除されました",
|
||||
"The 'none' driver is designed for experts who need to integrate with an existing VM": "",
|
||||
"The 'none' driver provides limited isolation and may reduce system security and reliability.": "ドライバに「none」を指定すると、分離が制限され、システムのセキュリティと信頼性が低下する可能性があります",
|
||||
"The '{{.addonName}}' addon is enabled": "",
|
||||
"The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "",
|
||||
"The '{{.driver}}' provider was not found: {{.error}}": "",
|
||||
"The '{{.name}} driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "",
|
||||
"The '{{.name}}' driver does not respect the --cpus flag": "",
|
||||
"The '{{.name}}' driver does not respect the --memory flag": "",
|
||||
"The --image-repository flag your provided contains Scheme: {{.scheme}}, which will be removed automatically": "",
|
||||
"The --image-repository flag your provided ended with a trailing / that could cause conflict in kuberentes, removed automatically": "",
|
||||
"The CIDR to be used for service cluster IPs.": "サービス クラスタ IP に使用される CIDR",
|
||||
"The CIDR to be used for the minikube VM (virtualbox driver only)": "minikube VM に使用される CIDR（virtualbox ドライバのみ）",
|
||||
"The KVM QEMU connection URI. (kvm2 driver only)": "KVM QEMU 接続 URI（kvm2 ドライバのみ）",
|
||||
"The KVM default network name. (kvm2 driver only)": "",
|
||||
"The KVM driver is unable to resurrect this old VM. Please run `minikube delete` to delete it and try again.": "",
|
||||
"The KVM network name. (kvm2 driver only)": "KVM ネットワーク名（kvm2 ドライバのみ）",
|
||||
"The VM driver crashed. Run 'minikube start --alsologtostderr -v=8' to see the VM driver error message": "",
|
||||
"The VM driver exited with an error, and may be corrupt. Run 'minikube start' with --alsologtostderr -v=8 to see the error": "",
|
||||
"The VM that minikube is configured for no longer exists. Run 'minikube delete'": "",
|
||||
"The \\\"{{.name}}\\\" container runtime requires CNI": "",
|
||||
"The ambassador addon has stopped working as of v1.23.0, for more details visit: https://github.com/datawire/ambassador-operator/issues/73": "",
|
||||
"The apiserver listening port": "API サーバー リスニング ポート",
|
||||
"Tag images": "イメージのタグ付与",
|
||||
"Tag to apply to the new image (optional)": "新しいイメージに適用するタグ (任意)",
|
||||
"Target directory {{.path}} must be an absolute path": "ターゲットディレクトリ {{.path}} は絶対パスでなければなりません。",
|
||||
"Target {{.path}} can not be empty": "ターゲット {{.path}} は空にできません",
|
||||
"Test docs have been saved at - {{.path}}": "テストドキュメントは {{.path}} に保存されました",
|
||||
"The \"{{.driver_name}}\" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}": "「{{.driver_name}}」ドライバーにはルート権限が必要です。'sudo minikube --vm-driver={{.driver_name}}' を使用して minikube を実行してください",
|
||||
"The \"{{.driver_name}}\" driver should not be used with root privileges.": "「{{.driver_name}}」ドライバーは root 権限で使用すべきではありません。",
|
||||
"The \"{{.name}}\" cluster has been deleted.": "「{{.name}}」クラスターが削除されました",
|
||||
"The \"{{.name}}\" cluster has been deleted.__1": "「{{.name}}」クラスターが削除されました",
|
||||
"The 'none' driver is designed for experts who need to integrate with an existing VM": "'none' ドライバーは既存 VM の統合が必要なエキスパートに向けて設計されています。",
|
||||
"The 'none' driver provides limited isolation and may reduce system security and reliability.": "ドライバーに 'none' を指定すると、分離が制限され、システムのセキュリティーと信頼性が低下する可能性があります",
|
||||
"The '{{.addonName}}' addon is enabled": "'{{.addonName}}' アドオンが有効です",
|
||||
"The '{{.driver}}' driver requires elevated permissions. The following commands will be executed:\\n\\n{{ .example }}\\n": "'{{.driver}}' ドライバーは権限昇格が必要です。次のコマンドを実行してください:\\n\\n{{ .example }}\\n",
|
||||
"The '{{.driver}}' provider was not found: {{.error}}": "'{{.driver}}' プロバイダーが見つかりません: {{.error}}",
|
||||
"The '{{.name}} driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/": "'{{.name}} ドライバーは複数のプロファイルをサポートしていません: https://minikube.sigs.k8s.io/docs/reference/drivers/none/",
|
||||
"The '{{.name}}' driver does not respect the --cpus flag": "'{{.name}}' ドライバーは --cpus フラグを無視します",
|
||||
"The '{{.name}}' driver does not respect the --memory flag": "'{{.name}}' ドライバーは --memory フラグを無視します",
|
||||
"The --image-repository flag your provided contains Scheme: {{.scheme}}, which will be removed automatically": "指定された --image-repository フラグは {{.scheme}} スキームを含んでいますので、自動的に削除されます",
|
||||
"The --image-repository flag your provided ended with a trailing / that could cause conflict in kuberentes, removed automatically": "指定された --image-repository フラグは kubernetes で競合の原因となりうる / が末尾に付いていますので、自動的に削除されます",
|
||||
"The CIDR to be used for service cluster IPs.": "サービスクラスター IP に使用される CIDR。",
|
||||
"The CIDR to be used for the minikube VM (virtualbox driver only)": "minikube VM に使用される CIDR (virtualbox ドライバーのみ)",
|
||||
"The KVM QEMU connection URI. (kvm2 driver only)": "KVM QEMU 接続 URI (kvm2 ドライバーのみ)",
|
||||
"The KVM default network name. (kvm2 driver only)": "KVM デフォルトネットワーク名 (kvm2 ドライバーのみ)",
|
||||
"The KVM driver is unable to resurrect this old VM. Please run `minikube delete` to delete it and try again.": "KVM ドライバーはこの古い VM を復元できません。`minikube delete` で VM を削除して、再度試行してください。",
|
||||
"The KVM network name. (kvm2 driver only)": "KVM ネットワーク名 (kvm2 ドライバーのみ)",
|
||||
"The VM driver crashed. Run 'minikube start --alsologtostderr -v=8' to see the VM driver error message": "VM ドライバーがクラッシュしました。'minikube start --alsologtostderr -v=8' を実行して、VM ドライバーのエラーメッセージを参照してください",
|
||||
"The VM driver exited with an error, and may be corrupt. Run 'minikube start' with --alsologtostderr -v=8 to see the error": "VM ドライバーがエラー停止したため、破損している可能性があります。'minikube start --alsologtostderr -v=8' を実行して、エラーを参照してください",
|
||||
"The VM that minikube is configured for no longer exists. Run 'minikube delete'": "minikube が設定された VM はもう存在しません。'minikube delete' を実行してください",
|
||||
"The \\\"{{.name}}\\\" container runtime requires CNI": "「{{.name}}」コンテナーランタイムは CNI が必要です",
|
||||
"The ambassador addon has stopped working as of v1.23.0, for more details visit: https://github.com/datawire/ambassador-operator/issues/73": "v1.23.0 で ambassador アドオンは機能を停止しました。 詳細はこちらを参照してください: https://github.com/datawire/ambassador-operator/issues/73",
|
||||
"The apiserver listening port": "API サーバーリスニングポート",
|
||||
"The apiserver name which is used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "Kubernetes 用に生成された証明書で使用される API サーバー名。マシンの外部から API サーバーを利用できるようにする場合に使用します",
|
||||
"The argument to pass the minikube mount command on start": "起動時に minikube マウント コマンドを渡す引数",
|
||||
"The argument to pass the minikube mount command on start.": "",
|
||||
"The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine": "",
|
||||
"The base image to use for docker/podman drivers. Intended for local development.": "",
|
||||
"The certificate hostname provided appears to be invalid (may be a minikube bug, try 'minikube delete')": "",
|
||||
"The cluster dns domain name used in the Kubernetes cluster": "",
|
||||
"The cluster dns domain name used in the kubernetes cluster": "Kubernetes クラスタで使用されるクラスタ DNS ドメイン名",
|
||||
"The cluster {{.cluster}} already exists which means the --nodes parameter will be ignored. Use \"minikube node add\" to add nodes to an existing cluster.": "",
|
||||
"The container runtime to be used (docker, crio, containerd)": "使用されるコンテナ ランタイム（docker、crio、containerd）",
|
||||
"The control plane for \"{{.name}}\" is paused!": "",
|
||||
"The control plane node \"{{.name}}\" does not exist.": "",
|
||||
"The control plane node is not running (state={{.state}})": "",
|
||||
"The control plane node must be running for this command": "",
|
||||
"The argument to pass the minikube mount command on start": "起動時に minikube マウントコマンドを渡す引数",
|
||||
"The argument to pass the minikube mount command on start.": "起動時に minikube マウントコマンドを渡す引数。",
|
||||
"The authoritative apiserver hostname for apiserver certificates and connectivity. This can be used if you want to make the apiserver available from outside the machine": "API サーバーの証明書と接続のための、権威 API サーバーホスト名。マシン外部から API サーバーに接続できるようにしたい場合に使用します。",
|
||||
"The base image to use for docker/podman drivers. Intended for local development.": "Docker/Podman ドライバーで使用されるベースイメージ。ローカルデプロイ用です。",
|
||||
"The certificate hostname provided appears to be invalid (may be a minikube bug, try 'minikube delete')": "提供された証明書ホスト名が無効のようです (minikube のバグかも知れません。'minikube delete' を試してください)",
|
||||
"The cluster dns domain name used in the Kubernetes cluster": "Kubernetes クラスターで使用されるクラスター DNS ドメイン名",
|
||||
"The cluster dns domain name used in the kubernetes cluster": "Kubernetes クラスターで使用されるクラスター DNS ドメイン名",
|
||||
"The cluster {{.cluster}} already exists which means the --nodes parameter will be ignored. Use \"minikube node add\" to add nodes to an existing cluster.": "{{.cluster}} クラスターは既に存在するので、--nodes パラメーターは無視されます。「minikube node add」を使って、既存クラスターにノードを追加してください。",
|
||||
"The container runtime to be used (docker, crio, containerd)": "使用されるコンテナーランタイム (docker、crio、containerd)",
|
||||
"The control plane for \"{{.name}}\" is paused!": "「{{.name}}」用コントロールプレーンは一時停止中です！",
|
||||
"The control plane node \"{{.name}}\" does not exist.": "「{{.name}}」コントロールプレーンノードが存在しません。",
|
||||
"The control plane node is not running (state={{.state}})": "コントロールプレーンノードは実行中ではありません (state={{.state}})",
|
||||
"The control plane node must be running for this command": "このコマンドではコントロールプレーンノードが実行中でなければなりません",
|
||||
"The cri socket path to be used": "使用される CRI ソケットパス",
|
||||
"The cri socket path to be used.": "",
|
||||
"The cri socket path to be used.": "使用される CRI ソケットパス。",
|
||||
"The docker-env command is incompatible with multi-node clusters. Use the 'registry' add-on: https://minikube.sigs.k8s.io/docs/handbook/registry/": "",
|
||||
"The docker-env command is only compatible with the \"docker\" runtime, but this cluster was configured to use the \"{{.runtime}}\" runtime.": "",
|
||||
"The driver '{{.driver}}' is not supported on {{.os}}/{{.arch}}": "ドライバ「{{.driver}}」は、{{.os}}/{{.arch}} ではサポートされていません",
|
||||
|
|
|
|||
Loading…
Reference in New Issue