`,
+ ])
+ );
+
+ const options = {
+ title: `Flake rate and duration by day of ${desiredTest} on ${desiredEnvironment}`,
+ width: window.innerWidth,
+ height: window.innerHeight,
+ pointSize: 10,
+ pointShape: "circle",
+ series: {
+ 0: { targetAxisIndex: 0 },
+ 1: { targetAxisIndex: 1 },
+ },
+ vAxes: {
+ 0: { title: "Flake rate", minValue: 0, maxValue: 100 },
+ 1: { title: "Duration (seconds)" },
+ },
+ colors: ['#dc3912', '#3366cc'],
+ tooltip: { trigger: "selection", isHtml: true }
+ };
+ const chart = new google.visualization.LineChart(document.getElementById('chart_div'));
+ chart.draw(data, options);
+}
+
+init();
diff --git a/hack/jenkins/test-flake-chart/optimize_data.sh b/hack/jenkins/test-flake-chart/optimize_data.sh
new file mode 100755
index 0000000000..641dd6905b
--- /dev/null
+++ b/hack/jenkins/test-flake-chart/optimize_data.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Copyright 2021 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Takes a CSV file through stdin, compresses it and writes it to stdout.
+# Example usage: < data.csv ./optimize_data.sh > data_optimized.csv
+
+set -eu -o pipefail
+
+# Take input CSV. For each field, if it is the same as the previous row, replace it with an empty string.
+# This is to compress the input CSV. Example:
+# Input:
+# hash,2021-06-10,Docker_Linux,TestFunctional,Passed,0.5
+# hash,2021-06-10,Docker_Linux_containerd,TestFunctional,Failed,0.6
+#
+# Output:
+# hash,2021-06-10,Docker_Linux,TestFunctional,Passed,0.5
+# ,,DockerLinux_containerd,,Failed,0.6
+awk -F, 'BEGIN {OFS = FS} { for(i=1; i<=NF; i++) { if($i == j[i]) { $i = ""; } else { j[i] = $i; } } printf "%s\n",$0 }'
diff --git a/hack/jenkins/test-flake-chart/process_data.sh b/hack/jenkins/test-flake-chart/process_data.sh
new file mode 100755
index 0000000000..b51e07a9e2
--- /dev/null
+++ b/hack/jenkins/test-flake-chart/process_data.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Copyright 2021 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Takes a series of gopogh summary jsons, and formats them into a CSV file with
+# a row for each test.
+# Example usage: cat gopogh_1.json gopogh_2.json gopogh_3.json | ./process_data.sh
+
+set -eu -o pipefail
+
+# Print header.
+printf "Commit Hash,Test Date,Environment,Test,Status,Duration\n"
+
+# Turn each test in each summary file to a CSV line containing its commit hash, date, environment, test, status, and duration.
+# Example line:
+# 247982745892,2021-06-10,Docker_Linux,TestFunctional,Passed,0.5
+jq -r '((.PassedTests[]? as $name | {commit: (.Detail.Details | split(":") | .[0]), date: (.Detail.Details | split(":") | .[1]), environment: .Detail.Name, test: $name, duration: .Durations[$name], status: "Passed"}),
+ (.FailedTests[]? as $name | {commit: (.Detail.Details | split(":") | .[0]), date: (.Detail.Details | split(":") | .[1]), environment: .Detail.Name, test: $name, duration: .Durations[$name], status: "Failed"}),
+ (.SkippedTests[]? as $name | {commit: (.Detail.Details | split(":") | .[0]), date: (.Detail.Details | split(":") | .[1]), environment: .Detail.Name, test: $name, duration: 0, status: "Skipped"}))
+ | .commit + "," + .date + "," + .environment + "," + .test + "," + .status + "," + (.duration | tostring)'
diff --git a/hack/jenkins/test-flake-chart/report_flakes.sh b/hack/jenkins/test-flake-chart/report_flakes.sh
new file mode 100755
index 0000000000..62ceed3360
--- /dev/null
+++ b/hack/jenkins/test-flake-chart/report_flakes.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+# Copyright 2021 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Creates a comment on the provided PR number, using the provided gopogh summary
+# to list out the flake rates of all failing tests.
+# Example usage: ./report_flakes.sh 11602 gopogh.json Docker_Linux
+
+set -eu -o pipefail
+
+if [ "$#" -ne 3 ]; then
+ echo "Wrong number of arguments. Usage: report_flakes.sh " 1>&2
+ exit 1
+fi
+
+PR_NUMBER=$1
+SUMMARY_DATA=$2
+ENVIRONMENT=$3
+
+# To prevent having a super-long comment, add a maximum number of tests to report.
+MAX_REPORTED_TESTS=30
+
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+
+TMP_DATA=$(mktemp)
+# 1) Process the data in the gopogh summary.
+# 2) Filter tests to only include failed tests on the environment (and only get their names).
+# 3) Sort the names of the tests.
+# 4) Store in file $TMP_DATA.
+< "$SUMMARY_DATA" $DIR/process_data.sh \
+ | sed -n -r -e "s/[0-9a-f]*,[0-9-]*,$ENVIRONMENT,([a-zA-Z\/_-]*),Failed,[.0-9]*/\1/p" \
+ | sort \
+ > "$TMP_DATA"
+
+# Download the precomputed flake rates from the GCS bucket into file $TMP_FLAKE_RATES.
+TMP_FLAKE_RATES=$(mktemp)
+gsutil cp gs://minikube-flake-rate/flake_rates.csv "$TMP_FLAKE_RATES"
+
+TMP_FAILED_RATES="$TMP_FLAKE_RATES\_filtered"
+# 1) Parse/filter the flake rates to only include the test name and flake rates for environment.
+# 2) Sort the flake rates based on test name.
+# 3) Join the flake rates with the failing tests to only get flake rates of failing tests.
+# 4) Sort failed test flake rates based on the flakiness of that test - stable tests should be first on the list.
+# 5) Store in file $TMP_FAILED_RATES.
+< "$TMP_FLAKE_RATES" sed -n -r -e "s/$ENVIRONMENT,([a-zA-Z\/_-]*),([.0-9]*),[.0-9]*/\1,\2/p" \
+ | sort -t, -k1,1 \
+ | join -t , -j 1 "$TMP_DATA" - \
+ | sort -g -t, -k2,2 \
+ > "$TMP_FAILED_RATES"
+
+FAILED_RATES_LINES=$(wc -l < "$TMP_FAILED_RATES")
+if [[ "$FAILED_RATES_LINES" -eq 0 ]]; then
+ echo "No failed tests! Aborting without commenting..." 1>&2
+ exit 0
+fi
+
+# Create the comment template.
+TMP_COMMENT=$(mktemp)
+printf "These are the flake rates of all failed tests on %s.\n|Failed Tests|Flake Rate (%%)|\n|---|---|\n" "$ENVIRONMENT" > "$TMP_COMMENT"
+# 1) Get the first $MAX_REPORTED_TESTS lines.
+# 2) Print a row in the table with the test name, flake rate, and a link to the flake chart for that test.
+# 3) Append these rows to file $TMP_COMMENT.
+< "$TMP_FAILED_RATES" head -n $MAX_REPORTED_TESTS \
+ | sed -n -r -e "s/([a-zA-Z\/_-]*),([.0-9]*)/|\1|\2 ([chart](https:\/\/storage.googleapis.com\/minikube-flake-rate\/flake_chart.html?env=$ENVIRONMENT\&test=\1))|/p" \
+ >> "$TMP_COMMENT"
+
+# If there are too many failing tests, add an extra row explaining this, and a message after the table.
+if [[ "$FAILED_RATES_LINES" -gt 30 ]]; then
+ printf "|More tests...|Continued...|\n\nToo many tests failed - See test logs for more details." >> "$TMP_COMMENT"
+fi
+
+# install gh if not present
+$DIR/../installers/check_install_gh.sh
+
+gh pr comment "https://github.com/kubernetes/minikube/pull/$PR_NUMBER" --body "$(cat $TMP_COMMENT)"
diff --git a/hack/jenkins/test-flake-chart/upload_tests.sh b/hack/jenkins/test-flake-chart/upload_tests.sh
new file mode 100755
index 0000000000..5906f73ae1
--- /dev/null
+++ b/hack/jenkins/test-flake-chart/upload_tests.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Copyright 2021 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Takes a gopogh summary, extracts test data as a CSV and appends to the
+# existing CSV data in the GCS bucket.
+# Example usage: ./jenkins_upload_tests.sh gopogh_summary.json
+
+set -eu -o pipefail
+
+if [ "$#" -ne 1 ]; then
+ echo "Wrong number of arguments. Usage: jenkins_upload_tests.sh " 1>&2
+ exit 1
+fi
+
+TMP_DATA=$(mktemp)
+
+# Use the gopogh summary, process it, optimize the data, remove the header, and store.
+<"$1" ./test-flake-chart/process_data.sh \
+ | ./test-flake-chart/optimize_data.sh \
+ | sed "1d" > $TMP_DATA
+
+GCS_TMP="gs://minikube-flake-rate/$(basename "$TMP_DATA")"
+
+# Copy data to append to GCS
+gsutil cp $TMP_DATA $GCS_TMP
+# Append data to existing data.
+gsutil compose gs://minikube-flake-rate/data.csv $GCS_TMP gs://minikube-flake-rate/data.csv
+# Clear all the temp stuff.
+rm $TMP_DATA
+gsutil rm $GCS_TMP
diff --git a/hack/jenkins/upload_integration_report.sh b/hack/jenkins/upload_integration_report.sh
index 04e24df09e..ddf9a6cee6 100644
--- a/hack/jenkins/upload_integration_report.sh
+++ b/hack/jenkins/upload_integration_report.sh
@@ -47,3 +47,7 @@ gsutil -qm cp "${HTML_OUT}" "gs://${JOB_GCS_BUCKET}.html" || true
SUMMARY_OUT="$ARTIFACTS/summary.txt"
echo ">> uploading ${SUMMARY_OUT}"
gsutil -qm cp "${SUMMARY_OUT}" "gs://${JOB_GCS_BUCKET}_summary.json" || true
+
+if [[ "${MINIKUBE_LOCATION}" == "master" ]]; then
+ ./test-flake-chart/jenkins_upload_tests.sh "${SUMMARY_OUT}"
+fi
diff --git a/hack/update/golang_version/update_golang_version.go b/hack/update/golang_version/update_golang_version.go
index ca1096f203..d4fc63799a 100644
--- a/hack/update/golang_version/update_golang_version.go
+++ b/hack/update/golang_version/update_golang_version.go
@@ -70,6 +70,16 @@ var (
`go-version: '.*`: `go-version: '{{.StableVersion}}'`,
},
},
+ ".github/workflows/docs.yml": {
+ Replace: map[string]string{
+ `go-version: '.*`: `go-version: '{{.StableVersion}}'`,
+ },
+ },
+ ".github/workflows/time-to-k8s.yml": {
+ Replace: map[string]string{
+ `go-version: '.*`: `go-version: '{{.StableVersion}}'`,
+ },
+ },
".travis.yml": {
Replace: map[string]string{
`go:\n - .*`: `go:{{printf "\n - %s" .StableVersion}}`,
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
index 779b5b6791..d536260046 100644
--- a/pkg/minikube/assets/addons.go
+++ b/pkg/minikube/assets/addons.go
@@ -22,6 +22,7 @@ import (
"strings"
"github.com/spf13/viper"
+ "k8s.io/minikube/deploy/addons"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/constants"
"k8s.io/minikube/pkg/minikube/out"
@@ -79,27 +80,32 @@ func (a *Addon) IsEnabled(cc *config.ClusterConfig) bool {
var Addons = map[string]*Addon{
"auto-pause": NewAddon([]*BinAsset{
MustBinAsset(
- "deploy/addons/auto-pause/auto-pause.yaml.tmpl",
+ addons.AutoPauseAssets,
+ "auto-pause/auto-pause.yaml.tmpl",
vmpath.GuestAddonsDir,
"auto-pause.yaml",
"0640"),
MustBinAsset(
- "deploy/addons/auto-pause/auto-pause-hook.yaml.tmpl",
+ addons.AutoPauseAssets,
+ "auto-pause/auto-pause-hook.yaml.tmpl",
vmpath.GuestAddonsDir,
"auto-pause-hook.yaml",
"0640"),
MustBinAsset(
- "deploy/addons/auto-pause/haproxy.cfg.tmpl",
+ addons.AutoPauseAssets,
+ "auto-pause/haproxy.cfg.tmpl",
vmpath.GuestPersistentDir,
"haproxy.cfg",
"0640"),
MustBinAsset(
- "deploy/addons/auto-pause/unpause.lua",
+ addons.AutoPauseAssets,
+ "auto-pause/unpause.lua",
vmpath.GuestPersistentDir,
"unpause.lua",
"0640"),
MustBinAsset(
- "deploy/addons/auto-pause/auto-pause.service",
+ addons.AutoPauseAssets,
+ "auto-pause/auto-pause.service",
"/etc/systemd/system/",
"auto-pause.service",
"0640"),
@@ -112,37 +118,37 @@ var Addons = map[string]*Addon{
}),
"dashboard": NewAddon([]*BinAsset{
// We want to create the kubernetes-dashboard ns first so that every subsequent object can be created
- MustBinAsset("deploy/addons/dashboard/dashboard-ns.yaml", vmpath.GuestAddonsDir, "dashboard-ns.yaml", "0640"),
- MustBinAsset("deploy/addons/dashboard/dashboard-clusterrole.yaml", vmpath.GuestAddonsDir, "dashboard-clusterrole.yaml", "0640"),
- MustBinAsset("deploy/addons/dashboard/dashboard-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "dashboard-clusterrolebinding.yaml", "0640"),
- MustBinAsset("deploy/addons/dashboard/dashboard-configmap.yaml", vmpath.GuestAddonsDir, "dashboard-configmap.yaml", "0640"),
- MustBinAsset("deploy/addons/dashboard/dashboard-dp.yaml.tmpl", vmpath.GuestAddonsDir, "dashboard-dp.yaml", "0640"),
- MustBinAsset("deploy/addons/dashboard/dashboard-role.yaml", vmpath.GuestAddonsDir, "dashboard-role.yaml", "0640"),
- MustBinAsset("deploy/addons/dashboard/dashboard-rolebinding.yaml", vmpath.GuestAddonsDir, "dashboard-rolebinding.yaml", "0640"),
- MustBinAsset("deploy/addons/dashboard/dashboard-sa.yaml", vmpath.GuestAddonsDir, "dashboard-sa.yaml", "0640"),
- MustBinAsset("deploy/addons/dashboard/dashboard-secret.yaml", vmpath.GuestAddonsDir, "dashboard-secret.yaml", "0640"),
- MustBinAsset("deploy/addons/dashboard/dashboard-svc.yaml", vmpath.GuestAddonsDir, "dashboard-svc.yaml", "0640"),
+ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-ns.yaml", vmpath.GuestAddonsDir, "dashboard-ns.yaml", "0640"),
+ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-clusterrole.yaml", vmpath.GuestAddonsDir, "dashboard-clusterrole.yaml", "0640"),
+ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-clusterrolebinding.yaml", vmpath.GuestAddonsDir, "dashboard-clusterrolebinding.yaml", "0640"),
+ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-configmap.yaml", vmpath.GuestAddonsDir, "dashboard-configmap.yaml", "0640"),
+ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-dp.yaml.tmpl", vmpath.GuestAddonsDir, "dashboard-dp.yaml", "0640"),
+ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-role.yaml", vmpath.GuestAddonsDir, "dashboard-role.yaml", "0640"),
+ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-rolebinding.yaml", vmpath.GuestAddonsDir, "dashboard-rolebinding.yaml", "0640"),
+ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-sa.yaml", vmpath.GuestAddonsDir, "dashboard-sa.yaml", "0640"),
+ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-secret.yaml", vmpath.GuestAddonsDir, "dashboard-secret.yaml", "0640"),
+ MustBinAsset(addons.DashboardAssets, "dashboard/dashboard-svc.yaml", vmpath.GuestAddonsDir, "dashboard-svc.yaml", "0640"),
}, false, "dashboard", map[string]string{
"Dashboard": "kubernetesui/dashboard:v2.1.0@sha256:7f80b5ba141bead69c4fee8661464857af300d7d7ed0274cf7beecedc00322e6",
"MetricsScraper": "kubernetesui/metrics-scraper:v1.0.4@sha256:555981a24f184420f3be0c79d4efb6c948a85cfce84034f85a563f4151a81cbf",
}, nil),
"default-storageclass": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/storageclass/storageclass.yaml.tmpl",
+ MustBinAsset(addons.DefaultStorageClassAssets,
+ "storageclass/storageclass.yaml.tmpl",
vmpath.GuestAddonsDir,
"storageclass.yaml",
"0640"),
}, true, "default-storageclass", nil, nil),
"pod-security-policy": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/pod-security-policy/pod-security-policy.yaml.tmpl",
+ MustBinAsset(addons.PodSecurityPolicyAssets,
+ "pod-security-policy/pod-security-policy.yaml.tmpl",
vmpath.GuestAddonsDir,
"pod-security-policy.yaml",
"0640"),
}, false, "pod-security-policy", nil, nil),
"storage-provisioner": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/storage-provisioner/storage-provisioner.yaml.tmpl",
+ MustBinAsset(addons.StorageProvisionerAssets,
+ "storage-provisioner/storage-provisioner.yaml.tmpl",
vmpath.GuestAddonsDir,
"storage-provisioner.yaml",
"0640"),
@@ -152,23 +158,23 @@ var Addons = map[string]*Addon{
"StorageProvisioner": "gcr.io",
}),
"storage-provisioner-gluster": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/storage-provisioner-gluster/storage-gluster-ns.yaml.tmpl",
+ MustBinAsset(addons.StorageProvisionerGlusterAssets,
+ "storage-provisioner-gluster/storage-gluster-ns.yaml.tmpl",
vmpath.GuestAddonsDir,
"storage-gluster-ns.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/storage-provisioner-gluster/glusterfs-daemonset.yaml.tmpl",
+ MustBinAsset(addons.StorageProvisionerGlusterAssets,
+ "storage-provisioner-gluster/glusterfs-daemonset.yaml.tmpl",
vmpath.GuestAddonsDir,
"glusterfs-daemonset.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/storage-provisioner-gluster/heketi-deployment.yaml.tmpl",
+ MustBinAsset(addons.StorageProvisionerGlusterAssets,
+ "storage-provisioner-gluster/heketi-deployment.yaml.tmpl",
vmpath.GuestAddonsDir,
"heketi-deployment.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/storage-provisioner-gluster/storage-provisioner-glusterfile.yaml.tmpl",
+ MustBinAsset(addons.StorageProvisionerGlusterAssets,
+ "storage-provisioner-gluster/storage-provisioner-glusterfile.yaml.tmpl",
vmpath.GuestAddonsDir,
"storage-privisioner-glusterfile.yaml",
"0640"),
@@ -180,33 +186,33 @@ var Addons = map[string]*Addon{
"GlusterfsServer": "quay.io",
}),
"efk": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/efk/elasticsearch-rc.yaml.tmpl",
+ MustBinAsset(addons.EfkAssets,
+ "efk/elasticsearch-rc.yaml.tmpl",
vmpath.GuestAddonsDir,
"elasticsearch-rc.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/efk/elasticsearch-svc.yaml.tmpl",
+ MustBinAsset(addons.EfkAssets,
+ "efk/elasticsearch-svc.yaml.tmpl",
vmpath.GuestAddonsDir,
"elasticsearch-svc.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/efk/fluentd-es-rc.yaml.tmpl",
+ MustBinAsset(addons.EfkAssets,
+ "efk/fluentd-es-rc.yaml.tmpl",
vmpath.GuestAddonsDir,
"fluentd-es-rc.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/efk/fluentd-es-configmap.yaml.tmpl",
+ MustBinAsset(addons.EfkAssets,
+ "efk/fluentd-es-configmap.yaml.tmpl",
vmpath.GuestAddonsDir,
"fluentd-es-configmap.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/efk/kibana-rc.yaml.tmpl",
+ MustBinAsset(addons.EfkAssets,
+ "efk/kibana-rc.yaml.tmpl",
vmpath.GuestAddonsDir,
"kibana-rc.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/efk/kibana-svc.yaml.tmpl",
+ MustBinAsset(addons.EfkAssets,
+ "efk/kibana-svc.yaml.tmpl",
vmpath.GuestAddonsDir,
"kibana-svc.yaml",
"0640"),
@@ -221,18 +227,18 @@ var Addons = map[string]*Addon{
"Kibana": "docker.elastic.co",
}),
"ingress": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/ingress/ingress-configmap.yaml.tmpl",
+ MustBinAsset(addons.IngressAssets,
+ "ingress/ingress-configmap.yaml.tmpl",
vmpath.GuestAddonsDir,
"ingress-configmap.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/ingress/ingress-rbac.yaml.tmpl",
+ MustBinAsset(addons.IngressAssets,
+ "ingress/ingress-rbac.yaml.tmpl",
vmpath.GuestAddonsDir,
"ingress-rbac.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/ingress/ingress-dp.yaml.tmpl",
+ MustBinAsset(addons.IngressAssets,
+ "ingress/ingress-dp.yaml.tmpl",
vmpath.GuestAddonsDir,
"ingress-dp.yaml",
"0640"),
@@ -244,8 +250,8 @@ var Addons = map[string]*Addon{
"IngressController": "k8s.gcr.io",
}),
"istio-provisioner": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/istio-provisioner/istio-operator.yaml.tmpl",
+ MustBinAsset(addons.IstioProvisionerAssets,
+ "istio-provisioner/istio-operator.yaml.tmpl",
vmpath.GuestAddonsDir,
"istio-operator.yaml",
"0640"),
@@ -253,15 +259,15 @@ var Addons = map[string]*Addon{
"IstioOperator": "istio/operator:1.5.0@sha256:25a6398ed4996a5313767ceb63768d503c266f63506ad3074b30eef6b5b5167e",
}, nil),
"istio": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/istio/istio-default-profile.yaml.tmpl",
+ MustBinAsset(addons.IstioAssets,
+ "istio/istio-default-profile.yaml.tmpl",
vmpath.GuestAddonsDir,
"istio-default-profile.yaml",
"0640"),
}, false, "istio", nil, nil),
"kubevirt": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/kubevirt/pod.yaml.tmpl",
+ MustBinAsset(addons.KubevirtAssets,
+ "kubevirt/pod.yaml.tmpl",
vmpath.GuestAddonsDir,
"pod.yaml",
"0640"),
@@ -269,23 +275,23 @@ var Addons = map[string]*Addon{
"Kubectl": "bitnami/kubectl:1.17@sha256:de642e973d3d0ef60e4d0a1f92286a9fdae245535c5990d4762bbe86fcf95887",
}, nil),
"metrics-server": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/metrics-server/metrics-apiservice.yaml.tmpl",
+ MustBinAsset(addons.MetricsServerAssets,
+ "metrics-server/metrics-apiservice.yaml.tmpl",
vmpath.GuestAddonsDir,
"metrics-apiservice.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl",
+ MustBinAsset(addons.MetricsServerAssets,
+ "metrics-server/metrics-server-deployment.yaml.tmpl",
vmpath.GuestAddonsDir,
"metrics-server-deployment.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/metrics-server/metrics-server-rbac.yaml.tmpl",
+ MustBinAsset(addons.MetricsServerAssets,
+ "metrics-server/metrics-server-rbac.yaml.tmpl",
vmpath.GuestAddonsDir,
"metrics-server-rbac.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/metrics-server/metrics-server-service.yaml.tmpl",
+ MustBinAsset(addons.MetricsServerAssets,
+ "metrics-server/metrics-server-service.yaml.tmpl",
vmpath.GuestAddonsDir,
"metrics-server-service.yaml",
"0640"),
@@ -295,13 +301,13 @@ var Addons = map[string]*Addon{
"MetricsServer": "k8s.gcr.io",
}),
"olm": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/olm/crds.yaml.tmpl",
+ MustBinAsset(addons.OlmAssets,
+ "olm/crds.yaml.tmpl",
vmpath.GuestAddonsDir,
"crds.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/olm/olm.yaml.tmpl",
+ MustBinAsset(addons.OlmAssets,
+ "olm/olm.yaml.tmpl",
vmpath.GuestAddonsDir,
"olm.yaml",
"0640"),
@@ -313,18 +319,18 @@ var Addons = map[string]*Addon{
"UpstreamCommunityOperators": "quay.io",
}),
"registry": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/registry/registry-rc.yaml.tmpl",
+ MustBinAsset(addons.RegistryAssets,
+ "registry/registry-rc.yaml.tmpl",
vmpath.GuestAddonsDir,
"registry-rc.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/registry/registry-svc.yaml.tmpl",
+ MustBinAsset(addons.RegistryAssets,
+ "registry/registry-svc.yaml.tmpl",
vmpath.GuestAddonsDir,
"registry-svc.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/registry/registry-proxy.yaml.tmpl",
+ MustBinAsset(addons.RegistryAssets,
+ "registry/registry-proxy.yaml.tmpl",
vmpath.GuestAddonsDir,
"registry-proxy.yaml",
"0640"),
@@ -335,8 +341,8 @@ var Addons = map[string]*Addon{
"KubeRegistryProxy": "gcr.io",
}),
"registry-creds": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/registry-creds/registry-creds-rc.yaml.tmpl",
+ MustBinAsset(addons.RegistryCredsAssets,
+ "registry-creds/registry-creds-rc.yaml.tmpl",
vmpath.GuestAddonsDir,
"registry-creds-rc.yaml",
"0640"),
@@ -344,28 +350,28 @@ var Addons = map[string]*Addon{
"RegistryCreds": "upmcenterprises/registry-creds:1.10@sha256:93a633d4f2b76a1c66bf19c664dbddc56093a543de6d54320f19f585ccd7d605",
}, nil),
"registry-aliases": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/registry-aliases/registry-aliases-sa.tmpl",
+ MustBinAsset(addons.RegistryAliasesAssets,
+ "registry-aliases/registry-aliases-sa.tmpl",
vmpath.GuestAddonsDir,
"registry-aliases-sa.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/registry-aliases/registry-aliases-sa-crb.tmpl",
+ MustBinAsset(addons.RegistryAliasesAssets,
+ "registry-aliases/registry-aliases-sa-crb.tmpl",
vmpath.GuestAddonsDir,
"registry-aliases-sa-crb.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/registry-aliases/registry-aliases-config.tmpl",
+ MustBinAsset(addons.RegistryAliasesAssets,
+ "registry-aliases/registry-aliases-config.tmpl",
vmpath.GuestAddonsDir,
"registry-aliases-config.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/registry-aliases/node-etc-hosts-update.tmpl",
+ MustBinAsset(addons.RegistryAliasesAssets,
+ "registry-aliases/node-etc-hosts-update.tmpl",
vmpath.GuestAddonsDir,
"node-etc-hosts-update.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/registry-aliases/patch-coredns-job.tmpl",
+ MustBinAsset(addons.RegistryAliasesAssets,
+ "registry-aliases/patch-coredns-job.tmpl",
vmpath.GuestAddonsDir,
"patch-coredns-job.yaml",
"0640"),
@@ -378,8 +384,8 @@ var Addons = map[string]*Addon{
"Pause": "gcr.io",
}),
"freshpod": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/freshpod/freshpod-rc.yaml.tmpl",
+ MustBinAsset(addons.FreshpodAssets,
+ "freshpod/freshpod-rc.yaml.tmpl",
vmpath.GuestAddonsDir,
"freshpod-rc.yaml",
"0640"),
@@ -389,8 +395,8 @@ var Addons = map[string]*Addon{
"FreshPod": "gcr.io",
}),
"nvidia-driver-installer": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/gpu/nvidia-driver-installer.yaml.tmpl",
+ MustBinAsset(addons.NvidiaDriverInstallerAssets,
+ "gpu/nvidia-driver-installer.yaml.tmpl",
vmpath.GuestAddonsDir,
"nvidia-driver-installer.yaml",
"0640"),
@@ -402,8 +408,8 @@ var Addons = map[string]*Addon{
"Pause": "k8s.gcr.io",
}),
"nvidia-gpu-device-plugin": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl",
+ MustBinAsset(addons.NvidiaGpuDevicePluginAssets,
+ "gpu/nvidia-gpu-device-plugin.yaml.tmpl",
vmpath.GuestAddonsDir,
"nvidia-gpu-device-plugin.yaml",
"0640"),
@@ -411,13 +417,13 @@ var Addons = map[string]*Addon{
"NvidiaDevicePlugin": "nvidia/k8s-device-plugin:1.0.0-beta4@sha256:94d46bf513cbc43c4d77a364e4bbd409d32d89c8e686e12551cc3eb27c259b90",
}, nil),
"logviewer": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/logviewer/logviewer-dp-and-svc.yaml.tmpl",
+ MustBinAsset(addons.LogviewerAssets,
+ "logviewer/logviewer-dp-and-svc.yaml.tmpl",
vmpath.GuestAddonsDir,
"logviewer-dp-and-svc.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/logviewer/logviewer-rbac.yaml.tmpl",
+ MustBinAsset(addons.LogviewerAssets,
+ "logviewer/logviewer-rbac.yaml.tmpl",
vmpath.GuestAddonsDir,
"logviewer-rbac.yaml",
"0640"),
@@ -425,18 +431,18 @@ var Addons = map[string]*Addon{
"LogViewer": "ivans3/minikube-log-viewer:latest@sha256:75854f45305cc47d17b04c6c588fa60777391761f951e3a34161ddf1f1b06405",
}, nil),
"gvisor": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/gvisor/gvisor-pod.yaml.tmpl",
+ MustBinAsset(addons.GvisorAssets,
+ "gvisor/gvisor-pod.yaml.tmpl",
vmpath.GuestAddonsDir,
"gvisor-pod.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/gvisor/gvisor-runtimeclass.yaml.tmpl",
+ MustBinAsset(addons.GvisorAssets,
+ "gvisor/gvisor-runtimeclass.yaml.tmpl",
vmpath.GuestAddonsDir,
"gvisor-runtimeclass.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/gvisor/gvisor-config.toml",
+ MustBinAsset(addons.GvisorAssets,
+ "gvisor/gvisor-config.toml",
vmpath.GuestGvisorDir,
constants.GvisorConfigTomlTargetName,
"0640"),
@@ -446,18 +452,18 @@ var Addons = map[string]*Addon{
"GvisorAddon": "gcr.io",
}),
"helm-tiller": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/helm-tiller/helm-tiller-dp.tmpl",
+ MustBinAsset(addons.HelmTillerAssets,
+ "helm-tiller/helm-tiller-dp.tmpl",
vmpath.GuestAddonsDir,
"helm-tiller-dp.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/helm-tiller/helm-tiller-rbac.tmpl",
+ MustBinAsset(addons.HelmTillerAssets,
+ "helm-tiller/helm-tiller-rbac.tmpl",
vmpath.GuestAddonsDir,
"helm-tiller-rbac.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/helm-tiller/helm-tiller-svc.tmpl",
+ MustBinAsset(addons.HelmTillerAssets,
+ "helm-tiller/helm-tiller-svc.tmpl",
vmpath.GuestAddonsDir,
"helm-tiller-svc.yaml",
"0640"),
@@ -467,8 +473,8 @@ var Addons = map[string]*Addon{
"Tiller": "gcr.io",
}),
"ingress-dns": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/ingress-dns/ingress-dns-pod.yaml.tmpl",
+ MustBinAsset(addons.IngressDNSAssets,
+ "ingress-dns/ingress-dns-pod.yaml.tmpl",
vmpath.GuestAddonsDir,
"ingress-dns-pod.yaml",
"0640"),
@@ -476,13 +482,13 @@ var Addons = map[string]*Addon{
"IngressDNS": "cryptexlabs/minikube-ingress-dns:0.3.0@sha256:e252d2a4c704027342b303cc563e95d2e71d2a0f1404f55d676390e28d5093ab",
}, nil),
"metallb": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/metallb/metallb.yaml.tmpl",
+ MustBinAsset(addons.MetallbAssets,
+ "metallb/metallb.yaml.tmpl",
vmpath.GuestAddonsDir,
"metallb.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/metallb/metallb-config.yaml.tmpl",
+ MustBinAsset(addons.MetallbAssets,
+ "metallb/metallb-config.yaml.tmpl",
vmpath.GuestAddonsDir,
"metallb-config.yaml",
"0640"),
@@ -491,18 +497,18 @@ var Addons = map[string]*Addon{
"Controller": "metallb/controller:v0.9.6@sha256:fbfdb9d3f55976b0ee38f3309d83a4ca703efcf15d6ca7889cd8189142286502",
}, nil),
"ambassador": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/ambassador/ambassador-operator-crds.yaml.tmpl",
+ MustBinAsset(addons.AmbassadorAssets,
+ "ambassador/ambassador-operator-crds.yaml.tmpl",
vmpath.GuestAddonsDir,
"ambassador-operator-crds.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/ambassador/ambassador-operator.yaml.tmpl",
+ MustBinAsset(addons.AmbassadorAssets,
+ "ambassador/ambassador-operator.yaml.tmpl",
vmpath.GuestAddonsDir,
"ambassador-operator.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/ambassador/ambassadorinstallation.yaml.tmpl",
+ MustBinAsset(addons.AmbassadorAssets,
+ "ambassador/ambassadorinstallation.yaml.tmpl",
vmpath.GuestAddonsDir,
"ambassadorinstallation.yaml",
"0640"),
@@ -512,57 +518,57 @@ var Addons = map[string]*Addon{
"AmbassadorOperator": "quay.io",
}),
"gcp-auth": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/gcp-auth/gcp-auth-ns.yaml.tmpl",
+ MustBinAsset(addons.GcpAuthAssets,
+ "gcp-auth/gcp-auth-ns.yaml.tmpl",
vmpath.GuestAddonsDir,
"gcp-auth-ns.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/gcp-auth/gcp-auth-service.yaml.tmpl",
+ MustBinAsset(addons.GcpAuthAssets,
+ "gcp-auth/gcp-auth-service.yaml.tmpl",
vmpath.GuestAddonsDir,
"gcp-auth-service.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/gcp-auth/gcp-auth-webhook.yaml.tmpl.tmpl",
+ MustBinAsset(addons.GcpAuthAssets,
+ "gcp-auth/gcp-auth-webhook.yaml.tmpl.tmpl",
vmpath.GuestAddonsDir,
"gcp-auth-webhook.yaml",
"0640"),
}, false, "gcp-auth", map[string]string{
"KubeWebhookCertgen": "jettech/kube-webhook-certgen:v1.3.0@sha256:ff01fba91131ed260df3f3793009efbf9686f5a5ce78a85f81c386a4403f7689",
- "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.5@sha256:4da26a6937e876c80642c98fed9efb2269a5d2cb55029de9e2685c9fd6bc1add",
+ "GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.6@sha256:c407ad6ee97d8a0e8a21c713e2d9af66aaf73315e4a123874c00b786f962f3cd",
}, map[string]string{
"GCPAuthWebhook": "gcr.io",
}),
"volumesnapshots": NewAddon([]*BinAsset{
// make sure the order of apply. `csi-hostpath-snapshotclass` must be the first position, because it depends on `snapshot.storage.k8s.io_volumesnapshotclasses`
// if user disable volumesnapshots addon and delete `csi-hostpath-snapshotclass` after `snapshot.storage.k8s.io_volumesnapshotclasses`, kubernetes will return the error
- MustBinAsset(
- "deploy/addons/volumesnapshots/csi-hostpath-snapshotclass.yaml.tmpl",
+ MustBinAsset(addons.VolumeSnapshotsAssets,
+ "volumesnapshots/csi-hostpath-snapshotclass.yaml.tmpl",
vmpath.GuestAddonsDir,
"csi-hostpath-snapshotclass.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshotclasses.yaml.tmpl",
+ MustBinAsset(addons.VolumeSnapshotsAssets,
+ "volumesnapshots/snapshot.storage.k8s.io_volumesnapshotclasses.yaml.tmpl",
vmpath.GuestAddonsDir,
"snapshot.storage.k8s.io_volumesnapshotclasses.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshotcontents.yaml.tmpl",
+ MustBinAsset(addons.VolumeSnapshotsAssets,
+ "volumesnapshots/snapshot.storage.k8s.io_volumesnapshotcontents.yaml.tmpl",
vmpath.GuestAddonsDir,
"snapshot.storage.k8s.io_volumesnapshotcontents.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshots.yaml.tmpl",
+ MustBinAsset(addons.VolumeSnapshotsAssets,
+ "volumesnapshots/snapshot.storage.k8s.io_volumesnapshots.yaml.tmpl",
vmpath.GuestAddonsDir,
"snapshot.storage.k8s.io_volumesnapshots.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/volumesnapshots/rbac-volume-snapshot-controller.yaml.tmpl",
+ MustBinAsset(addons.VolumeSnapshotsAssets,
+ "volumesnapshots/rbac-volume-snapshot-controller.yaml.tmpl",
vmpath.GuestAddonsDir,
"rbac-volume-snapshot-controller.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/volumesnapshots/volume-snapshot-controller-deployment.yaml.tmpl",
+ MustBinAsset(addons.VolumeSnapshotsAssets,
+ "volumesnapshots/volume-snapshot-controller-deployment.yaml.tmpl",
vmpath.GuestAddonsDir,
"volume-snapshot-controller-deployment.yaml",
"0640"),
@@ -572,68 +578,68 @@ var Addons = map[string]*Addon{
"SnapshotController": "k8s.gcr.io",
}),
"csi-hostpath-driver": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/rbac/rbac-external-attacher.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/rbac/rbac-external-attacher.yaml.tmpl",
vmpath.GuestAddonsDir,
"rbac-external-attacher.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/rbac/rbac-external-health-monitor-agent.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/rbac/rbac-external-health-monitor-agent.yaml.tmpl",
vmpath.GuestAddonsDir,
"rbac-external-health-monitor-agent.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/rbac/rbac-external-health-monitor-controller.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/rbac/rbac-external-health-monitor-controller.yaml.tmpl",
vmpath.GuestAddonsDir,
"rbac-external-health-monitor-controller.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/rbac/rbac-external-provisioner.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/rbac/rbac-external-provisioner.yaml.tmpl",
vmpath.GuestAddonsDir,
"rbac-external-provisioner.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/rbac/rbac-external-resizer.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/rbac/rbac-external-resizer.yaml.tmpl",
vmpath.GuestAddonsDir,
"rbac-external-resizer.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/rbac/rbac-external-snapshotter.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/rbac/rbac-external-snapshotter.yaml.tmpl",
vmpath.GuestAddonsDir,
"rbac-external-snapshotter.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-attacher.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/deploy/csi-hostpath-attacher.yaml.tmpl",
vmpath.GuestAddonsDir,
"csi-hostpath-attacher.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-driverinfo.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/deploy/csi-hostpath-driverinfo.yaml.tmpl",
vmpath.GuestAddonsDir,
"csi-hostpath-driverinfo.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-plugin.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/deploy/csi-hostpath-plugin.yaml.tmpl",
vmpath.GuestAddonsDir,
"csi-hostpath-plugin.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-provisioner.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/deploy/csi-hostpath-provisioner.yaml.tmpl",
vmpath.GuestAddonsDir,
"csi-hostpath-provisioner.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-resizer.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/deploy/csi-hostpath-resizer.yaml.tmpl",
vmpath.GuestAddonsDir,
"csi-hostpath-resizer.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-snapshotter.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/deploy/csi-hostpath-snapshotter.yaml.tmpl",
vmpath.GuestAddonsDir,
"csi-hostpath-snapshotter.yaml",
"0640"),
- MustBinAsset(
- "deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-storageclass.yaml.tmpl",
+ MustBinAsset(addons.CsiHostpathDriverAssets,
+ "csi-hostpath-driver/deploy/csi-hostpath-storageclass.yaml.tmpl",
vmpath.GuestAddonsDir,
"csi-hostpath-storageclass.yaml",
"0640"),
diff --git a/pkg/minikube/assets/vm_assets.go b/pkg/minikube/assets/vm_assets.go
index 35df4fb275..b6ec89e9b8 100644
--- a/pkg/minikube/assets/vm_assets.go
+++ b/pkg/minikube/assets/vm_assets.go
@@ -18,6 +18,7 @@ package assets
import (
"bytes"
+ "embed"
"fmt"
"html/template"
"io"
@@ -207,6 +208,7 @@ func NewMemoryAsset(d []byte, targetDir, targetName, permissions string) *Memory
// BinAsset is a bindata (binary data) asset
type BinAsset struct {
+ embed.FS
BaseAsset
reader io.ReadSeeker
template *template.Template
@@ -214,8 +216,8 @@ type BinAsset struct {
}
// MustBinAsset creates a new BinAsset, or panics if invalid
-func MustBinAsset(name, targetDir, targetName, permissions string) *BinAsset {
- asset, err := NewBinAsset(name, targetDir, targetName, permissions)
+func MustBinAsset(fs embed.FS, name, targetDir, targetName, permissions string) *BinAsset {
+ asset, err := NewBinAsset(fs, name, targetDir, targetName, permissions)
if err != nil {
panic(fmt.Sprintf("Failed to define asset %s: %v", name, err))
}
@@ -223,8 +225,9 @@ func MustBinAsset(name, targetDir, targetName, permissions string) *BinAsset {
}
// NewBinAsset creates a new BinAsset
-func NewBinAsset(name, targetDir, targetName, permissions string) (*BinAsset, error) {
+func NewBinAsset(fs embed.FS, name, targetDir, targetName, permissions string) (*BinAsset, error) {
m := &BinAsset{
+ FS: fs,
BaseAsset: BaseAsset{
SourcePath: name,
TargetDir: targetDir,
@@ -249,7 +252,7 @@ func defaultValue(defValue string, val interface{}) string {
}
func (m *BinAsset) loadData() error {
- contents, err := Asset(m.SourcePath)
+ contents, err := m.FS.ReadFile(m.SourcePath)
if err != nil {
return err
}
diff --git a/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go b/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go
index 2efde14637..fa08691ea3 100644
--- a/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go
+++ b/pkg/minikube/bootstrapper/bsutil/kverify/api_server.go
@@ -248,7 +248,7 @@ func apiServerHealthzNow(hostname string, port int) (state.State, error) {
Proxy: nil, // Avoid using a proxy to speak to a local host
TLSClientConfig: &tls.Config{RootCAs: pool},
}
- client := &http.Client{Transport: tr}
+ client := &http.Client{Transport: tr, Timeout: 5 * time.Second}
resp, err := client.Get(url)
// Connection refused, usually.
if err != nil {
diff --git a/pkg/minikube/config/config.go b/pkg/minikube/config/config.go
index f194099266..893844eaee 100644
--- a/pkg/minikube/config/config.go
+++ b/pkg/minikube/config/config.go
@@ -36,20 +36,10 @@ const (
WantBetaUpdateNotification = "WantBetaUpdateNotification"
// ReminderWaitPeriodInHours is the key for ReminderWaitPeriodInHours
ReminderWaitPeriodInHours = "ReminderWaitPeriodInHours"
- // WantReportError is the key for WantReportError
- WantReportError = "WantReportError"
- // WantReportErrorPrompt is the key for WantReportErrorPrompt
- WantReportErrorPrompt = "WantReportErrorPrompt"
- // WantKubectlDownloadMsg is the key for WantKubectlDownloadMsg
- WantKubectlDownloadMsg = "WantKubectlDownloadMsg"
// WantNoneDriverWarning is the key for WantNoneDriverWarning
WantNoneDriverWarning = "WantNoneDriverWarning"
// ProfileName represents the key for the global profile parameter
ProfileName = "profile"
- // ShowDriverDeprecationNotification is the key for ShowDriverDeprecationNotification
- ShowDriverDeprecationNotification = "ShowDriverDeprecationNotification"
- // ShowBootstrapperDeprecationNotification is the key for ShowBootstrapperDeprecationNotification
- ShowBootstrapperDeprecationNotification = "ShowBootstrapperDeprecationNotification"
// UserFlag is the key for the global user flag (ex. --user=user1)
UserFlag = "user"
// AddonImages stores custom addon images config
@@ -58,6 +48,8 @@ const (
AddonRegistries = "addon-registries"
// AddonListFlag represents the key for addons parameter
AddonListFlag = "addons"
+ // EmbedCerts represents the config for embedding certificates in kubeconfig
+ EmbedCerts = "EmbedCerts"
)
var (
diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go
index 30aade94ca..e05e788198 100644
--- a/pkg/minikube/node/cache.go
+++ b/pkg/minikube/node/cache.go
@@ -131,6 +131,15 @@ func beginDownloadKicBaseImage(g *errgroup.Group, cc *config.ClusterConfig, down
}()
for _, img := range append([]string{baseImg}, kic.FallbackImages...) {
var err error
+
+ if driver.IsDocker(cc.Driver) {
+ if download.ImageExistsInDaemon(img) {
+ klog.Infof("%s exists in daemon, skipping load", img)
+ finalImg = img
+ return nil
+ }
+ }
+
klog.Infof("Downloading %s to local cache", img)
err = download.ImageToCache(img)
if err == nil {
@@ -141,14 +150,6 @@ func beginDownloadKicBaseImage(g *errgroup.Group, cc *config.ClusterConfig, down
return err
}
- if driver.IsDocker(cc.Driver) {
- if download.ImageExistsInDaemon(img) {
- klog.Infof("%s exists in daemon, skipping load", img)
- finalImg = img
- return nil
- }
- }
-
if cc.Driver == driver.Podman {
return fmt.Errorf("not yet implemented, see issue #8426")
}
diff --git a/pkg/minikube/out/out.go b/pkg/minikube/out/out.go
index 2f449691c8..f2f6f8bc2f 100644
--- a/pkg/minikube/out/out.go
+++ b/pkg/minikube/out/out.go
@@ -114,17 +114,12 @@ func Styled(st style.Enum, format string, a ...V) {
}
func boxedCommon(printFunc func(format string, a ...interface{}), format string, a ...V) {
- str := Sprintf(style.None, format, a...)
- str = strings.TrimSpace(str)
box := box.New(box.Config{Py: 1, Px: 4, Type: "Round"})
if useColor {
box.Config.Color = "Red"
}
- str = box.String("", str)
- lines := strings.Split(str, "\n")
- for _, line := range lines {
- printFunc(line + "\n")
- }
+ str := Sprintf(style.None, format, a...)
+ printFunc(box.String("", strings.TrimSpace(str)))
}
// Boxed writes a stylized and templated message in a box to stdout
diff --git a/pkg/minikube/translate/translate.go b/pkg/minikube/translate/translate.go
index 892450e604..2605870cd5 100644
--- a/pkg/minikube/translate/translate.go
+++ b/pkg/minikube/translate/translate.go
@@ -19,13 +19,13 @@ package translate
import (
"encoding/json"
"fmt"
- "path"
"strings"
"github.com/cloudfoundry-attic/jibber_jabber"
"golang.org/x/text/language"
"k8s.io/klog/v2"
+ "k8s.io/minikube/translations"
)
var (
@@ -69,14 +69,12 @@ func DetermineLocale() {
// Load translations for preferred language into memory.
p := preferredLanguage.String()
- translationFile := path.Join("translations", fmt.Sprintf("%s.json", p))
- t, err := Asset(translationFile)
+ t, err := translations.Translations.ReadFile(fmt.Sprintf("%s.json", p))
if err != nil {
// Attempt to find a more broad locale, e.g. fr instead of fr-FR.
if strings.Contains(p, "-") {
p = strings.Split(p, "-")[0]
- translationFile := path.Join("translations", fmt.Sprintf("%s.json", p))
- t, err = Asset(translationFile)
+ t, err = translations.Translations.ReadFile(fmt.Sprintf("%s.json", p))
if err != nil {
klog.V(1).Infof("Failed to load translation file for %s: %v", p, err)
return
diff --git a/site/content/en/docs/_index.md b/site/content/en/docs/_index.md
index a3153bc9eb..69776d0fe3 100644
--- a/site/content/en/docs/_index.md
+++ b/site/content/en/docs/_index.md
@@ -11,7 +11,7 @@ minikube quickly sets up a local Kubernetes cluster on macOS, Linux, and Windows
-🎉 Latest Release: v1.20.0 - May 06, 2021 ([changelog](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md))
+🎉 Latest Release: v1.21.0 - Jun 11, 2021 ([changelog](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md))
## Highlights
diff --git a/site/content/en/docs/commands/config.md b/site/content/en/docs/commands/config.md
index 51ff431b20..b6b4016965 100644
--- a/site/content/en/docs/commands/config.md
+++ b/site/content/en/docs/commands/config.md
@@ -29,19 +29,14 @@ Configurable fields:
* WantUpdateNotification
* WantBetaUpdateNotification
* ReminderWaitPeriodInHours
- * WantReportError
- * WantReportErrorPrompt
- * WantKubectlDownloadMsg
* WantNoneDriverWarning
* profile
* bootstrapper
- * ShowDriverDeprecationNotification
- * ShowBootstrapperDeprecationNotification
* insecure-registry
* hyperv-virtual-switch
* disable-driver-mounts
* cache
- * embed-certs
+ * EmbedCerts
* native-ssh
```shell
diff --git a/site/content/en/docs/contrib/addons.en.md b/site/content/en/docs/contrib/addons.en.md
index 0ffe726934..b16a2f9ad9 100644
--- a/site/content/en/docs/contrib/addons.en.md
+++ b/site/content/en/docs/contrib/addons.en.md
@@ -47,24 +47,32 @@ To make the addon appear in `minikube addons list`, add it to `pkg/addons/config
},
```
+Next, add all required files using `//go:embed` directives to a new embed.FS variable in `deploy/addons/assets.go`. Here is the entry used by the `csi-hostpath-driver` addon:
+
+```go
+ // CsiHostpathDriverAssets assets for csi-hostpath-driver addon
+ //go:embed csi-hostpath-driver/deploy/*.tmpl csi-hostpath-driver/rbac/*.tmpl
+ CsiHostpathDriverAssets embed.FS
+```
+
Then, add into `pkg/minikube/assets/addons.go` the list of files to copy into the cluster, including manifests. Here is the entry used by the `registry` addon:
```go
"registry": NewAddon([]*BinAsset{
- MustBinAsset(
- "deploy/addons/registry/registry-rc.yaml.tmpl",
+ MustBinAsset(addons.RegistryAssets,
+ "registry/registry-rc.yaml.tmpl",
vmpath.GuestAddonsDir,
"registry-rc.yaml",
"0640",
false),
- MustBinAsset(
- "deploy/addons/registry/registry-svc.yaml.tmpl",
+ MustBinAsset(addons.RegistryAssets,
+ "registry/registry-svc.yaml.tmpl",
vmpath.GuestAddonsDir,
"registry-svc.yaml",
"0640",
false),
- MustBinAsset(
- "deploy/addons/registry/registry-proxy.yaml.tmpl",
+ MustBinAsset(addons.RegistryAssets,
+ "registry/registry-proxy.yaml.tmpl",
vmpath.GuestAddonsDir,
"registry-proxy.yaml",
"0640",
@@ -74,6 +82,7 @@ Then, add into `pkg/minikube/assets/addons.go` the list of files to copy into th
The `MustBinAsset` arguments are:
+* asset variable (typically present in `deploy/addons/assets.go`)
* source filename
* destination directory (typically `vmpath.GuestAddonsDir`)
* destination filename
diff --git a/site/content/en/docs/contrib/building/binaries.md b/site/content/en/docs/contrib/building/binaries.md
index ade5f54f99..6254844a10 100644
--- a/site/content/en/docs/contrib/building/binaries.md
+++ b/site/content/en/docs/contrib/building/binaries.md
@@ -7,7 +7,7 @@ weight: 2
## Prerequisites
-* A recent Go distribution (>=1.12)
+* A recent Go distribution (>=1.16)
* If you are on Windows, you'll need Docker to be installed.
* 4GB of RAM
diff --git a/site/content/en/docs/contrib/building/iso.md b/site/content/en/docs/contrib/building/iso.md
index 8fd818bd38..f739aef819 100644
--- a/site/content/en/docs/contrib/building/iso.md
+++ b/site/content/en/docs/contrib/building/iso.md
@@ -10,7 +10,7 @@ The minikube ISO is booted by each hypervisor to provide a stable minimal Linux
## Prerequisites
-* A recent Go distribution (>=1.12)
+* A recent Go distribution (>=1.16)
* If you are on Windows, you'll need Docker to be installed.
* 4GB of RAM
* Build tools:
diff --git a/site/content/en/docs/contrib/leaderboard/v1.21.0.html b/site/content/en/docs/contrib/leaderboard/v1.21.0.html
new file mode 100644
index 0000000000..e497ff1b04
--- /dev/null
+++ b/site/content/en/docs/contrib/leaderboard/v1.21.0.html
@@ -0,0 +1,496 @@
+---
+title: "v1.21.0 - 2021-06-11"
+linkTitle: "v1.21.0 - 2021-06-11"
+weight: -97
+---
+
+
+ kubernetes/minikube - Leaderboard
+
+
+
+
+
+
+
+
kubernetes/minikube
+
2021-05-06 — 2021-06-11
+
+
+
+
Reviewers
+
+
+
+
Most Influential
+
# of Merged PRs reviewed
+
+
+
+
+
+
Most Helpful
+
# of words written in merged PRs
+
+
+
+
+
+
Most Demanding
+
# of Review Comments in merged PRs
+
+
+
+
+
+
Pull Requests
+
+
+
+
Most Active
+
# of Pull Requests Merged
+
+
+
+
+
+
Big Movers
+
Lines of code (delta)
+
+
+
+
+
+
Most difficult to review
+
Average PR size (added+changed)
+
+
+
+
+
+
Issues
+
+
+
+
Most Active
+
# of comments
+
+
+
+
+
+
Most Helpful
+
# of words (excludes authored)
+
+
+
+
+
+
Top Closers
+
# of issues closed (excludes authored)
+
+
+
+
+
+
+
diff --git a/site/content/en/docs/contrib/tests.en.md b/site/content/en/docs/contrib/tests.en.md
index 47ea10dca5..67c78f1eca 100644
--- a/site/content/en/docs/contrib/tests.en.md
+++ b/site/content/en/docs/contrib/tests.en.md
@@ -130,6 +130,9 @@ asserts that the dashboard command works
#### validateDryRun
asserts that the dry-run mode quickly exits with the right code
+#### validateInternationalLanguage
+asserts that the language used can be changed with environment variables
+
#### validateCacheCmd
tests functionality of cache command (cache add, delete, list)
diff --git a/site/content/en/docs/faq/_index.md b/site/content/en/docs/faq/_index.md
index 68445b3db8..ccd09b6c57 100644
--- a/site/content/en/docs/faq/_index.md
+++ b/site/content/en/docs/faq/_index.md
@@ -3,14 +3,14 @@ title: "FAQ"
linkTitle: "FAQ"
weight: 3
description: >
- Questions that come up regularly
+ Frequently Asked Questions
---
-## How to run an older Kubernetes version with minikube ?
+## Can I run an older Kubernetes version with minikube? Do I have to downgrade my minikube version?
You do not need to download an older minikube to run an older kubernetes version.
-You can create a Kubenretes cluster with any version you desire using `--kubernetes-version` flag.
+You can create a Kubernetes cluster with any version you desire using `--kubernetes-version` flag.
Example:
@@ -19,26 +19,27 @@ minikube start --kubernetes-version=v1.15.0
```
-## Docker Driver: How to set the cgroup manager minikube uses?
+## Docker Driver: How can I set minikube's cgroup manager?
-By default minikube uses the `cgroupfs` cgroup manager for the Kubernetes clusters, if you are on a system with a systemd cgroup manager, this could cause conflicts.
-To use `systemd` cgroup manager, run:
+By default minikube uses the `cgroupfs` cgroup manager for Kubernetes clusters. If you are on a system with a systemd cgroup manager, this could cause conflicts.
+To use the `systemd` cgroup manager, run:
```bash
minikube start --force-systemd=true
```
-## How to run minikube with Docker driver if existing cluster is VM?
+## How can I run minikube with the Docker driver if I have an existing cluster with a VM driver?
-If you have an existing cluster with a VM driver (virtualbox, hyperkit, KVM,...).
+First please ensure your Docker service is running. Then you need to either:
+
+(a) Delete the existing cluster and create a new one
-First please ensure your Docker service is running and then you need to either delete the existing cluster and create one
```bash
minikube delete
minikube start --driver=docker
```
-Alternatively, if you want to keep your existing cluster you can create a second cluster with a different profile name. (example p1)
+Alternatively, (b) Create a second cluster with a different profile name:
```bash
minikube start -p p1 --driver=docker
@@ -46,27 +47,27 @@ minikube start -p p1 --driver=docker
## Does minikube support IPv6?
-minikube currently doesn't support IPv6. However, it is on the [roadmap]({{< ref "/docs/contrib/roadmap.en.md" >}}).
+minikube currently doesn't support IPv6. However, it is on the [roadmap]({{< ref "/docs/contrib/roadmap.en.md" >}}). You can also refer to the [open issue](https://github.com/kubernetes/minikube/issues/8535).
## How can I prevent password prompts on Linux?
The easiest approach is to use the `docker` driver, as the backend service always runs as `root`.
-`none` users may want to try `CHANGE_MINIKUBE_NONE_USER=true`, where kubectl and such will still work: [see environment variables]({{< ref "/docs/handbook/config.md#environment-variables" >}})
+`none` users may want to try `CHANGE_MINIKUBE_NONE_USER=true`, where kubectl and such will work without `sudo`. See [environment variables]({{< ref "/docs/handbook/config.md#environment-variables" >}}) for more details.
-Alternatively, configure `sudo` to never prompt for the commands issued by minikube.
+Alternatively, you can configure `sudo` to never prompt for commands issued by minikube.
-## How to ignore system verification?
+## How can I ignore system verification?
-minikube's bootstrapper, [Kubeadm](https://github.com/kubernetes/kubeadm) verifies a list of features on the host system before installing Kubernetes. in case you get this error, and you still want to try minikube anyways despite your system's limitation you can skip the verification by starting minikube with this extra option:
+[kubeadm](https://github.com/kubernetes/kubeadm), minikube's bootstrapper, verifies a list of features on the host system before installing Kubernetes. In the case you get an error and still want to try minikube despite your system's limitation, you can skip verification by starting minikube with this extra option:
```shell
minikube start --extra-config kubeadm.ignore-preflight-errors=SystemVerification
```
-## what is the resource allocation for Knative Setup using minikube?
+## What is the minimum resource allocation necessary for a Knative setup using minikube?
-Please allocate sufficient resources for Knative setup using minikube, especially when you run a minikube cluster on your local machine. We recommend allocating at least 6 CPUs and 8G memory.
+Please allocate sufficient resources for Knative setup using minikube, especially when running minikube cluster on your local machine. We recommend allocating at least 6 CPUs and 8G memory:
```shell
minikube start --cpus 6 --memory 8000
@@ -74,11 +75,33 @@ minikube start --cpus 6 --memory 8000
## Do I need to install kubectl locally?
-No, minikube comes with built-in kubectl [see minikube's kubectl documentation]({{< ref "docs/handbook/kubectl.md" >}}).
+No, minikube comes with a built-in kubectl installation. See [minikube's kubectl documentation]({{< ref "docs/handbook/kubectl.md" >}}).
-## How to opt-in to beta notifications?
+## How can I opt-in to beta release notifications?
-Simply run the following command to be enrolled into beta notifications.
+Simply run the following command to be enrolled into beta notifications:
```
minikube config set WantBetaUpdateNotification true
```
+
+## Can I get rid of the emoji in minikube's outpuut?
+
+Yes! If you prefer not having emoji in your minikube output 😔 , just set the `MINIKUBE_IN_STYLE` environment variable to `0` or `false`:
+
+```
+MINIKUBE_IN_STYLE=0 minikube start
+
+```
+
+## How can I access a minikube cluster from a remote network?
+
+minikube's primary goal is to quickly set up local Kubernetes clusters, and therefore we strongly discourage using minikube in production or for listening to remote traffic. By design, minikube is meant to only listen on the local network.
+
+However, it is possible to configure minikube to listen on a remote network. This will open your network to the outside world and is not recommended. If you are not fully aware of the security implications, please avoid using this.
+
+For the docker and podman driver, use `--listen-address` flag:
+
+```
+minikube start --listen-address=0.0.0.0
+```
+
diff --git a/site/content/en/docs/handbook/controls.md b/site/content/en/docs/handbook/controls.md
index 0f1218ca63..0301da5e18 100644
--- a/site/content/en/docs/handbook/controls.md
+++ b/site/content/en/docs/handbook/controls.md
@@ -16,7 +16,7 @@ Start a cluster by running:
minikube start
```
-Access the Kubernetes Dashboard running within the minikube cluster:
+Access the Kubernetes dashboard running within the minikube cluster:
```shell
minikube dashboard
diff --git a/site/content/en/docs/handbook/vpn_and_proxy.md b/site/content/en/docs/handbook/vpn_and_proxy.md
index bcd92ee5c8..5b92601853 100644
--- a/site/content/en/docs/handbook/vpn_and_proxy.md
+++ b/site/content/en/docs/handbook/vpn_and_proxy.md
@@ -93,6 +93,10 @@ Ask your IT department for the appropriate PEM file, and add it to:
`~/.minikube/files/etc/ssl/certs`
+or
+
+`~/.minikube/certs`
+
Then run `minikube delete` and `minikube start`.
#### downloading binaries: proxyconnect tcp: tls: oversized record received with length 20527
diff --git a/site/content/en/docs/tutorials/user_flag.md b/site/content/en/docs/tutorials/user_flag.md
new file mode 100644
index 0000000000..55e8ee4752
--- /dev/null
+++ b/site/content/en/docs/tutorials/user_flag.md
@@ -0,0 +1,56 @@
+---
+title: "Using the User Flag"
+linkTitle: "Using the User Flag"
+weight: 1
+date: 2021-06-15
+description: >
+ Using the User Flag to Keep an Audit Log
+---
+
+## Overview
+
+In minikube, all executed commands are logged to a local audit log in the minikube home directory (default: `~/.minikube/logs/audit.json`).
+These commands are logged with additional information including the user that ran them, which by default is the OS user.
+However, there is a global flag `--user` that will set the user who ran the command in the audit log.
+
+## Prerequisites
+
+- minikube v1.17.1 or newer
+
+## What does the flag do?
+
+Assuming the OS user is `johndoe`, running `minikube start` will add the following to the audit log:
+```
+|---------------|--------------------------|-----------------------------|--------------|----------------|-------------------------------|-------------------------------|
+| Command | Args | Profile | User | Version | Start Time | End Time |
+|---------------|--------------------------|-----------------------------|--------------|----------------|-------------------------------|-------------------------------|
+| start | | minikube | johndoe | v1.21.0 | Tue, 15 Jun 2021 09:00:00 MST | Tue, 15 Jun 2021 09:01:00 MST |
+|---------------|--------------------------|-----------------------------|--------------|----------------|-------------------------------|-------------------------------|
+```
+As you can see, minikube pulled the OS user and listed them as the user for the command.
+
+Running the same command with `--user=mary` appended to the command will add the following to the audit log:
+```
+|---------------|--------------------------|-----------------------------|--------------|----------------|-------------------------------|-------------------------------|
+| Command | Args | Profile | User | Version | Start Time | End Time |
+|---------------|--------------------------|-----------------------------|--------------|----------------|-------------------------------|-------------------------------|
+| start | --user=mary | minikube | mary | v1.21.0 | Tue, 15 Jun 2021 09:00:00 MST | Tue, 15 Jun 2021 09:01:00 MST |
+|---------------|--------------------------|-----------------------------|--------------|----------------|-------------------------------|-------------------------------|
+```
+Here you can see that passing `--user=mary` overwrote the OS user with `mary` as the user for the command.
+
+## Example use case
+
+- Embedded use of minikube by multiple users (IDEs, Plugins, etc.)
+- A machine shared by multiple users using the same home folder
+
+## How do I use minikube in a script?
+
+If you are using minikube in a script or plugin it is recommeneded to add `--user=your_script_name` to all operations.
+
+Example:
+```
+minikube start --user=plugin_name
+minikube profile list --user=plugin_name
+minikube stop --user=plugin_name
+```
diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
index 2616bf1535..a3c41bd4ef 100644
--- a/test/integration/functional_test.go
+++ b/test/integration/functional_test.go
@@ -116,6 +116,7 @@ func TestFunctional(t *testing.T) {
{"ConfigCmd", validateConfigCmd},
{"DashboardCmd", validateDashboardCmd},
{"DryRun", validateDryRun},
+ {"InternationalLanguage", validateInternationalLanguage},
{"StatusCmd", validateStatusCmd},
{"LogsCmd", validateLogsCmd},
{"LogsFileCmd", validateLogsFileCmd},
@@ -897,6 +898,32 @@ func validateDryRun(ctx context.Context, t *testing.T, profile string) {
}
}
+// validateInternationalLanguage asserts that the language used can be changed with environment variables
+func validateInternationalLanguage(ctx context.Context, t *testing.T, profile string) {
+ // dry-run mode should always be able to finish quickly (<5s)
+ mctx, cancel := context.WithTimeout(ctx, Seconds(5))
+ defer cancel()
+
+ // Too little memory!
+ startArgs := append([]string{"start", "-p", profile, "--dry-run", "--memory", "250MB", "--alsologtostderr"}, StartArgs()...)
+ c := exec.CommandContext(mctx, Target(), startArgs...)
+ c.Env = append(os.Environ(), "LC_ALL=fr")
+
+ rr, err := Run(t, c)
+
+ wantCode := reason.ExInsufficientMemory
+ if rr.ExitCode != wantCode {
+ if HyperVDriver() {
+ t.Skip("skipping this error on HyperV till this issue is solved https://github.com/kubernetes/minikube/issues/9785")
+ } else {
+ t.Errorf("dry-run(250MB) exit code = %d, wanted = %d: %v", rr.ExitCode, wantCode, err)
+ }
+ }
+ if !strings.Contains(rr.Stdout.String(), "Utilisation du pilote") {
+ t.Errorf("dry-run output was expected to be in French. Expected \"Utilisation du pilote\", but not present in output:\n%s", rr.Stdout.String())
+ }
+}
+
// validateCacheCmd tests functionality of cache command (cache add, delete, list)
func validateCacheCmd(ctx context.Context, t *testing.T, profile string) {
defer PostMortemLogs(t, profile)
diff --git a/translations/de.json b/translations/de.json
index bbd00044da..be50ba730e 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -625,7 +625,7 @@
"The heapster addon is depreciated. please try to disable metrics-server instead": "",
"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "Der Name des virtuellen Hyperv-Switch. Standardmäßig zuerst gefunden. (nur Hyperv-Treiber)",
"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
- "The image you are trying to add {{.imageName}} doesn't exist!": "",
+ "The image '{{.imageName}}' was not found; unable to add it to cache.": "",
"The initial time interval for each check that wait performs in seconds": "",
"The kubeadm binary within the Docker container is not executable": "",
"The kubernetes version that the minikube VM will use (ex: v1.2.3)": "Die von der minikube-VM verwendete Kubernetes-Version (Beispiel: v1.2.3)",
diff --git a/translations/es.json b/translations/es.json
index 67f349fb27..2595b1fe5a 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -630,7 +630,7 @@
"The heapster addon is depreciated. please try to disable metrics-server instead": "",
"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "El nombre del conmutador virtual de hyperv. El valor predeterminado será el primer nombre que se encuentre (solo con el controlador de hyperv).",
"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
- "The image you are trying to add {{.imageName}} doesn't exist!": "",
+ "The image '{{.imageName}}' was not found; unable to add it to cache.": "",
"The initial time interval for each check that wait performs in seconds": "",
"The kubeadm binary within the Docker container is not executable": "",
"The kubernetes version that the minikube VM will use (ex: v1.2.3)": "La versión de Kubernetes que utilizará la VM de minikube (p. ej.: versión 1.2.3)",
diff --git a/translations/fr.json b/translations/fr.json
index 7948802753..096e9d24c9 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -628,7 +628,7 @@
"The heapster addon is depreciated. please try to disable metrics-server instead": "",
"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "Nom du commutateur virtuel hyperv. La valeur par défaut affiche le premier commutateur trouvé (pilote hyperv uniquement).",
"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
- "The image you are trying to add {{.imageName}} doesn't exist!": "",
+ "The image '{{.imageName}}' was not found; unable to add it to cache.": "",
"The initial time interval for each check that wait performs in seconds": "",
"The kubeadm binary within the Docker container is not executable": "",
"The kubernetes version that the minikube VM will use (ex: v1.2.3)": "Version de Kubernetes qu'utilisera la VM minikube (exemple : v1.2.3).",
diff --git a/translations/ja.json b/translations/ja.json
index 359f941d7b..d86712a73c 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -624,7 +624,7 @@
"The heapster addon is depreciated. please try to disable metrics-server instead": "",
"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "hyperv 仮想スイッチ名。最初に見つかったものにデフォルト設定されます（hyperv ドライバのみ）",
"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
- "The image you are trying to add {{.imageName}} doesn't exist!": "",
+ "The image '{{.imageName}}' was not found; unable to add it to cache.": "",
"The initial time interval for each check that wait performs in seconds": "",
"The kubeadm binary within the Docker container is not executable": "",
"The kubernetes version that the minikube VM will use (ex: v1.2.3)": "minikube VM で使用される Kubernetes バージョン（例: v1.2.3）",
diff --git a/translations/ko.json b/translations/ko.json
index 67b0f2a3fa..6d9761ed21 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -33,8 +33,7 @@
"A set of apiserver IP Addresses 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": "",
"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": "",
"A set of key=value pairs that describe feature gates for alpha/experimental features.": "",
- "Access the Kubernetes dashboard running within the minikube cluster": "",
- "Access the kubernetes dashboard running within the minikube cluster": "minikube 클러스터 내의 쿠버네티스 대시보드에 접근합니다",
+ "Access the Kubernetes dashboard running within the minikube cluster": "minikube 클러스터 내의 쿠버네티스 대시보드에 접근합니다",
"Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "",
"Add SSH identity key to SSH authentication agent": "SSH 인증 에이전트에 SSH ID 키 추가합니다",
"Add an image to local cache.": "로컬 캐시에 이미지를 추가합니다",
@@ -639,7 +638,7 @@
"The heapster addon is depreciated. please try to disable metrics-server instead": "",
"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "",
"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
- "The image you are trying to add {{.imageName}} doesn't exist!": "",
+ "The image '{{.imageName}}' was not found; unable to add it to cache.": "",
"The initial time interval for each check that wait performs in seconds": "",
"The kubeadm binary within the Docker container is not executable": "",
"The machine-driver specified is failing to start. Try running 'docker-machine-driver-\u003ctype\u003e version'": "",
diff --git a/translations/pl.json b/translations/pl.json
index 76bd872c81..1d0462ae21 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -32,8 +32,7 @@
"A set of apiserver IP Addresses 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": "",
"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": "",
"A set of key=value pairs that describe feature gates for alpha/experimental features.": "",
- "Access the Kubernetes dashboard running within the minikube cluster": "",
- "Access the kubernetes dashboard running within the minikube cluster": "Dostęp do dashboardu uruchomionego w klastrze kubernetesa w minikube",
+ "Access the Kubernetes dashboard running within the minikube cluster": "Dostęp do dashboardu uruchomionego w klastrze kubernetesa w minikube",
"Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "",
"Add SSH identity key to SSH authentication agent": "",
"Add an image to local cache.": "Dodaj obraz do lokalnego cache",
@@ -643,7 +642,7 @@
"The heapster addon is depreciated. please try to disable metrics-server instead": "",
"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "",
"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
- "The image you are trying to add {{.imageName}} doesn't exist!": "",
+ "The image '{{.imageName}}' was not found; unable to add it to cache.": "",
"The initial time interval for each check that wait performs in seconds": "",
"The kubeadm binary within the Docker container is not executable": "",
"The kubernetes version that the minikube VM will use (ex: v1.2.3)": "Wersja kubernetesa, która zostanie użyta przez wirtualną maszynę minikube (np. v1.2.3)",
diff --git a/translations/strings.txt b/translations/strings.txt
index b3a8957bf6..4757ac5dce 100644
--- a/translations/strings.txt
+++ b/translations/strings.txt
@@ -585,7 +585,7 @@
"The heapster addon is depreciated. please try to disable metrics-server instead": "",
"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "",
"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "",
- "The image you are trying to add {{.imageName}} doesn't exist!": "",
+ "The image '{{.imageName}}' was not found; unable to add it to cache.": "",
"The initial time interval for each check that wait performs in seconds": "",
"The kubeadm binary within the Docker container is not executable": "",
"The machine-driver specified is failing to start. Try running 'docker-machine-driver-\u003ctype\u003e version'": "",
diff --git a/translations/translations.go b/translations/translations.go
new file mode 100644
index 0000000000..2407a74dc2
--- /dev/null
+++ b/translations/translations.go
@@ -0,0 +1,23 @@
+/*
+Copyright 2021 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package translations
+
+import "embed"
+
+// Translations contains all translation JSON files.
+//go:embed *.json
+var Translations embed.FS
diff --git a/translations/zh-CN.json b/translations/zh-CN.json
index e586403774..2fcb2b1d02 100644
--- a/translations/zh-CN.json
+++ b/translations/zh-CN.json
@@ -39,8 +39,7 @@
"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": "一组在为 kubernetes 生成的证书中使用的 apiserver 名称。如果您希望将此 apiserver 设置为可从机器外部访问，则可以使用这组 apiserver 名称",
"A set of key=value pairs that describe configuration that may be passed to different components.\nThe key should be '.' separated, and the first part before the dot is the component to apply the configuration to.\nValid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler\nValid kubeadm parameters:": "一组用于描述可传递给不同组件的配置的键值对。\n其中键应以英文句点“.”分隔，英文句点前面的第一个部分是应用该配置的组件。\n有效组件包括：kubelet、kubeadm、apiserver、controller-manager、etcd、proxy、scheduler\n有效 kubeadm 参数包括：",
"A set of key=value pairs that describe feature gates for alpha/experimental features.": "一组用于描述 alpha 版功能/实验性功能的功能限制的键值对。",
- "Access the Kubernetes dashboard running within the minikube cluster": "",
- "Access the kubernetes dashboard running within the minikube cluster": "访问在 minikube 集群中运行的 kubernetes dashboard",
+ "Access the Kubernetes dashboard running within the minikube cluster": "访问在 minikube 集群中运行的 kubernetes dashboard",
"Access to ports below 1024 may fail on Windows with OpenSSH clients older than v8.1. For more information, see: https://minikube.sigs.k8s.io/docs/handbook/accessing/#access-to-ports-1024-on-windows-requires-root-permission": "",
"Add SSH identity key to SSH authentication agent": "",
"Add an image to local cache.": "将 image 添加到本地缓存。",
@@ -732,7 +731,7 @@
"The heapster addon is depreciated. please try to disable metrics-server instead": "",
"The hyperv virtual switch name. Defaults to first found. (hyperv driver only)": "hyperv 虚拟交换机名称。默认为找到的第一个 hyperv 虚拟交换机。（仅限 hyperv 驱动程序）",
"The hypervisor does not appear to be configured properly. Run 'minikube start --alsologtostderr -v=1' and inspect the error code": "管理程序似乎配置的不正确。执行 'minikube start --alsologtostderr -v=1' 并且检查错误代码",
- "The image you are trying to add {{.imageName}} doesn't exist!": "",
+ "The image '{{.imageName}}' was not found; unable to add it to cache.": "",
"The initial time interval for each check that wait performs in seconds": "",
"The kubeadm binary within the Docker container is not executable": "",
"The kubernetes version that the minikube VM will use (ex: v1.2.3)": "minikube 虚拟机将使用的 kubernetes 版本（例如 v1.2.3）",